diff --git a/app/styles/app/_mixins/vars.sass b/app/styles/app/_mixins/vars.sass index f4b5c16c..c43a3cf0 100644 --- a/app/styles/app/_mixins/vars.sass +++ b/app/styles/app/_mixins/vars.sass @@ -70,6 +70,7 @@ $font-size-xxl: 30px $grey1: #A5ACAD $grey2: #969496 $grey3: #808080 +$grey4: #e6e8e8 $grey: $grey1 $cream-light: #FAFAF8 $cream-dark: lighten(mix(#F7F7F4, $grey), 10) diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index c3df3082..f4f4f981 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -55,7 +55,7 @@ .icon.push background-image: inline-image('svg/push-icon.svg') -.icon.pull-request +.icon.pull_request background-image: inline-image('svg/pull-request-icon.svg') .icon-lock diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index 2e8d9ca0..7c1278f6 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -16,18 +16,21 @@ color: $grey2 padding: .2em 0 - .active - a - position: relative - color: $teal2 - &:after - content: "" - position: absolute - left: 0 - bottom: -3px - width: 100% - height: 2px - background-color: $teal2 + .active a, + a:hover + position: relative + color: $teal2 + &:after + content: "" + position: absolute + left: 0 + bottom: -3px + width: 100% + height: 2px + background-color: $teal2 + .active a + font-weight: 600 + @media #{$medium-up} diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index 0fc3cc83..3ecd6870 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -26,7 +26,7 @@ small margin: 0 font-weight: 400 - font-size: 15px + font-size: $font-size-m color: $grey3 line-height: 1 small @@ -69,11 +69,16 @@ width: 1.1em height: 1.2em margin: .7em auto 1em - .request-kind + .icon.push display: block width: 1.4em height: 1.1em - margin: .5em auto 1.1em + margin: -0.2em auto 0 + .icon.pull_request + display: block + width: 1.1em + height: 1.6em + margin: -0.5em auto 0 .tile-author img @@ -94,7 +99,7 @@ .tile--build .tile-main @media #{$medium-up} - border-right: solid 1px $grey1 + border-right: solid 1px $grey4 @media #{$xlarge-up} @include grid-column(8) .tile-additional diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs index b6ddb795..9c335092 100644 --- a/app/templates/builds.hbs +++ b/app/templates/builds.hbs @@ -4,7 +4,7 @@