From b02165f0f28a89a1827036561b2879dc40c30eea Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Fri, 6 Mar 2015 13:20:27 +0100 Subject: [PATCH] align all the things --- app/styles/app/_mixins/mixins.sass | 7 ------- app/styles/app/layouts/buildheader.sass | 26 ++++++++++++++++++++++--- app/styles/app/modules/buttons.sass | 4 ++-- app/styles/app/modules/dropdown.sass | 12 +++++++++--- app/styles/app/modules/icons.sass | 5 ++++- app/styles/app/modules/tiles.sass | 10 ++++++---- app/templates/build.hbs | 1 - app/templates/repo.hbs | 5 +++-- app/templates/repos/show/tools.hbs | 2 +- 9 files changed, 48 insertions(+), 24 deletions(-) diff --git a/app/styles/app/_mixins/mixins.sass b/app/styles/app/_mixins/mixins.sass index e801d908..8b5761de 100644 --- a/app/styles/app/_mixins/mixins.sass +++ b/app/styles/app/_mixins/mixins.sass @@ -51,10 +51,3 @@ %inline-block display: inline-block - -@mixin colorTiles($color) - .tile-status - background-color: $color - .repo-header-title a, - .repo-build-status - color: $color \ No newline at end of file diff --git a/app/styles/app/layouts/buildheader.sass b/app/styles/app/layouts/buildheader.sass index feeae772..c4a5195e 100644 --- a/app/styles/app/layouts/buildheader.sass +++ b/app/styles/app/layouts/buildheader.sass @@ -1,3 +1,10 @@ +@mixin colorTiles($color) + .tile-status + background-color: $color + .repo-header-title a, + .repo-build-status a + color: $color + .repo font-size: $font-size-normal @@ -30,15 +37,21 @@ margin: 0 font-weight: 400 font-size: $font-size-xxl - + &:hover + text-decoration: underline .repo-header-icons + line-height: 1 + vertical-align: middle a @extend %inline-block height: 1.7em + margin-left: .7em .icon - width: 1.7em + width: 1.5em height: 100% + position: relative + top: 0.65em @media #{$medium-up} @extend %inline-block @@ -49,9 +62,9 @@ float: right .tabnav float: left + margin-bottom: .5em .tabbody clear: both - margin-top: 4px .repo-main-commit &, @@ -67,6 +80,8 @@ .repo-main-author img + width: 21px + height: 21px margin-right: .4em vertical-align: middle border-radius: 50% @@ -80,6 +95,11 @@ margin-right: 1.4em border-right: $cream-dark 1px solid line-height: 1.8 + a + color: $grey + &:hover + text-decoration: underline + .icon margin-right: .3em height: 1.3em diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass index 138f6469..2b0d5a67 100644 --- a/app/styles/app/modules/buttons.sass +++ b/app/styles/app/modules/buttons.sass @@ -86,7 +86,8 @@ $button-border-color: #d4d4d4 position: relative top: -0.15em -.button +.btn + @extend .button border-radius: 4px .button--green border: none @@ -108,7 +109,6 @@ $button-border-color: #d4d4d4 padding: 0 10px 0 10px background-color: #696867 color: #f2f2f2 - // line-height: 1.45 font-size: $font-size-small border: none @extend %border-radius-4px diff --git a/app/styles/app/modules/dropdown.sass b/app/styles/app/modules/dropdown.sass index e9765b25..c4c0a6a6 100644 --- a/app/styles/app/modules/dropdown.sass +++ b/app/styles/app/modules/dropdown.sass @@ -92,13 +92,19 @@ $dropdown-border: #C3D9DB width: 10.7rem .dropdown-button - height: 30px + height: 28px background-color: $grey border: none color: $white + line-height: 1 font-size: $font-size-normal - &:hover + &:hover, + &:focus background-color: lighten($grey, 10) + .icon--cog + position: relative + top: 0.15em + left: -0.2em .icon-arrow-down border-top-color: $white @@ -109,7 +115,7 @@ $dropdown-border: #C3D9DB @include resetul @include border-bottom-radius(4px) position: absolute - top: 31px // height of the button +1 + top: 29px // height of the button +1 width: 100% z-index: 70 overflow: hidden diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 33ddac39..f120e791 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -52,7 +52,10 @@ background-image: inline-image('dashboard/status-pending.svg') .icon.push - background-image: inline-image('icons/push.svg') + background-image: inline-image('svg/push-icon.svg') + +.icon.pull-request + background-image: inline-image('svg/pull-request-icon.svg') .icon-lock background-image: inline-image('dashboard/private-icon.svg') diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index 9461dfb6..a51f3d4e 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -9,9 +9,6 @@ .tile-main height: 100% - img - width: 16px - height: 16px // todo refactor .tile-main @@ -32,9 +29,14 @@ height: 100% border-top-left-radius: 4px border-bottom-left-radius: 4px - .icon + .icon-status display: block width: 1.1em + height: 1.2em + margin: .5em auto 1.1em + .request-kind + display: block + width: 1.5em height: 1.1em margin: .5em auto 1.1em diff --git a/app/templates/build.hbs b/app/templates/build.hbs index 1a06b68d..6abc1ae3 100644 --- a/app/templates/build.hbs +++ b/app/templates/build.hbs @@ -29,7 +29,6 @@