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
Boxiang Sun
gitlab-ce
Commits
f5d16b0d
Commit
f5d16b0d
authored
Jun 19, 2017
by
TM Lee
Committed by
Annabel Dunstone Gray
Jun 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#27697] Make the arrow icons consistent in dropdown
parent
9fe6c2b2
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
57 additions
and
26 deletions
+57
-26
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+9
-2
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+19
-10
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+15
-8
app/views/projects/_visibility_select.html.haml
app/views/projects/_visibility_select.html.haml
+3
-1
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+3
-3
app/views/projects/project_members/_new_project_member.html.haml
...ws/projects/project_members/_new_project_member.html.haml
+3
-1
app/views/projects/project_members/_new_shared_group.html.haml
...iews/projects/project_members/_new_shared_group.html.haml
+1
-1
changelogs/unreleased/27697-make-arrow-icons-consistent-in-dropdown.yml
...eleased/27697-make-arrow-icons-consistent-in-dropdown.yml
+4
-0
No files found.
app/assets/stylesheets/framework/forms.scss
View file @
f5d16b0d
...
@@ -125,10 +125,11 @@ label {
...
@@ -125,10 +125,11 @@ label {
.select-wrapper
{
.select-wrapper
{
position
:
relative
;
position
:
relative
;
.fa-c
aret
-down
{
.fa-c
hevron
-down
{
position
:
absolute
;
position
:
absolute
;
font-size
:
10px
;
right
:
10px
;
right
:
10px
;
top
:
1
0
px
;
top
:
1
2
px
;
color
:
$gray-darkest
;
color
:
$gray-darkest
;
pointer-events
:
none
;
pointer-events
:
none
;
}
}
...
@@ -138,6 +139,12 @@ label {
...
@@ -138,6 +139,12 @@ label {
padding-left
:
10px
;
padding-left
:
10px
;
padding-right
:
10px
;
padding-right
:
10px
;
-webkit-appearance
:
none
;
-webkit-appearance
:
none
;
-moz-appearance
:
none
;
appearance
:
none
;
&
:
:-
ms-expand
{
display
:
none
;
}
}
}
.form-control-inline
{
.form-control-inline
{
...
...
app/assets/stylesheets/framework/selects.scss
View file @
f5d16b0d
...
@@ -18,19 +18,28 @@
...
@@ -18,19 +18,28 @@
background-image
:
none
;
background-image
:
none
;
background-color
:
transparent
;
background-color
:
transparent
;
border
:
none
;
border
:
none
;
padding-top
:
6px
;
padding-top
:
12px
;
padding-right
:
10px
;
padding-right
:
20px
;
font-size
:
10px
;
b
{
b
{
display
:
inline-block
;
display
:
none
;
width
:
0
;
}
height
:
0
;
margin-left
:
2px
;
&
:
:
after
{
vertical-align
:
middle
;
content
:
"\f078"
;
border-top
:
5px
dashed
;
position
:
absolute
;
border-right
:
5px
solid
transparent
;
z-index
:
1
;
border-left
:
5px
solid
transparent
;
text-align
:
center
;
pointer-events
:
none
;
box-sizing
:
border-box
;
color
:
$gray-darkest
;
color
:
$gray-darkest
;
display
:
inline-block
;
font
:
normal
normal
normal
14px
/
1
FontAwesome
;
font-size
:
inherit
;
text-rendering
:
auto
;
-webkit-font-smoothing
:
antialiased
;
-moz-osx-font-smoothing
:
grayscale
;
}
}
}
}
...
...
app/helpers/projects_helper.rb
View file @
f5d16b0d
...
@@ -151,14 +151,21 @@ module ProjectsHelper
...
@@ -151,14 +151,21 @@ module ProjectsHelper
disabled:
disabled_option
disabled:
disabled_option
)
)
content_tag
:div
,
class:
"select-wrapper"
do
concat
(
content_tag
(
content_tag
(
:select
,
:select
,
options
,
options
,
name:
"project[project_feature_attributes][
#{
field
}
]"
,
name:
"project[project_feature_attributes][
#{
field
}
]"
,
id:
"project_project_feature_attributes_
#{
field
}
"
,
id:
"project_project_feature_attributes_
#{
field
}
"
,
class:
"pull-right form-control
#{
repo_children_classes
(
field
)
}
"
,
class:
"pull-right form-control select-control
#{
repo_children_classes
(
field
)
}
"
,
data:
{
field:
field
}
data:
{
field:
field
}
).
html_safe
)
)
concat
(
icon
(
'chevron-down'
)
)
end
.
html_safe
end
end
def
link_to_autodeploy_doc
def
link_to_autodeploy_doc
...
...
app/views/projects/_visibility_select.html.haml
View file @
f5d16b0d
-
if
can_change_visibility_level?
(
@project
,
current_user
)
-
if
can_change_visibility_level?
(
@project
,
current_user
)
=
form
.
select
(
model_method
,
visibility_select_options
(
@project
,
selected_level
),
{},
class:
'form-control visibility-select'
)
.select-wrapper
=
form
.
select
(
model_method
,
visibility_select_options
(
@project
,
selected_level
),
{},
class:
'form-control visibility-select select-control'
)
=
icon
(
'chevron-down'
)
-
else
-
else
.info.js-locked
{
data:
{
help_block:
visibility_level_description
(
@project
.
visibility_level
,
@project
)
}
}
.info.js-locked
{
data:
{
help_block:
visibility_level_description
(
@project
.
visibility_level
,
@project
)
}
}
=
visibility_level_icon
(
@project
.
visibility_level
)
=
visibility_level_icon
(
@project
.
visibility_level
)
...
...
app/views/projects/edit.html.haml
View file @
f5d16b0d
...
@@ -99,9 +99,9 @@
...
@@ -99,9 +99,9 @@
Git Large File Storage
Git Large File Storage
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'workflow/lfs/manage_large_binaries_with_git_lfs'
)
=
link_to
icon
(
'question-circle'
),
help_page_path
(
'workflow/lfs/manage_large_binaries_with_git_lfs'
)
.col-md-3
.col-md-3
=
f
.
select
:lfs_enabled
,
[
%w(Enabled true)
,
%w(Disabled false)
],
{},
selected:
@project
.
lfs_enabled?
,
class:
'pull-right form-control project-repo-select'
,
data:
{
field:
'lfs_enabled'
}
.select-wrapper
=
f
.
select
:lfs_enabled
,
[
%w(Enabled true)
,
%w(Disabled false)
],
{},
selected:
@project
.
lfs_enabled?
,
class:
'pull-right form-control project-repo-select select-control'
,
data:
{
field:
'lfs_enabled'
}
=
icon
(
'chevron-down'
)
-
if
Gitlab
.
config
.
registry
.
enabled
-
if
Gitlab
.
config
.
registry
.
enabled
.form-group.js-container-registry
{
style:
(
"display: none;"
if
@project
.
project_feature
.
send
(
:repository_access_level
)
==
0
)
}
.form-group.js-container-registry
{
style:
(
"display: none;"
if
@project
.
project_feature
.
send
(
:repository_access_level
)
==
0
)
}
.checkbox
.checkbox
...
...
app/views/projects/project_members/_new_project_member.html.haml
View file @
f5d16b0d
...
@@ -6,7 +6,9 @@
...
@@ -6,7 +6,9 @@
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
"input-clamp"
,
scope: :all
,
email_user:
true
,
placeholder:
"Search for members to update or invite"
)
=
users_select_tag
(
:user_ids
,
multiple:
true
,
class:
"input-clamp"
,
scope: :all
,
email_user:
true
,
placeholder:
"Search for members to update or invite"
)
.form-group
.form-group
=
label_tag
:access_level
,
"Choose a role permission"
,
class:
"label-light"
=
label_tag
:access_level
,
"Choose a role permission"
,
class:
"label-light"
=
select_tag
:access_level
,
options_for_select
(
ProjectMember
.
access_level_roles
,
@project_member
.
access_level
),
class:
"form-control project-access-select"
.select-wrapper
=
select_tag
:access_level
,
options_for_select
(
ProjectMember
.
access_level_roles
,
@project_member
.
access_level
),
class:
"form-control project-access-select select-control"
=
icon
(
'chevron-down'
)
.help-block.append-bottom-10
.help-block.append-bottom-10
=
link_to
"Read more"
,
help_page_path
(
"user/permissions"
),
class:
"vlink"
=
link_to
"Read more"
,
help_page_path
(
"user/permissions"
),
class:
"vlink"
about role permissions
about role permissions
...
...
app/views/projects/project_members/_new_shared_group.html.haml
View file @
f5d16b0d
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
label_tag
:link_group_access
,
"Max access level"
,
class:
"label-light"
=
label_tag
:link_group_access
,
"Max access level"
,
class:
"label-light"
.select-wrapper
.select-wrapper
=
select_tag
:link_group_access
,
options_for_select
(
ProjectGroupLink
.
access_options
,
ProjectGroupLink
.
default_access
),
class:
"form-control select-control"
=
select_tag
:link_group_access
,
options_for_select
(
ProjectGroupLink
.
access_options
,
ProjectGroupLink
.
default_access
),
class:
"form-control select-control"
=
icon
(
'c
aret
-down'
)
=
icon
(
'c
hevron
-down'
)
.help-block.append-bottom-10
.help-block.append-bottom-10
=
link_to
"Read more"
,
help_page_path
(
"user/permissions"
),
class:
"vlink"
=
link_to
"Read more"
,
help_page_path
(
"user/permissions"
),
class:
"vlink"
about role permissions
about role permissions
...
...
changelogs/unreleased/27697-make-arrow-icons-consistent-in-dropdown.yml
0 → 100644
View file @
f5d16b0d
---
title
:
Use fa-chevron-down on dropdown arrows for consistency
merge_request
:
9659
author
:
TM Lee
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