diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-23 16:31:04 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-24 16:57:18 -0600 |
| commit | 7dc09b57788c089a3ddd809ff1d7bdc823b469f9 (patch) | |
| tree | 461204caddcb856b0bfc487dc927716538493a85 /app/assets | |
| parent | cb8df09f6d03c55d2edd05174809dcdba7d8f026 (diff) | |
| download | gitlab-ce-7dc09b57788c089a3ddd809ff1d7bdc823b469f9.tar.gz | |
Port of ui-updates to EE
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 24a1ce2b84d..2a01bc4d44d 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -71,7 +71,7 @@ header { &:focus, &:active { background-color: $gray-light; - color: darken($gl-text-color-secondary, 30%); + color: $gl-text-color; .todos-pending-count { background: darken($todo-alert-blue, 10%); diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index f9d93a6544d..a3749398841 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -179,7 +179,7 @@ $count-arrow-border: #dce0e5; $save-project-loader-color: #555; $divergence-graph-bar-bg: #ccc; $divergence-graph-separator-bg: #ccc; -$general-hover-transition-duration: 150ms; +$general-hover-transition-duration: 100ms; $general-hover-transition-curve: linear; $issue-box-upcoming-bg: #8f8f8f; $pages-group-name-color: #4c4e54; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 0579b531fea..e011ea8f7d1 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -198,7 +198,7 @@ margin: 15px 5px 0 0; input { - height: 27px; + height: 28px; } } @@ -523,7 +523,7 @@ a.deploy-project-label { &:hover, &:focus { - color: darken($notes-light-color, 15%); + color: $gl-text-color; } } |