diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-16 11:13:17 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-17 13:22:19 -0600 |
| commit | 78e8ac5da1fce5dab13667b9eafe7c91550e7210 (patch) | |
| tree | 303d106dae8a04b5cab46db990148686136aede9 | |
| parent | 30a7a76f3bbc0572a151fc6612c46591f7de7ec0 (diff) | |
| download | gitlab-ce-78e8ac5da1fce5dab13667b9eafe7c91550e7210.tar.gz | |
Add sentence casing, fix groups page buttons, fix dark gray variable
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/notifications/_button.html.haml | 2 |
6 files changed, 5 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index d0c27d64239..460c5d995be 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -24,6 +24,7 @@ $gray-lightest: #fdfdfd; $gray-light: #fafafa; $gray-lighter: #f9f9f9; $gray-normal: #f5f5f5; +$gray-dark: darken($gray-light, $darken-dark-factor); $gray-darker: #eee; $gray-darkest: #c4c4c4; diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index a9af7af59e2..16bff5f1e03 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -27,12 +27,6 @@ } } -.group-buttons { - .notification-dropdown { - display: inline-block; - } -} - .groups-header { @media (min-width: $screen-sm-min) { .nav-links { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index acfcb6c0e24..a443b6a37b3 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -143,10 +143,6 @@ margin-top: 0; } -.group-buttons { - margin-top: 15px; -} - .project-repo-buttons, .group-buttons { .btn { @@ -178,7 +174,7 @@ } .project-action-button { - margin: 15px 5px 0 5px; + margin: 15px 5px 0; vertical-align: top; } diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index c0341db7289..05c0a4c29f4 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -172,7 +172,7 @@ position: relative; z-index: 2; - .download-button { + .project-action-button { margin-left: $btn-side-margin; } } diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 097dd224140..8a214e1de58 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -67,7 +67,7 @@ Set up CI - if koding_enabled? && @repository.koding_yml.blank? %li.missing - = link_to 'Set Up Koding', add_koding_stack_path(@project) + = link_to 'Set up Koding', add_koding_stack_path(@project) - if @repository.commit .project-last-commit{ class: container_class } diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml index 8e4fa5d48c3..ce33d1497ba 100644 --- a/app/views/shared/notifications/_button.html.haml +++ b/app/views/shared/notifications/_button.html.haml @@ -1,5 +1,5 @@ - if notification_setting - .project-action-button.dropdown.notification-dropdown.inline + .project-action-button.dropdown.inline = form_for notification_setting, remote: true, html: { class: "inline notification-form" } do |f| = hidden_setting_source_input(notification_setting) = f.hidden_field :level, class: "notification_setting_level" |