diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-01-01 22:12:50 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-01 22:12:50 -0500 |
commit | d1873f16b4cc954b1417fa84517d44b22a05821f (patch) | |
tree | 4a6958330f3d3e110ea34a2d3e9bbdfe7be0c269 | |
parent | 1a1113f7c4ad6e5bceb898593cba6caecbdf0097 (diff) | |
download | gitlab-ce-d1873f16b4cc954b1417fa84517d44b22a05821f.tar.gz |
Update cal-heatmap style overridesrs-bump-cal-heatmap
Some were no longer needed, others needed `!important`.
-rw-r--r-- | app/assets/stylesheets/framework/calendar.scss | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss index a36fefe22c5..580012abd77 100644 --- a/app/assets/stylesheets/framework/calendar.scss +++ b/app/assets/stylesheets/framework/calendar.scss @@ -19,38 +19,33 @@ } } } + /** * This overwrites the default values of the cal-heatmap gem */ .calendar { .qi { - background-color: #999; fill: #fff; } .q1 { - background-color: #dae289; - fill: #ededed; + fill: #ededed !important; } .q2 { - background-color: #cedb9c; - fill: #ACD5F2; + fill: #ACD5F2 !important; } .q3 { - background-color: #b5cf6b; - fill: #7FA8D1; + fill: #7FA8D1 !important; } .q4 { - background-color: #637939; - fill: #49729B; + fill: #49729B !important; } .q5 { - background-color: #3b6427; - fill: #254E77; + fill: #254E77 !important; } .domain-background { @@ -59,32 +54,7 @@ } .ch-tooltip { - position: absolute; - display: none; - margin-top: 22px; - margin-left: 1px; - font-size: 13px; padding: 3px; font-weight: 550; - background-color: #222; - span { - position: absolute; - width: 200px; - text-align: center; - visibility: hidden; - border-radius: 10px; - &:after { - content: ''; - position: absolute; - top: 100%; - left: 50%; - margin-left: -8px; - width: 0; - height: 0; - border-top: 8px solid #000000; - border-right: 8px solid transparent; - border-left: 8px solid transparent; - } - } } } |