diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 18:10:19 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-14 18:10:19 +0000 |
| commit | 66773772ed89de2808d8f452765f9497070d5e25 (patch) | |
| tree | 3a3f7c8e72ac1145d08798d1ea6ad60244d4bb9e | |
| parent | 4f18de7087e4bf4ea51c8571be752cabd0a6e683 (diff) | |
| parent | dea0cb47611709e23204f59ea314dd04c26c7664 (diff) | |
| download | gitlab-ce-66773772ed89de2808d8f452765f9497070d5e25.tar.gz | |
Merge branch 'change-dashed-border-button-color' into 'master'
Changed dashed border button color to be darker
See merge request gitlab-org/gitlab-ce!14041
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/change-dashed-border-button-color.yml | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 3857226cddb..a3da9fd44e8 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -13,6 +13,7 @@ $sidebar-breakpoint: 1024px; $darken-normal-factor: 7%; $darken-dark-factor: 10%; $darken-border-factor: 5%; +$darken-border-dashed-factor: 25%; $white-light: #fff; $white-normal: #f0f0f0; @@ -134,6 +135,7 @@ $border-white-normal: darken($white-normal, $darken-border-factor); $border-gray-light: darken($gray-light, $darken-border-factor); $border-gray-normal: darken($gray-normal, $darken-border-factor); +$border-gray-normal-dashed: darken($gray-normal, $darken-border-dashed-factor); $border-gray-dark: darken($white-normal, $darken-border-factor); /* diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 94e4f4334d4..6400b72742c 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -752,7 +752,7 @@ a.deploy-project-label { } li.missing { - border: 1px dashed $border-gray-normal; + border: 1px dashed $border-gray-normal-dashed; border-radius: $border-radius-default; a { diff --git a/changelogs/unreleased/change-dashed-border-button-color.yml b/changelogs/unreleased/change-dashed-border-button-color.yml new file mode 100644 index 00000000000..038bea79273 --- /dev/null +++ b/changelogs/unreleased/change-dashed-border-button-color.yml @@ -0,0 +1,5 @@ +--- +title: changed dashed border button color to be darker +merge_request: !14041 +author: +type: other |