From 3fe260243b1c57439bc7a161c7cfbeb0d85a9921 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 22 Jun 2015 16:44:15 +0200 Subject: [PATCH] introduce darker grey --- app/styles/app/_mixins/colors.sass | 6 ------ app/styles/app/_mixins/mixins.sass | 8 ------- app/styles/app/_mixins/vars.sass | 8 +++++++ app/styles/app/layouts/buildheader.sass | 28 +++++++++++-------------- app/styles/app/modules/dropdown.sass | 4 ++-- 5 files changed, 22 insertions(+), 32 deletions(-) diff --git a/app/styles/app/_mixins/colors.sass b/app/styles/app/_mixins/colors.sass index 615b4b3c..eb27c7b4 100644 --- a/app/styles/app/_mixins/colors.sass +++ b/app/styles/app/_mixins/colors.sass @@ -32,12 +32,6 @@ $gray-light-2: #efefef $gray-light-3: #f2f2eb $gray-light-4: #fdfdfd -$cream-light: #FAFAF8 -$cream-dark: #EFF0EC -$grey-light: #A1A0A0 -$grey-medium: #969496 -$grey-dark: #808080 - $green-light: #73c78d $green-dark: #3FA75F $red-light: #D7625F diff --git a/app/styles/app/_mixins/mixins.sass b/app/styles/app/_mixins/mixins.sass index 7218d2c0..1373037b 100644 --- a/app/styles/app/_mixins/mixins.sass +++ b/app/styles/app/_mixins/mixins.sass @@ -29,14 +29,6 @@ padding: 0 list-style: none -@mixin border-bottom-radius($radius) - border-bottom-left-radius: $radius - border-bottom-right-radius: $radius - -@mixin border-top-radius($radius) - border-top-left-radius: $radius - border-top-right-radius: $radius - %border-radius-4px border-radius: 4px diff --git a/app/styles/app/_mixins/vars.sass b/app/styles/app/_mixins/vars.sass index 53158f1b..3a574d6b 100644 --- a/app/styles/app/_mixins/vars.sass +++ b/app/styles/app/_mixins/vars.sass @@ -74,5 +74,13 @@ $grey2: #969496 $grey3: #808080 $grey4: #e6e8e8 $grey: $grey1 + +$cream-light: #FAFAF8 +$cream-dark: #EFF0EC +$grey-lighter: #A6ADAD +$grey-light: #8d8d8d +$grey-medium: #8d8d8d +$grey-dark: #808080 + $cream-light: #FAFAF8 $cream-dark: lighten(mix(#F7F7F4, $grey), 10) diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index 1419bd7f..48539b58 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -1,7 +1,11 @@ .repo font-size: $font-size-m - color: $grey + color: $grey-medium + a + color: $grey-medium + &:hover + color: $grey-medium .repo-header header @@ -15,7 +19,7 @@ font-weight: 400 font-size: 35px a - color: $grey3 + color: $grey-medium &:hover text-decoration: underline @@ -56,7 +60,7 @@ margin-top: 2em .build-title margin-top: 2.5rem - color: $grey1 + color: $grey-medium font-size: $font-size-sm font-weight: 400 & span:hover + .tooltip @@ -65,15 +69,13 @@ .repo-main-commit position: relative padding-bottom: 0.5em + font-weight: 400 &, small margin: 0 - font-weight: 400 font-size: $font-size-m - color: $grey3 + color: $grey-medium line-height: 1 - a - color: $grey3 small margin-right: .3em font-weight: 600 @@ -84,10 +86,6 @@ @include fadeOut(right, -90deg, $cream-light) .repo-main-description - p:not(.body) - color: $grey3 - a - color: $grey3 p margin: 0 @media #{$medium-up} @@ -105,7 +103,7 @@ overflow: hidden word-break: break-word white-space: pre-wrap - color: $grey2 + color: $grey-medium .repo-main-info @include resetul @@ -117,8 +115,6 @@ overflow: hidden &:after @include fadeOut(right, -90deg, $cream-light) - a - color: $grey white-space: nowrap &:hover text-decoration: underline @@ -134,9 +130,9 @@ display: block margin-bottom: .5em text-align: center - background-color: $grey1 + background-color: $grey-medium &:hover - background-color: darken($grey, 10) + background-color: darken($grey-medium, 10) .icon width: .9em height: 1.1em diff --git a/app/styles/app/modules/dropdown.sass b/app/styles/app/modules/dropdown.sass index 5cfdc854..d1f6c479 100644 --- a/app/styles/app/modules/dropdown.sass +++ b/app/styles/app/modules/dropdown.sass @@ -93,7 +93,7 @@ $dropdown-border: #C3D9DB .dropdown-button height: 28px - background-color: $grey + background-color: $grey-lighter border: none color: $white line-height: 1 @@ -113,7 +113,7 @@ $dropdown-border: #C3D9DB .dropdown-menu @include resetul - @include border-bottom-radius(4px) + @extend %border-bottom-4px position: absolute top: 29px // height of the button +1 width: 100%