diff options
author | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2016-12-21 13:36:27 +0300 |
---|---|---|
committer | Dimitrie Hoekstra <dimitrie@gitlab.com> | 2016-12-21 13:36:27 +0300 |
commit | 9b4b7da2c99fba3d2cc82325572da4caa58d79e7 (patch) | |
tree | e44d0787a5b5e3894a15be7a6df433b5b5863c96 /app/assets/stylesheets/framework/variables.scss | |
parent | 9046b583ff61d74c8e481053d150da924d129ad8 (diff) | |
parent | 09b622f84c83ea65c773ca4eb53d6899dc1c4956 (diff) |
Merge branch 'master' into 'badge-color-on-white-bg'
# Conflicts:
# app/assets/stylesheets/pages/pipelines.scss
Diffstat (limited to 'app/assets/stylesheets/framework/variables.scss')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 288bb67c4bf..a5fb097a47f 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; @@ -154,6 +155,8 @@ $row-hover-border: #b2d7ff; $progress-color: #c0392b; $header-height: 50px; $fixed-layout-width: 1280px; +$limited-layout-width: 990px; +$gl-avatar-size: 40px; $error-exclamation-point: #e62958; $border-radius-default: 2px; $settings-icon-size: 18px; @@ -444,7 +447,7 @@ $jq-ui-default-color: #777; $label-gray-bg: #f8fafc; $label-inverse-bg: #333; $label-remove-border: rgba(0, 0, 0, .1); -$label-border-radius: 14px; +$label-border-radius: 100px; /* * Lint @@ -480,7 +483,6 @@ $project-option-descr-color: #54565b; $project-breadcrumb-color: #999; $project-private-forks-notice-odd: #2aa056; $project-network-controls-color: #888; -$project-limit-message-bg: #f28d35; /* * Runners @@ -530,3 +532,9 @@ $body-text-shadow: rgba(255,255,255,0.01); */ $ui-dev-kit-example-color: #bbb; $ui-dev-kit-example-border: #ddd; + +/* +Pipeline Graph +*/ +$stage-hover-bg: #eaf3fc; +$stage-hover-border: #d1e7fc; |