From ef89c3dfd7edce153a0488fab11710c548c05f38 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Thu, 23 Jun 2016 16:59:36 -0300 Subject: [PATCH] LT-249: Creating warning and response status states for measurement rows --- .../roundedButtonGroup.styl | 8 +++--- Packages/design/styles/variables.styl | 15 +++++----- .../additionalMeasurements.styl | 2 +- .../lesionTableRow/lesionTableRow.html | 16 +++++------ .../lesionTableRow/lesionTableRow.styl | 28 ++++++++++++++++++- .../studySeriesQuickSwitch.styl | 2 +- 6 files changed, 47 insertions(+), 24 deletions(-) diff --git a/Packages/design/components/roundedButtonGroup/roundedButtonGroup.styl b/Packages/design/components/roundedButtonGroup/roundedButtonGroup.styl index 4b937f36e..6790138a5 100644 --- a/Packages/design/components/roundedButtonGroup/roundedButtonGroup.styl +++ b/Packages/design/components/roundedButtonGroup/roundedButtonGroup.styl @@ -17,7 +17,7 @@ $textColorActive = #2D2D2D .roundedButton align-items: center - background-color: $darkUiColor + background-color: $uiGrayDarker border: 1px $uiBorderColorDark solid color: $textSecondaryColor display: flex @@ -56,7 +56,7 @@ $textColorActive = #2D2D2D &:hover .roundedButton background-color: $boxBackgroundColor - color: $darkUiColor + color: $uiGrayDarker &.active .roundedButton background-color: $activeColor @@ -66,5 +66,5 @@ $textColorActive = #2D2D2D &:hover .roundedButton &.active .roundedButton svg - fill: $darkUiColor - stroke: $darkUiColor + fill: $uiGrayDarker + stroke: $uiGrayDarker diff --git a/Packages/design/styles/variables.styl b/Packages/design/styles/variables.styl index 233b03587..bef6074da 100644 --- a/Packages/design/styles/variables.styl +++ b/Packages/design/styles/variables.styl @@ -1,26 +1,25 @@ +// Common pallete +$uiYellow = #E29E4A +$uiSkyBlue = #6FBDE2 +$uiGrayDark = #263340 +$uiGrayDarker = #16202B +$uiGrayDarkest = #151A1F + // Interface UI Colors $defaultColor = #94A8B3 $hoverColor = #ffffff $activeColor = #40D9B8 $uiBorderColor = #436270 $uiBorderColorDark = #3C5D80 -$darkUiColor = #16202B $primaryBackgroundColor = #000000 $boxBackgroundColor = #3E5975 $boxBackgroundColorDark = #22374D -// Common pallete -$uiSkyBlue = #6FBDE2 -$uiGrayDark = #263340 -$uiGrayDarker = #16202B -$uiGrayDarkest = #151A1F - // Text Colors $textPrimaryColor = #ffffff $textSecondaryColor = #91B9CD // Other Colors -$errorColor = #E29E4A $menuBackgroundColor = #F2F2F2 // Sizes diff --git a/Packages/lesiontracker/client/components/additionalMeasurements/additionalMeasurements.styl b/Packages/lesiontracker/client/components/additionalMeasurements/additionalMeasurements.styl index 8e5a695a1..078889eae 100644 --- a/Packages/lesiontracker/client/components/additionalMeasurements/additionalMeasurements.styl +++ b/Packages/lesiontracker/client/components/additionalMeasurements/additionalMeasurements.styl @@ -25,7 +25,7 @@ font-size: 14px padding: 0 10px color: $textPrimaryColor - background-color: $darkUiColor + background-color: $uiGrayDarker .entrySection #regionsOfMetastaticDisease diff --git a/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.html b/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.html index bfeae9ce1..9a9767fbe 100644 --- a/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.html +++ b/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.html @@ -1,23 +1,21 @@