From 8b7a316ebfc6d8552bf7c88584cffc3fb2ac7c63 Mon Sep 17 00:00:00 2001 From: Lisa P Date: Thu, 17 Sep 2015 12:29:11 +0200 Subject: [PATCH] finally centered those dropups --- app/components/request-icon.coffee | 2 +- app/components/status-icon.coffee | 2 +- app/styles/app/layouts/branches.sass | 28 +++++++++++++++++-------- app/templates/components/branch-row.hbs | 12 +++++------ 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/components/request-icon.coffee b/app/components/request-icon.coffee index 6f377e49..2d97aa28 100644 --- a/app/components/request-icon.coffee +++ b/app/components/request-icon.coffee @@ -3,7 +3,7 @@ RequestIconComponent = Ember.Component.extend tagName: 'span' - classNames: ['icon-request'] + classNames: ['icon-request', 'icon'] classNameBindings: ['build.last_build.state', 'build.state'] isPush: (-> diff --git a/app/components/status-icon.coffee b/app/components/status-icon.coffee index b16168fb..fbbe7c57 100644 --- a/app/components/status-icon.coffee +++ b/app/components/status-icon.coffee @@ -3,7 +3,7 @@ StatusIconComponent = Ember.Component.extend tagName: 'span' - classNames: ['status-icon'] + classNames: ['status-icon', 'icon'] classNameBindings: ['build.last_build.state', 'build.state'] hasPassed: (-> diff --git a/app/styles/app/layouts/branches.sass b/app/styles/app/layouts/branches.sass index 8b2a3124..a056f4c5 100644 --- a/app/styles/app/layouts/branches.sass +++ b/app/styles/app/layouts/branches.sass @@ -22,7 +22,7 @@ color: $grey-dark background: linear-gradient(to right, #CACECE 0%, #CACECE 9px, white 10px, white 100%) no-repeat - span[class*="icon"] + .icon width: 1.3em height: 1.3em margin-right: .2em @@ -65,6 +65,15 @@ width: 5% & > div:nth-of-type(5) width: 27% + @media #{$large-up} + & > div:nth-of-type(2) + width: 21% + & > div:nth-of-type(3) + width: 21% + & > div:nth-of-type(4) + width: 2em + & > div:nth-of-type(5) + width: 25% @include statusColors($green-dark, 'passed') @include statusColors($red-dark, 'failed') @@ -168,9 +177,10 @@ fill: $white @media #{$medium-up} + width: 10em + left: 0 padding: .3em - transform: translateY(-160%) - right: 24.5% + transform: translate(-42%, -170%) border: 1px solid $teal-dark li display: block @@ -197,20 +207,20 @@ display: inline-block vertical-align: middle - @media #{$large-up} - right: 24.5% - .dropup--status @extend %dropup + left: 0 + right: 0 + margin: auto display: none &:after bottom: -3px &:before bottom: -4px @media #{$medium-up} - top: -3em - width: 100% - padding: .2em .3em + top: -2.3em + width: 4em + padding: .1em .1em white-space: nowrap font-size: 14px; border: 1px solid $red-dark diff --git a/app/templates/components/branch-row.hbs b/app/templates/components/branch-row.hbs index 37176b83..fd806dba 100644 --- a/app/templates/components/branch-row.hbs +++ b/app/templates/components/branch-row.hbs @@ -4,7 +4,7 @@
- + +
{{#if build.last_build}}