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..96a48c7f 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 @@ -61,14 +53,14 @@ %helptext font-size: $font-size-m - color: $grey1 + color: $grey-medium a - color: $grey3 + color: $grey-dark text-decoration: none &:hover text-decoration: underline %section-title font-size: $font-size-sm - color: $grey1 + color: $grey-medium font-weight: 400 diff --git a/app/styles/app/_mixins/vars.sass b/app/styles/app/_mixins/vars.sass index 53158f1b..c7a3c05d 100644 --- a/app/styles/app/_mixins/vars.sass +++ b/app/styles/app/_mixins/vars.sass @@ -67,12 +67,12 @@ $tab-active-bg: $blue-grey-light // log $log-header-bg: #444444 -// new build header $font-size-xxl: 30px -$grey1: #A6ADAD -$grey2: #969496 -$grey3: #808080 -$grey4: #e6e8e8 -$grey: $grey1 + $cream-light: #FAFAF8 -$cream-dark: lighten(mix(#F7F7F4, $grey), 10) +$cream-dark: #EFF0EC +$grey-lighter: #A6ADAD +$grey-light: #8d8d8d +$grey-medium: #8d8d8d +$grey-dark: #808080 + diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index 67f6d0da..aa3851bb 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -8,7 +8,7 @@ padding-left: 0 !important padding-right: 0 !important padding-top: 30px !important - + overflow-y: auto .main, .profile-view @@ -43,7 +43,7 @@ #main position: relative - padding: 2em $column-gutter/2 5em + padding: 1.8em $column-gutter/2 5em .wrapper overflow: hidden diff --git a/app/styles/app/layouts/build-job.sass b/app/styles/app/layouts/build-job.sass index 22831b85..3926191f 100644 --- a/app/styles/app/layouts/build-job.sass +++ b/app/styles/app/layouts/build-job.sass @@ -34,7 +34,7 @@ p white-space: normal a - color: $grey2 + color: $grey-medium .tile-status--job width: 2em @@ -68,14 +68,12 @@ overflow: hidden .job-id width: grid-calc(3, 24) - border-right: solid 1px $grey4 - // max-width: 82px + border-right: solid 1px $grey-lighter .job-os width: grid-calc(1, 24) text-align: center .job-lang width: grid-calc(6, 24) - // max-width: 180px &:after @include fadeOut(right, -90deg, $cream-light) .job-anchor @@ -86,7 +84,6 @@ .job-env min-width: grid-calc(16, 24) width: grid-calc(16, 24) - // max-width: 395px &:after @include fadeOut(right, -90deg, $cream-light) &:hover diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index 1419bd7f..b5e5daef 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -1,11 +1,11 @@ .repo font-size: $font-size-m - color: $grey + color: $grey-medium .repo-header header - margin: .5rem 0 2.4rem + margin: .5rem 0 2.6rem > * vertical-align: middle @@ -15,7 +15,7 @@ font-weight: 400 font-size: 35px a - color: $grey3 + color: $grey-dark &:hover text-decoration: underline @@ -56,24 +56,26 @@ 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 display: block + a:not(.button) + color: $grey-medium + &:hover + color: $grey-medium .repo-main-commit position: relative padding-bottom: 0.5em + font-weight: 400 + color: $grey-dark &, small margin: 0 - font-weight: 400 font-size: $font-size-m - color: $grey3 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-lighter &:hover - background-color: darken($grey, 10) + background-color: darken($grey-medium, 10) .icon width: .9em height: 1.1em diff --git a/app/styles/app/layouts/caches.sass b/app/styles/app/layouts/caches.sass index 0d06d8ef..a2651660 100644 --- a/app/styles/app/layouts/caches.sass +++ b/app/styles/app/layouts/caches.sass @@ -2,7 +2,7 @@ @include resetul margin-top: 1rem font-size: $font-size-sm - color: $grey3 + color: $grey-medium clear: both .tile-xs diff --git a/app/styles/app/layouts/dashboard.sass b/app/styles/app/layouts/dashboard.sass index 8a49345b..8fbbc463 100644 --- a/app/styles/app/layouts/dashboard.sass +++ b/app/styles/app/layouts/dashboard.sass @@ -19,7 +19,7 @@ $db-gray: #C9C9C9 $db-text-color: #ACAAAA .dashboard - color: #6D6E70 + color: $grey-medium hr max-width: 1024px margin: auto @@ -207,7 +207,7 @@ $db-text-color: #ACAAAA padding: 0 4em 0 2em line-height: 3em transform: translateY(26%) - border-left: 1px solid $grey4 + border-left: 1px solid $cream-dark .db-burger height: 100% .db-status diff --git a/app/styles/app/layouts/first-sync.sass b/app/styles/app/layouts/first-sync.sass index 11a93fdb..279f0929 100644 --- a/app/styles/app/layouts/first-sync.sass +++ b/app/styles/app/layouts/first-sync.sass @@ -15,7 +15,7 @@ margin: 1.5em 0 1em font-size: 36px font-weight: 400 - color: $grey3 + color: $grey-medium p font-size: $font-size-ml diff --git a/app/styles/app/layouts/owner.sass b/app/styles/app/layouts/owner.sass index be87cf57..47245fbe 100644 --- a/app/styles/app/layouts/owner.sass +++ b/app/styles/app/layouts/owner.sass @@ -69,7 +69,7 @@ .tile-single, .tile-double - color: $grey1 + color: $grey-medium padding: .1em 0 font-size: $font-size-m .icon @@ -85,9 +85,9 @@ height: .6em margin: 0 a - color: $grey1 + color: $grey-medium &:hover - color: $grey1 + color: $grey-medium text-decoration: underline .tile-single @@ -104,7 +104,7 @@ & ~ div @media #{$medium-up} padding-left: 2em - border-left: 1px solid $grey4 + border-left: 1px solid $cream-dark .tabs--owner padding : 0 $column-gutter/2 @@ -128,4 +128,4 @@ margin-bottom: 1.5rem @media #{$medium-up} height: 2.2em - border-bottom: solid 2px $grey4 + border-bottom: solid 2px $cream-dark diff --git a/app/styles/app/layouts/profile.sass b/app/styles/app/layouts/profile.sass index 02b2651d..49df720b 100644 --- a/app/styles/app/layouts/profile.sass +++ b/app/styles/app/layouts/profile.sass @@ -12,10 +12,10 @@ line-height: 1.45 p:not(.sync-last) font-size: $font-size-sm - color: #adaaab + color: $grey-light margin: 2rem 0 1rem 0 a - color: #adaaab + color: $grey-light text-decoration: underline @media #{$medium-up} .profile-header, .sync-button, .ember-view @@ -37,7 +37,7 @@ margin-right: .5em p font-size: $font-size-m - color: #7a7a7a + color: $grey-medium .cta-btn text-align: right @@ -107,7 +107,7 @@ h1 color: #898b8c font-size: $font-size-sm - border-bottom: solid 2px #f3f2f2 + border-bottom: solid 2px $cream-dark .profile-user margin: 1rem 0 2rem @@ -165,9 +165,10 @@ p.profile-user-last vertical-align: middle span:not(.loading-indicator) display: none - margin-left: 2rem + margin-left: 1rem font-size: $font-size-sm - color: #484849 + color: darken($grey-dark, 10) + line-height: 1 .sync-spinner vertical-align: top &:hover diff --git a/app/styles/app/layouts/requests.sass b/app/styles/app/layouts/requests.sass index 9b3b9339..74108110 100644 --- a/app/styles/app/layouts/requests.sass +++ b/app/styles/app/layouts/requests.sass @@ -34,7 +34,7 @@ .requests-time @media #{$medium-up} padding-left: 2em - border-left: 1px solid $grey4 + border-left: 1px solid $grey-lighter .tile--jobs padding-left: 2.5em diff --git a/app/styles/app/layouts/sidebar.sass b/app/styles/app/layouts/sidebar.sass index 4993325f..bb6fdfbd 100644 --- a/app/styles/app/layouts/sidebar.sass +++ b/app/styles/app/layouts/sidebar.sass @@ -102,7 +102,7 @@ $sb-font-size: 14px .sidebar-list margin-top: 1.4rem - color: $grey1 + color: $grey-medium ul @include resetul border-bottom: .46rem solid #FAF9F7 diff --git a/app/styles/app/layouts/top.sass b/app/styles/app/layouts/top.sass index b05a5903..50caa7e2 100644 --- a/app/styles/app/layouts/top.sass +++ b/app/styles/app/layouts/top.sass @@ -66,7 +66,7 @@ $top-height: 55px background: none border: none line-height: 1 - color: $grey1 + color: $grey-medium outline: none !important @include clearfix &:hover @@ -78,7 +78,7 @@ $top-height: 55px .topbar font-size: $font-size-m background-color: #eff0ec - color: $grey1 + color: $grey-medium .navigation padding: 0 $column-gutter/2 diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass index fcd2f99c..4caac525 100644 --- a/app/styles/app/modules/buttons.sass +++ b/app/styles/app/modules/buttons.sass @@ -101,22 +101,15 @@ $button-border-color: #d4d4d4 .btn-activated font-size: $font-size-sm border: none - // padding-right: 2.5em &:hover - background-color: $grey2 + background-color: $grey-medium .btn-activated background-color: #39a85b color: $white - // @extend .icon-hook-on - // background: - // repeat: no-repeat - // position: 92% 45% &:hover background-color: darken(#39a85b, 10) - -// temp #auth #navigation .button--signin, #auth #navigation .button--signingin display: none diff --git a/app/styles/app/modules/dropdown.sass b/app/styles/app/modules/dropdown.sass index 5cfdc854..b224f89a 100644 --- a/app/styles/app/modules/dropdown.sass +++ b/app/styles/app/modules/dropdown.sass @@ -93,14 +93,14 @@ $dropdown-border: #C3D9DB .dropdown-button height: 28px - background-color: $grey + background-color: $grey-lighter border: none color: $white line-height: 1 font-size: $font-size-normal &:hover, &:focus - background-color: lighten($grey, 10) + background-color: lighten($grey-medium, 10) .icon-cog-light position: relative top: 0.15em @@ -113,13 +113,13 @@ $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% z-index: 70 overflow: hidden - background-color: $grey + background-color: $grey-lighter display: none a @extend %inline-block @@ -127,6 +127,6 @@ $dropdown-border: #C3D9DB padding: .4em 2em color: $white &:hover - background-color: darken($grey, 10) + background-color: darken($grey-lighter, 10) &.display display: block diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index 0c2561f2..a5889c10 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -1,6 +1,6 @@ .tabnav - color: $grey2 + color: $grey-light font-size: $font-size-sm ul @include resetul @@ -14,7 +14,7 @@ a @extend %inline-block width: 100% - color: $grey2 + color: $grey-light padding: .2em 0 .active a, @@ -47,7 +47,7 @@ content: "" display: block position: absolute - color: $grey4 + color: $grey-lighter top: 0.4em left: -0.7em width: .7em @@ -65,7 +65,7 @@ @extend %inline-block overflow: visible a - color: $grey2 + color: $grey-light padding: .5em 0 .active color: $teal2 diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index d3c9fd4d..50bbee6d 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -66,7 +66,7 @@ margin: 0 font-weight: 400 font-size: $font-size-m - color: $grey3 + color: $grey-dark line-height: 1 small margin-right: .3em @@ -86,9 +86,9 @@ height: 1.3em vertical-align: middle a - color: $grey1 + color: $grey-medium &:hover - color: $grey1 + color: $grey-medium text-decoration: underline @media #{$small-only} margin-top: 1em @@ -145,7 +145,7 @@ @media #{$medium-up} white-space: nowrap overflow: hidden - border-right: solid 1px $grey4 + border-right: solid 1px $cream-dark &:after @include fadeOut(right, -90deg, $cream-light) @media #{$xlarge-up}