diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-11 13:14:05 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-11 13:14:05 +0000 |
commit | 8f4e754414c8ad9b5007e5c1f5fb6fe5a6bbd3f7 (patch) | |
tree | b809de6106441124d4c0ce200ccf581e2c8d2b7c /app/assets/stylesheets/framework | |
parent | e17fa240751778a3dcecd98e2d16bea2a0582234 (diff) | |
parent | d87df157987e5ba2690fc1a7937e557821efb997 (diff) | |
download | gitlab-ce-8f4e754414c8ad9b5007e5c1f5fb6fe5a6bbd3f7.tar.gz |
Merge branch '21604-pipeline-ui-updates' into 'master'
Update pipeline graph styles to match mockup
#### What does this MR do?
* Updates CSS for pipeline graph to match mockup
* Adds JS to dynamically change line widths based on number of builds
#### Screenshots (if relevant)
![Screen_Shot_2016-10-04_at_2.06.24_PM](/uploads/362378ca23e18a3cc59185eafab9f9ac/Screen_Shot_2016-10-04_at_2.06.24_PM.png)
#### What are the relevant issue numbers?
Closes #21604
See merge request !6320
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 14ec310de2d..4c34ed3ebf7 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -17,8 +17,10 @@ $white-normal: #ededed; $white-dark: #ececec; $gray-light: #fafafa; +$gray-lighter: #f9f9f9; $gray-normal: #f5f5f5; $gray-dark: #ededed; +$gray-darker: #eee; $gray-darkest: #c9c9c9; $green-light: #38ae67; @@ -33,6 +35,8 @@ $blue-medium-light: #3498cb; $blue-medium: #2f8ebf; $blue-medium-dark: #2d86b4; +$blue-light-transparent: rgba(44, 159, 216, 0.05); + $orange-light: #fc8a51; $orange-normal: #e75e40; $orange-dark: #ce5237; @@ -91,6 +95,7 @@ $table-text-gray: #8f8f8f; $gl-font-size: 15px; $gl-title-color: #333; $gl-text-color: #5c5c5c; +$gl-text-color-light: #8c8c8c; $gl-text-green: #4a2; $gl-text-red: #d12f19; $gl-text-orange: #d90; |