From 672413dfa24b6eb7069449e24d6e072a49cb3e37 Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 7 Oct 2014 12:30:30 -0400 Subject: [PATCH] Move some variables over to bordercolor --- src/definitions/elements/button.less | 1 + .../packages/default/collections/menu.variables | 2 +- .../packages/default/elements/button.variables | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index baced4e17..786d6da17 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -132,6 +132,7 @@ .ui.loading.button { position: relative; cursor: default; + point-events: none; background: @loadingBackground !important; text-shadow: none !important; diff --git a/src/themes/packages/default/collections/menu.variables b/src/themes/packages/default/collections/menu.variables index 10ee085bb..7f09086b1 100755 --- a/src/themes/packages/default/collections/menu.variables +++ b/src/themes/packages/default/collections/menu.variables @@ -24,7 +24,7 @@ @fontWeight: normal; @boxShadow: - 0px 0px 0px 1px rgba(0, 0, 0, 0.1), + 0px 0px 0px 1px @borderColor, @subtleShadow ; diff --git a/src/themes/packages/default/elements/button.variables b/src/themes/packages/default/elements/button.variables index 80a9b4ddd..d8f29af05 100755 --- a/src/themes/packages/default/elements/button.variables +++ b/src/themes/packages/default/elements/button.variables @@ -97,7 +97,7 @@ @downBackgroundImage: ''; @downBoxShadow: @borderBoxShadow, - 0px 1px 4px 0px rgba(0, 0, 0, 0.1) inset !important + 0px 1px 4px 0px @borderColor inset !important ; @downColor: @pressedTextColor; @@ -169,22 +169,22 @@ @basicBackground: transparent; @basicFontWeight: normal; -@basicBoxShadow: 0px 0px 0px @basicBorderSize rgba(0, 0, 0, 0.1) inset; +@basicBoxShadow: 0px 0px 0px @basicBorderSize @borderColor inset; @iconOffset: 0.05em; -@basicLoadingColor: #FFFFFF; +@basicLoadingColor: @offWhite; @basicTextTransform: none; /* Basic Hover */ @basicHoverBackground: #FAFAFA; @basicHoverBoxShadow: - 0px 0px 0px @basicBorderSize rgba(0, 0, 0, 0.1) inset, - 0px 0px 0px 0px rgba(0, 0, 0, 0.1) inset + 0px 0px 0px @basicBorderSize @borderColor inset, + 0px 0px 0px 0px @borderColor inset ; /* Basic Down */ @basicDownBackground: #F8F8F8; @basicDownBoxShadow: 0px 0px 0px @basicBorderSize rgba(0, 0, 0, 0.15) inset, - 0px 1px 4px 0px rgba(0, 0, 0, 0.1) inset + 0px 1px 4px 0px @borderColor inset ; /* Basic Active */ @basicActiveBackground: @transparentBlack; @@ -236,7 +236,7 @@ /* Attached */ @attachedOffset: -1px; -@attachedBoxShadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1); +@attachedBoxShadow: 0px 0px 0px 1px @borderColor; @attachedHorizontalPadding: 0.75em; /* Floated */