From 1c4a4d135def5d9342c28af5460418947110ee7f Mon Sep 17 00:00:00 2001 From: Jason Finch Date: Fri, 2 Mar 2018 14:32:16 +1000 Subject: [PATCH 1/2] Order of btns to fix dependency for state-bg-hover Moved order of btns before Widget States --- .../react-widgets/src/less/variables.less | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/react-widgets/src/less/variables.less b/packages/react-widgets/src/less/variables.less index 5728ef8cc..d27d37d7b 100644 --- a/packages/react-widgets/src/less/variables.less +++ b/packages/react-widgets/src/less/variables.less @@ -24,21 +24,6 @@ @icon-color: inherit; -// -// Widget States -// -@state-bg-select: #337ab7; -@state-border-select: @state-bg-select; -@state-color-select: white; - -@state-bg-hover: darken(@btn-bg, 10%); -@state-border-hover: @state-bg-hover; -@state-color-hover: @text-color; - -@state-bg-focus: transparent; -@state-border-focus: #66afe9; -@state-color-focus: @text-color; - // // Buttons // @@ -58,6 +43,21 @@ @select-btn-border-hover: @btn-border-hover; @select-btn-active-box-shadow: @btn-active-box-shadow; +// +// Widget States +// +@state-bg-select: #337ab7; +@state-border-select: @state-bg-select; +@state-color-select: white; + +@state-bg-hover: darken(@btn-bg, 10%); +@state-border-hover: @state-bg-hover; +@state-color-hover: @text-color; + +@state-bg-focus: transparent; +@state-border-focus: #66afe9; +@state-color-focus: @text-color; + // // Picker inputs // From 200317c34e8900f97ded951524941fee305f6d09 Mon Sep 17 00:00:00 2001 From: Jason Finch Date: Fri, 2 Mar 2018 16:36:03 +1000 Subject: [PATCH 2/2] Fix order of dependant variables. --- .../react-widgets/src/less/variables.less | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/react-widgets/src/less/variables.less b/packages/react-widgets/src/less/variables.less index d27d37d7b..2fce7207d 100644 --- a/packages/react-widgets/src/less/variables.less +++ b/packages/react-widgets/src/less/variables.less @@ -23,11 +23,26 @@ @icon-color: inherit; +@btn-bg: #fff; + +// +// Widget States +// +@state-bg-select: #337ab7; +@state-border-select: @state-bg-select; +@state-color-select: white; + +@state-bg-hover: darken(@btn-bg, 10%); +@state-border-hover: @state-bg-hover; +@state-color-hover: @text-color; + +@state-bg-focus: transparent; +@state-border-focus: #66afe9; +@state-color-focus: @text-color; // // Buttons // -@btn-bg: #fff; @btn-color: @text-color; @btn-border: #ccc; @@ -43,21 +58,6 @@ @select-btn-border-hover: @btn-border-hover; @select-btn-active-box-shadow: @btn-active-box-shadow; -// -// Widget States -// -@state-bg-select: #337ab7; -@state-border-select: @state-bg-select; -@state-color-select: white; - -@state-bg-hover: darken(@btn-bg, 10%); -@state-border-hover: @state-bg-hover; -@state-color-hover: @text-color; - -@state-bg-focus: transparent; -@state-border-focus: #66afe9; -@state-color-focus: @text-color; - // // Picker inputs //