From 32c83dd7a5ffac3c501ef663acb8c2cfbb31956d Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Thu, 27 Jul 2017 14:53:18 +0200 Subject: [PATCH] Add label variations to /patron --- app/assets/stylesheets/new_design/labels.scss | 25 +++++++++++++++++++ .../new_design/procedures_show.scss | 24 ------------------ app/views/root/patron.html.haml | 5 ++++ 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/new_design/labels.scss b/app/assets/stylesheets/new_design/labels.scss index a623d900f..5c9de758c 100644 --- a/app/assets/stylesheets/new_design/labels.scss +++ b/app/assets/stylesheets/new_design/labels.scss @@ -5,7 +5,32 @@ display: inline-block; padding: 4px $default-spacer; background: $grey; + border: 1px solid transparent; color: #FFFFFF; border-radius: 4px; font-size: 12px; + + &.instruction { + background-color: #FFFFFF; + color: $blue; + border: 1px solid $blue; + } + + &.construction { + background-color: #FFFFFF; + color: $black; + border: 1px solid $black; + } + + &.closed { + background-color: $green; + } + + &.refused { + background-color: $dark-red; + } + + &.without-continuation { + background-color: $black; + } } diff --git a/app/assets/stylesheets/new_design/procedures_show.scss b/app/assets/stylesheets/new_design/procedures_show.scss index 076315ef0..e0e82c79e 100644 --- a/app/assets/stylesheets/new_design/procedures_show.scss +++ b/app/assets/stylesheets/new_design/procedures_show.scss @@ -127,30 +127,6 @@ .label { width: 110px; text-align: center; - - &.instruction { - background-color: #FFFFFF; - color: $blue; - border: 1px solid $blue; - } - - &.construction { - background-color: #FFFFFF; - color: $black; - border: 1px solid $black; - } - - &.closed { - background-color: $green; - } - - &.refused { - background-color: $dark-red; - } - - &.without-continuation { - background-color: $black; - } } .button { diff --git a/app/views/root/patron.html.haml b/app/views/root/patron.html.haml index 1de270904..944142523 100644 --- a/app/views/root/patron.html.haml +++ b/app/views/root/patron.html.haml @@ -52,6 +52,11 @@ %h1 Labels %span.label .label + %span.label.instruction .label.instruction + %span.label.construction .label.construction + %span.label.closed .label.closed + %span.label.refused .label.refused + %span.label.without-continuation .label.without-continuation %h1 Cards