Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Orbit
Manage
Activity
Members
Labels
Plan
Issues
97
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Applications
Orbit
Commits
d70fd6da
Verified
Commit
d70fd6da
authored
4 years ago
by
Gaëlle Morin
Browse files
Options
Downloads
Patches
Plain Diff
fix: new classes added to project-edit + fixbug on table for project- and circle-edit
parent
661f5c0f
No related branches found
No related tags found
3 merge requests
!176
Release/0.10
,
!174
Feature/fix from rework css
,
!173
Fix/project
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/styles/base/table.scss
+2
-10
2 additions, 10 deletions
src/styles/base/table.scss
src/views/circle/page-circle-edit.pug
+6
-6
6 additions, 6 deletions
src/views/circle/page-circle-edit.pug
src/views/project/page-project-edit.pug
+20
-20
20 additions, 20 deletions
src/views/project/page-project-edit.pug
with
28 additions
and
36 deletions
src/styles/base/table.scss
+
2
−
10
View file @
d70fd6da
...
...
@@ -117,16 +117,8 @@
width
:
70px
;
}
.w262
{
width
:
262px
;
}
.W152
{
width
:
152px
;
}
.w355
{
width
:
355px
;
.w162
{
width
:
162px
;
}
.
hashtag
:
:
before
{
...
...
This diff is collapsed.
Click to expand it.
src/views/circle/page-circle-edit.pug
+
6
−
6
View file @
d70fd6da
...
...
@@ -8,7 +8,7 @@ div.content-box__info
sib-widget(name='hubl-team-template-edit')
template
sib-display.user-thumb.is-spaced(
class='w
355
cell border cell-with-id-card user-thumb'
class='w
280
cell border cell-with-id-card user-thumb'
data-src='${await value.user}'
fields='account.picture, sup(name, groups), sub(profile.city)'
...
...
@@ -24,7 +24,7 @@ div.content-box__info
)
sib-ac-checker(
class='
W15
2 cell border'
class='
w16
2 cell border'
permission="acl:Delete"
data-src="${value['@id']}"
)
...
...
@@ -36,7 +36,7 @@ div.content-box__info
//- Only to show the table grid
sib-ac-checker(
class='
W15
2 cell border'
class='
w16
2 cell border'
no-permission="acl:Delete"
data-src="${value['@id']}"
)
...
...
@@ -72,7 +72,7 @@ div.content-box__info
next='circle-information'
)
h2 Liste des membres:
h2 Liste des membres
:
sib-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
sib-form.block.select-add(
...
...
@@ -91,8 +91,8 @@ div.content-box__info
.table-wrapper
.table
div.table-header.grey-color
div.w
355
Nom
div.
W15
2 Accès
div.w
280
Nom
div.
w16
2 Accès
//-class='table-body'
sib-display(
...
...
This diff is collapsed.
Click to expand it.
src/views/project/page-project-edit.pug
+
20
−
20
View file @
d70fd6da
...
...
@@ -9,20 +9,20 @@ div.content-box__info
sib-form.form.button-register(
bind-resources
fields='status,
block-project__info
(customer.name, name), description'
fields='status,
line-1
(customer.name, name), description'
label-status='Statut du canal*'
widget-status='hubl-status'
class-status='form-label is-light is-full-width member-select color'
label-name='Nom du projet*'
class-name='form-label is-light is-half-width'
class-name='form-label is-light is-half-width
input-text-like
'
label-customer.name='Nom du client*'
class-customer.name='form-label is-light is-half-width'
class-customer.name='form-label is-light is-half-width
input-text-like
'
label-description='Description du projet'
class-description='form-label is-light is-full-width'
class-description='form-label is-light is-full-width
input-text-like
'
widget-description='sib-form-textarea'
partial=""
...
...
@@ -33,7 +33,7 @@ div.content-box__info
h2 Liste des membres :
sib-form.block.select-add
.button-add
(
sib-form.block.select-add(
bind-resources
nested-field='members'
fields='user'
...
...
@@ -46,18 +46,18 @@ div.content-box__info
submit-button='Ajouter un membre'
)
.table
div.table-header.grey-color
div.w
66
Nom
div.w
33
Accès
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
multiple-members=''
widget-members='hubl-team-template-edit'
)
.table
-wrapper
.table
div.table-header.grey-color
div.w
280
Nom
div.w
162
Accès
//-class='table-body'
sib-display(
class='table-body'
bind-resources
fields='members'
multiple-members=''
widget-members='hubl-team-template-edit'
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment