Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
88c77245
Commit
88c77245
authored
Apr 24, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added flex wrapping
parent
9d6c769f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
55 additions
and
10 deletions
+55
-10
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+0
-7
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+52
-0
app/views/projects/project_members/_team.html.haml
app/views/projects/project_members/_team.html.haml
+3
-3
No files found.
app/assets/stylesheets/framework/common.scss
View file @
88c77245
...
@@ -425,13 +425,6 @@ table {
...
@@ -425,13 +425,6 @@ table {
}
}
.str-truncated
{
.str-truncated
{
&
-30
{
@include
str-truncated
(
30%
);
@media
(
max-width
:
$screen-xs-max
){
max-width
:
90%
;
}
}
&
-60
{
&
-60
{
@include
str-truncated
(
60%
);
@include
str-truncated
(
60%
);
}
}
...
...
app/assets/stylesheets/pages/members.scss
View file @
88c77245
...
@@ -133,3 +133,55 @@
...
@@ -133,3 +133,55 @@
right
:
160px
;
right
:
160px
;
}
}
}
}
.flex-project-members-panel
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
justify-content
:
center
;
@media
(
max-width
:
$screen-sm-min
)
{
display
:
block
;
.flex-project-title
{
vertical-align
:
top
;
display
:
inline-block
;
max-width
:
90%
;
}
}
.flex-project-title
{
overflow
:
hidden
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
}
.badge
{
height
:
17px
;
line-height
:
16px
;
margin-right
:
5px
;
padding-top
:
1px
;
padding-bottom
:
1px
;
}
.flex-project-members-form
{
flex-wrap
:
nowrap
;
white-space
:
nowrap
;
margin-left
:
auto
;
}
}
.panel
{
.panel-heading
{
.badge
{
margin-top
:
0
;
}
@media
(
max-width
:
$screen-sm-min
)
{
.badge
{
margin-right
:
0
;
margin-left
:
0
;
}
}
}
}
\ No newline at end of file
app/views/projects/project_members/_team.html.haml
View file @
88c77245
.panel.panel-default
.panel.panel-default
.panel-heading
.panel-heading
.flex-project-members-panel
%span
.
str-truncated-30
%span
.
flex-project-title
Members of
Members of
%strong
%strong
#{
@project
.
name
}
#{
@project
.
name
}
%span
.badge
=
@project_members
.
total_count
%span
.badge
=
@project_members
.
total_count
=
form_tag
namespace_project_settings_members_path
(
@project
.
namespace
,
@project
),
method: :get
,
class:
'form-inline member-search-form'
do
=
form_tag
namespace_project_settings_members_path
(
@project
.
namespace
,
@project
),
method: :get
,
class:
'form-inline member-search-form
flex-project-members-form
'
do
.form-group
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing members by name'
,
class:
'form-control'
,
spellcheck:
false
}
%button
.member-search-btn
{
type:
"submit"
,
"aria-label"
=>
"Submit search"
}
%button
.member-search-btn
{
type:
"submit"
,
"aria-label"
=>
"Submit search"
}
...
...
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