Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
a06143d98a52
Commit
a0c7c36e
authored
Aug 05, 2019
by
George Tsiolis
Browse files
Replace some flex properties
parent
2224287d118d
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/views/groups/group_members/index.html.haml
View file @
a06143d9
...
...
@@ -36,8 +36,8 @@
.tab-content
#existing_members
.tab-pane
{
:class
=>
(
"active"
unless
pending_active
)
}
.card.card-without-border
.
card-header.flex-project-members-panel
%span
.flex-
p
ro
ject-title
.
d-flex.flex-column.flex-md-row.row-content-block.second-block
%span
.flex-
g
ro
w-1
Members with access to
%strong
=
@group
.
name
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form flex-project-members-form'
do
...
...
@@ -47,7 +47,7 @@
%button
.member-search-btn
{
type:
"submit"
,
"aria-label"
=>
"Submit search"
}
=
icon
(
"search"
)
-
if
can_manage_members
=
label_tag
'2fa'
,
'2FA'
,
class:
'col-form-label label-bold
pl-2 pr-2
'
=
label_tag
'2fa'
,
'2FA'
,
class:
'col-form-label label-bold
append-right-8
'
=
render
'shared/members/filter_2fa_dropdown'
=
render
'shared/members/sort_dropdown'
%ul
.content-list.members-list
...
...
@@ -57,8 +57,8 @@
-
if
show_invited_members
#invited_members
.tab-pane
{
:class
=>
(
"active"
if
pending_active
)
}
.card.card-without-border
.
card-header.flex-project-members-panel
%span
.flex-
p
ro
ject-title
.
d-flex.flex-column.flex-md-row.row-content-block.second-block
%span
.flex-
g
ro
w-1
Members with pending access to
%strong
=
@group
.
name
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form flex-project-members-form'
do
...
...
app/views/shared/members/_filter_2fa_dropdown.html.haml
View file @
a06143d9
-
filter
=
params
[
:two_factor
]
||
'everyone'
-
filter_options
=
{
'everyone'
=>
_
(
'Everyone'
),
'enabled'
=>
_
(
'Enabled'
),
'disabled'
=>
_
(
'Disabled'
)
}
.dropdown.inline.member-filter-2fa-dropdown
.dropdown.inline.member-filter-2fa-dropdown
.pr-2
=
dropdown_toggle
(
filter_options
[
filter
],
{
toggle:
'dropdown'
})
%ul
.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable
%li
.dropdown-header
...
...
app/views/shared/members/_sort_dropdown.html.haml
View file @
a06143d9
=
label_tag
:sort_by
,
'Sort by'
,
class:
'col-form-label label-bold
pl-4
pr-2'
.dropdown.inline
.member-sort-dropdown
=
label_tag
:sort_by
,
'Sort by'
,
class:
'col-form-label label-bold pr-2'
.dropdown.inline
=
dropdown_toggle
(
member_sort_options_hash
[
@sort
],
{
toggle:
'dropdown'
})
%ul
.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
%li
.dropdown-header
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment