diff options
| author | Darby <darbsies@gmail.com> | 2015-07-10 13:41:52 -0700 |
|---|---|---|
| committer | Darby <darbsies@gmail.com> | 2015-07-10 13:41:52 -0700 |
| commit | 4e4ab4893d4ee379f2f49459c0ec56f96cf4b6b7 (patch) | |
| tree | 4f61cf85e5ba0b7fc9228981c9b9b2882120d2e9 | |
| parent | 5571b7356342d2197dcae773775389991f95a193 (diff) | |
| download | gitlab-ce-vis_btn_color_change.tar.gz | |
Changed to using the btn classvis_btn_color_change
| -rw-r--r-- | app/assets/stylesheets/pages/admin.scss | 13 | ||||
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss index 12372719a35..144852e7874 100644 --- a/app/assets/stylesheets/pages/admin.scss +++ b/app/assets/stylesheets/pages/admin.scss @@ -61,16 +61,3 @@ @extend .broadcast-message; margin-bottom: 20px; } - -.btn-visibility { - .btn-primary { - color: black; - background-color: white; - border-color: black; - } - .btn-primary.active { - color: black; - background-color: #d3d3d3; - border-color: black; - } -} diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 63c3ff5674d..61d14383945 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -28,7 +28,7 @@ module ApplicationSettingsHelper def restricted_level_checkboxes(help_block_id) Gitlab::VisibilityLevel.options.map do |name, level| checked = restricted_visibility_levels(true).include?(level) - css_class = 'btn btn-primary' + css_class = 'btn' css_class += ' active' if checked checkbox_name = 'application_setting[restricted_visibility_levels][]' diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 8ce0b3cd207..6bef33c6d7a 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -23,7 +23,7 @@ = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' .col-sm-10 - data_attrs = { toggle: 'buttons' } - .btn-group.btn-visibility{ data: data_attrs } + .btn-group{ data: data_attrs } - restricted_level_checkboxes('restricted-visibility-help').each do |level| = level %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets |