From 4e532118ea881ad800c93e7148abd7ed3ea96de9 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 16 Mar 2015 12:31:10 +0100 Subject: [PATCH] implement design feedbacdk and new icons --- app/styles/app/_mixins/vars.sass | 1 + app/styles/app/modules/buttons.sass | 1 + app/styles/app/modules/icons.sass | 19 ++++++----------- app/styles/app/modules/tabs.sass | 16 +++++++------- app/styles/app/modules/tiles.sass | 16 +++++--------- public/images/svg/icon-help.svg | 17 +++++++++++++++ public/images/svg/icon-job-errored.svg | 12 +++++++++++ public/images/svg/icon-job-started.svg | 11 ++++++++++ public/images/svg/icon-tab-arrow.svg | 8 +++++++ public/images/svg/question.svg | 29 -------------------------- 10 files changed, 70 insertions(+), 60 deletions(-) create mode 100644 public/images/svg/icon-help.svg create mode 100644 public/images/svg/icon-job-errored.svg create mode 100644 public/images/svg/icon-job-started.svg create mode 100644 public/images/svg/icon-tab-arrow.svg delete mode 100644 public/images/svg/question.svg diff --git a/app/styles/app/_mixins/vars.sass b/app/styles/app/_mixins/vars.sass index e32c847c..ec945b9a 100644 --- a/app/styles/app/_mixins/vars.sass +++ b/app/styles/app/_mixins/vars.sass @@ -35,6 +35,7 @@ $start-color: #D2C93B $start-bg-color: #D2CA24 $cancel-color: #A1A0A0 $dropdown-color: $teal1 +$created-color: #CDBC2C $dashboard-text-color: #9d9fa1 diff --git a/app/styles/app/modules/buttons.sass b/app/styles/app/modules/buttons.sass index bd91bf68..cc60c1fb 100644 --- a/app/styles/app/modules/buttons.sass +++ b/app/styles/app/modules/buttons.sass @@ -146,5 +146,6 @@ $button-border-color: #d4d4d4 .icon--question @extend %absolute-center width: 0.9em + transform: translateX(.1em) background-size: 80% auto diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass index 8b1aefac..f77bd026 100644 --- a/app/styles/app/modules/icons.sass +++ b/app/styles/app/modules/icons.sass @@ -93,21 +93,11 @@ background-image: inline-image('svg/icon-job-passed.svg') .icon--error-grey, .icon--job.errored - &:after - content: "!" - display: block - width: 0.4em - height: 1em - font-size: 24px + background-image: inline-image('svg/icon-job-errored.svg') .icon--job.started, .icon--job.created, .icon--started-yellow - &:after - content: "..." - display: block - width: 0.4em - height: 1em - font-size: 24px + background-image: inline-image('svg/icon-job-started.svg') .icon--lang background-image: inline-image('svg/icon-language.svg') @@ -120,7 +110,10 @@ .icon--eye background-image: inline-image('svg/icon-showmore.svg') .icon--question - background-image: inline-image('svg/question.svg') + background-image: inline-image('svg/icon-help.svg') + +.icon-tab-arrow + background-image: inline-image('svg/icon-tab-arrow.svg') .icon-arrow-down diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index 49b95878..c0a02746 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -44,16 +44,18 @@ position: relative padding-left: 1em &:before - content: "\003E" + content: "" display: block position: absolute color: $grey4 - left: -0.5em - width: .6em - height: 1em - font-size: 29px - line-height: 1 - transform: scale(0.6, 1.6) + top: 0.4em + left: -0.7em + width: .7em + height: 1.3em + background: + size: 100% + repeat: no-repeat + @extend .icon-tab-arrow .tabbody diff --git a/app/styles/app/modules/tiles.sass b/app/styles/app/modules/tiles.sass index ec88f287..b5a4d4cc 100644 --- a/app/styles/app/modules/tiles.sass +++ b/app/styles/app/modules/tiles.sass @@ -44,12 +44,13 @@ &.failed @include colorJobs($fail-color) &.errored - @include colorJobs($cancel-color) + @include colorJobs(#939292) &.passed @include colorJobs($pass-color) &.started, - &.created - @include colorJobs($start-color) + &.created, + &.received + @include colorJobs($created-color) @media #{$medium-up} height: 145px @@ -167,15 +168,8 @@ margin-bottom: 0.3em @media #{$medium-up} height: 64px - .icon.errored - width: .5em - .icon.started, - .icon.created - &:after - width: .8em - color: $start-color - margin-top: -0.3em .tile-main + color: #7d8282 .icon margin-right: .3em .icon.mac diff --git a/public/images/svg/icon-help.svg b/public/images/svg/icon-help.svg new file mode 100644 index 00000000..a0c81ce9 --- /dev/null +++ b/public/images/svg/icon-help.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/public/images/svg/icon-job-errored.svg b/public/images/svg/icon-job-errored.svg new file mode 100644 index 00000000..914b14a8 --- /dev/null +++ b/public/images/svg/icon-job-errored.svg @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/public/images/svg/icon-job-started.svg b/public/images/svg/icon-job-started.svg new file mode 100644 index 00000000..88a2827b --- /dev/null +++ b/public/images/svg/icon-job-started.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/public/images/svg/icon-tab-arrow.svg b/public/images/svg/icon-tab-arrow.svg new file mode 100644 index 00000000..4fcd0df5 --- /dev/null +++ b/public/images/svg/icon-tab-arrow.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/public/images/svg/question.svg b/public/images/svg/question.svg deleted file mode 100644 index 2638265e..00000000 --- a/public/images/svg/question.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - -