From de7c79092e8cd48059e1817436f1990e04326306 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 11 Dec 2015 11:30:50 +0000 Subject: [PATCH] Moved definitions for the AD ballot position's background colours (which shows each AD his own positions by colour coding) from ietf.css to ietf.less, to make it easier to adjust the colours while keeping to the hues of the colour palette. - Legacy-Id: 10577 --- bootstrap/less/ietf.less | 21 +++++++++++++++++++-- ietf/static/ietf/css/ietf.css | 25 +++++++++++++++---------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/bootstrap/less/ietf.less b/bootstrap/less/ietf.less index 6210bd204..ca9652e86 100644 --- a/bootstrap/less/ietf.less +++ b/bootstrap/less/ietf.less @@ -11,11 +11,11 @@ @brand-yellow: #f8e16d; // // Secondary colours, not part of the primary palette -@brand-green: #69fc2c; +@brand-green: #78D916; @brand-primary: @brand-blue; // space blue -@brand-success: darken(@brand-green, 20%); // green // #3abf03 +@brand-success: @brand-green; // green // #3abf03 @brand-info: darken(@brand-yellow, 10%); // yellow @brand-warning: @brand-orange; // orange //@brand-danger: darken(saturate(@brand-orange, 60%), 10%); @@ -123,6 +123,23 @@ } +.position-discuss, +.position-block { background-color: @brand-warning; } +.position-yes { background-color: @brand-success; } +.position-noobj { background-color: hsl(hue(@brand-success), 80%, 85%); } +.position-abstain { background-color: hsl(hue(@brand-primary), 80%, 70%); } +.position-recuse { background-color: lighten(@gray-base, 50%); } +.position-norecord { background-color: @body-bg; } + +.position-discuss-row, +.position-block-row { background-color: hsl(hue(@brand-warning), 90%, 92%) !important ; } +.position-yes-row { background-color: hsl(hue(@brand-success),100%, 88%) !important ; } +.position-noobj-row { background-color: hsl(hue(@brand-success), 80%, 97%) !important ; } +.position-abstain-row { background-color: hsl(hue(@brand-primary), 90%, 95%) !important ; } +.position-recuse-row { background-color: lighten(@gray-base, 85%) !important ; } +.position-norecord-row { background-color: inherit; } + + // XXX This change from before is not currently being applied, not sure how // critical this is: //--- /Users/lars/Downloads/bootstrap-3.3.5/less/mixins/forms.less 2015-06-16 10:13:22.000000000 +0200 diff --git a/ietf/static/ietf/css/ietf.css b/ietf/static/ietf/css/ietf.css index a1700fc63..6f2755b7f 100644 --- a/ietf/static/ietf/css/ietf.css +++ b/ietf/static/ietf/css/ietf.css @@ -126,20 +126,23 @@ label.required:after { content: "\2217"; color: #a94442; font-weight: bold; } .nav-tabs[role=tablist] { margin-bottom: 0.7em; } /* Styles needed for the ballot table */ +/* .position-discuss, -.position-block { background-color: #d4584d; } /* @alert-danger-bg */ -.position-yes { background-color: #67F72B; } /* @brand-success */ -.position-noobj { background-color: #D1F7C1; } /* lighten(@brand-success) */ -.position-abstain { background-color: #f69f74; } /* @brand-warning */ +.position-block { background-color: #f0ad4e; } +.position-yes { background-color: #67F72B; } +.position-noobj { background-color: #D1F7C1; } +.position-abstain { background-color: #8C73F5; } .position-recuse { background-color: #808080; } -.position-norecord { background-color: inherit; } +.position-norecord { background-color: #FFFFFF; } .position-discuss-row, -.position-block-row { background-color: #F1CBC8 !important ; } /* lighter variants of above */ -.position-yes-row { background-color: #E1FDD6 !important ; } -.position-noobj-row { background-color: #F2FCEE !important ; } -.position-abstain-row { background-color: #FAD0BB !important ; } +.position-block-row { background-color: #FFE5d9 !important ; } +.position-yes-row { background-color: #DBFFCC !important ; } +.position-noobj-row { background-color: #F4FFF0 !important ; } +.position-abstain-row { background-color: #eae5ff !important ; } .position-recuse-row { background-color: #D9D9D9 !important ; } -.position-norecord-row { background-color: inherit; } +.position-norecord-row { background-color: #ffffff; } +*/ + .ballot-icon table td { border: 1px solid #ddd; height: 10px; width: 8px; } .ballot-icon table .my { border: 2px solid #000;} .ballot-icon table { margin: 0 0 10px 10px; } @@ -414,6 +417,8 @@ td.ad div { border-bottom: solid #ccc 1px; } .adname { padding-bottom: .5em; line-height: 1em;} +.changebar { width: 0.3em; } + h1 small .pull-right { margin-top: 10.5px; } .large {font-size: 120%;}