diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-25 14:55:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-25 14:55:03 +0100 |
| commit | 172947f3660ee695e5126a8319fb82cbca1fa360 (patch) | |
| tree | 6b9186dbd0943ae6f5c8ef9740aa99d181591a23 | |
| parent | 5542c9456c44816d45caba42b00389da0b1d1f26 (diff) | |
| download | gitlab-ce-172947f3660ee695e5126a8319fb82cbca1fa360.tar.gz | |
Updated select box to match design
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 18 | ||||
| -rw-r--r-- | app/views/projects/group_links/index.html.haml | 4 |
2 files changed, 21 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 54cb5461113..558b133f593 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -78,6 +78,24 @@ label { border-radius: 3px; } +.select-wrapper { + position: relative; + + .caret { + position: absolute; + right: 10px; + top: $gl-padding; + color: $gray-darkest; + pointer-events: none; + } +} + +.select-control { + padding-left: 10px; + padding-right: 10px; + -webkit-appearance: none; +} + .form-control-inline { display: inline; } diff --git a/app/views/projects/group_links/index.html.haml b/app/views/projects/group_links/index.html.haml index 627419c1b18..13cdac2102f 100644 --- a/app/views/projects/group_links/index.html.haml +++ b/app/views/projects/group_links/index.html.haml @@ -14,7 +14,9 @@ = groups_select_tag(:link_group_id, skip_group: @project.group.try(:path)) .form-group = label_tag :link_group_access, "Max access level", class: "label-light" - = select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control" + .select-wrapper + = select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control select-control" + %span.caret = submit_tag "Share", class: "btn btn-create" .col-sm-12 %hr |