Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Orbit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
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
2661be13
Commit
2661be13
authored
5 years ago
by
Gaëlle Morin
Browse files
Options
Downloads
Patches
Plain Diff
styles for admins ok. Need padding ? + refactoring
parent
57045b44
No related branches found
No related tags found
1 merge request
!77
Circle
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/page-admin-circles.pug
+22
-3
22 additions, 3 deletions
src/page-admin-circles.pug
src/styles/base/form.scss
+2
-2
2 additions, 2 deletions
src/styles/base/form.scss
src/styles/layout/circle/circle-edit.scss
+90
-2
90 additions, 2 deletions
src/styles/layout/circle/circle-edit.scss
with
114 additions
and
7 deletions
src/page-admin-circles.pug
+
22
−
3
View file @
2661be13
...
@@ -34,7 +34,25 @@
...
@@ -34,7 +34,25 @@
set-user-id-select="user"
set-user-id-select="user"
)
)
include templates/hd-user-avatar.pug
sib-widget(name='team-template-edit')
template
sib-display(
data-src='${await value.user}'
fields='account.picture, sup(name, groups), sub(profile.city)'
widget-account.picture='hd-user-avatar'
multiple-groups=''
widget-groups='hd-user-groups'
)
div.content-box__info
div.content-box__info
sib-link(class='circle-add-button button yellow-button', next='admin-circle-create') Create a new circle
sib-link(class='circle-add-button button yellow-button', next='admin-circle-create') Create a new circle
...
@@ -46,9 +64,10 @@
...
@@ -46,9 +64,10 @@
div.cell Admins
div.cell Admins
div.cell Join
div.cell Join
sib-display.table-body(
//-fields="name, own(owner.account.picture, owner.name), buttons(members, button)"
sib-display.table-body.test(
data-src=`${endpoints.circles}`
data-src=`${endpoints.circles}`
fields=
"
name, own(owner.account.picture, owner.name),
buttons(members, button)"
fields=
'
name, own(owner.account.picture,
sup(
owner.name),
sub(owner.username)), buttons(members)'
multiple-groups=""
multiple-groups=""
widget-members="circle-admin-leave-button-template"
widget-members="circle-admin-leave-button-template"
...
...
This diff is collapsed.
Click to expand it.
src/styles/base/form.scss
+
2
−
2
View file @
2661be13
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
flex-direction
:
column
;
flex-direction
:
column
;
}
}
sib-set-default
{
/*
sib-set-default {
clear: both;
clear: both;
display: flex;
display: flex;
flex-wrap: wrap;
flex-wrap: wrap;
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
float: left;
float: left;
width: 50%;
width: 50%;
}
}
}
}
*/
label
{
label
{
display
:
flex
;
display
:
flex
;
...
...
This diff is collapsed.
Click to expand it.
src/styles/layout/circle/circle-edit.scss
+
90
−
2
View file @
2661be13
...
@@ -26,6 +26,94 @@
...
@@ -26,6 +26,94 @@
}
}
}
}
.table-body.test
>
div
>
sib-display
>
div
{
border-bottom
:
1px
solid
$color-228-25-79
;
display
:
flex
;
justify-content
:
space-around
;
>*
{
flex
:
1
;
border-left
:
1px
solid
$color-228-25-79
;
text-align
:
center
;
}
>*
:last-child
{
border-right
:
1px
solid
$color-228-25-79
;
}
>
sib-display-value
[
name
=
'name'
]
{
color
:
#3C3F57
;
font-weight
:
600
;
}
>
sib-set-default
[
name
=
'own'
]
{
display
:
grid
;
grid-column-gap
:
1
.6rem
;
grid-template-columns
:
7vh
auto
;
grid-template-rows
:
repeat
(
2
,
5
.2vh
);
>[
name
$
=
'account.picture'
]
{
align-items
:
center
;
align-self
:
center
;
background-color
:
$color-213-20-91
;
border-radius
:
50%
;
display
:
flex
;
grid-column
:
1
/
span
1
;
grid-row
:
1
/
span
2
;
height
:
7vh
;
justify-content
:
center
;
overflow
:
hidden
;
position
:
relative
;
width
:
7vh
;
img
{
background-color
:
white
;
height
:
100%
;
left
:
0
;
object-fit
:
cover
;
position
:
absolute
;
top
:
0
;
width
:
100%
;
}
object
{
height
:
45%
;
width
:
45%
;
}
}
>[
name
=
'sup'
]
{
align-self
:
end
;
display
:
flex
;
grid-column
:
2
/
span
1
;
grid-row
:
1
/
span
1
;
margin-bottom
:
0
.50rem
;
[
name
$
=
'name'
]
{
font-weight
:
600
;
margin-right
:
1rem
;
}
}
>[
name
=
'sub'
]
{
align-self
:
start
;
grid-column
:
2
/
span
1
;
grid-row
:
2
/
span
1
;
margin-top
:
0
.50rem
;
>[
name
$
=
'username'
]
:not
(
:empty
)
{
align-items
:
center
;
display
:
flex
;
&
::before
{
content
:
'@'
;
}
}
}
}
}
.table-body
div
team-template-edit
{
.table-body
div
team-template-edit
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
...
@@ -74,7 +162,7 @@
...
@@ -74,7 +162,7 @@
grid-template-columns
:
7vh
auto
;
grid-template-columns
:
7vh
auto
;
grid-template-rows
:
repeat
(
2
,
5
.2vh
);
grid-template-rows
:
repeat
(
2
,
5
.2vh
);
>[
name
=
'account.picture'
]
{
>[
name
$
=
'account.picture'
]
{
align-items
:
center
;
align-items
:
center
;
align-self
:
center
;
align-self
:
center
;
background-color
:
$color-213-20-91
;
background-color
:
$color-213-20-91
;
...
@@ -111,7 +199,7 @@
...
@@ -111,7 +199,7 @@
grid-row
:
1
/
span
1
;
grid-row
:
1
/
span
1
;
margin-bottom
:
0
.50rem
;
margin-bottom
:
0
.50rem
;
[
name
=
'name'
]
{
[
name
$
=
'name'
]
{
font-weight
:
600
;
font-weight
:
600
;
margin-right
:
1rem
;
margin-right
:
1rem
;
}
}
...
...
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