From 663e2c2569937f11a48926b9dad3fda86a91b61d Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 11 May 2015 15:34:20 -0400 Subject: [PATCH] Fix @defaultEasing and @transitionEasing variable duplication, Fix @defaultDuration and @transitionDuration variable duplication --- src/definitions/elements/button.less | 4 ++-- src/definitions/elements/icon.less | 2 +- src/definitions/elements/input.less | 1 + src/definitions/elements/reveal.less | 6 +++--- src/definitions/modules/checkbox.less | 2 +- src/themes/amazon/elements/button.variables | 8 +++---- src/themes/classic/views/card.overrides | 2 +- src/themes/default/collections/menu.variables | 12 +++++------ .../default/collections/table.variables | 6 +++--- src/themes/default/elements/button.variables | 14 ++++++------- src/themes/default/elements/input.variables | 6 +++--- src/themes/default/elements/label.variables | 4 ++-- src/themes/default/elements/reveal.variables | 2 +- src/themes/default/elements/step.variables | 8 +++---- src/themes/default/globals/site.variables | 21 +++++++------------ .../default/modules/accordion.variables | 10 ++++----- src/themes/default/modules/dropdown.variables | 6 +++--- src/themes/default/modules/progress.variables | 4 ++-- src/themes/default/modules/search.variables | 8 +++---- src/themes/default/modules/sticky.variables | 2 +- src/themes/default/views/card.variables | 10 ++++----- src/themes/default/views/feed.variables | 2 +- src/themes/default/views/item.variables | 8 +++---- src/themes/material/elements/button.variables | 10 ++++----- src/themes/raised/elements/button.variables | 10 ++++----- src/themes/round/elements/button.variables | 2 +- 26 files changed, 82 insertions(+), 88 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index bfdcedd4d..06306207c 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -749,15 +749,15 @@ .ui.labeled.icon.buttons > .button > .icon, .ui.labeled.icon.button > .icon { position: absolute; - width: @labeledIconWidth; height: 100%; + line-height: 1; + width: @labeledIconWidth; background-color: @labeledIconBackgroundColor; text-align: center; color: @labeledIconColor; border-radius: @borderRadius 0px 0px @borderRadius; - line-height: 1; box-shadow: @labeledIconLeftShadow; } diff --git a/src/definitions/elements/icon.less b/src/definitions/elements/icon.less index ef8eb0506..e29619a6c 100755 --- a/src/definitions/elements/icon.less +++ b/src/definitions/elements/icon.less @@ -114,7 +114,7 @@ i.disabled.icon { i.link.icon { cursor: pointer; opacity: @linkOpacity; - transition: opacity @transitionDuration @transitionEasing; + transition: opacity @defaultDuration @defaultEasing; } i.link.icon:hover { opacity: 1 !important; diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less index fc14c3535..797a016e4 100755 --- a/src/definitions/elements/input.less +++ b/src/definitions/elements/input.less @@ -242,6 +242,7 @@ .ui.icon.input > i.icon { cursor: default; position: absolute; + line-height: 1; text-align: center; top: 0px; right: 0px; diff --git a/src/definitions/elements/reveal.less b/src/definitions/elements/reveal.less index 0aa91d5ab..e10c83bd6 100755 --- a/src/definitions/elements/reveal.less +++ b/src/definitions/elements/reveal.less @@ -68,7 +68,7 @@ margin: 0em; transition: - transform @transitionDuration @transitionEasing @transitionDelay, + transform @defaultDuration @defaultEasing @transitionDelay, ; } @@ -159,7 +159,7 @@ margin: 0em; transition: - transform @transitionDuration @transitionEasing @transitionDelay, + transform @defaultDuration @defaultEasing @transitionDelay, ; } @@ -195,7 +195,7 @@ ---------------*/ .ui.rotate.reveal > .visible.content { - transition-duration: @transitionDuration; + transition-duration: @defaultDuration; transform: rotate(0deg); } diff --git a/src/definitions/modules/checkbox.less b/src/definitions/modules/checkbox.less index 72fa0953f..dace5a29d 100755 --- a/src/definitions/modules/checkbox.less +++ b/src/definitions/modules/checkbox.less @@ -102,7 +102,7 @@ opacity: 0; color: @checkboxColor; - transition: all @transitionDuration @transitionEasing; + transition: all @defaultDuration @defaultEasing; } /*-------------- diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index a03905bb4..d4762a34b 100644 --- a/src/themes/amazon/elements/button.variables +++ b/src/themes/amazon/elements/button.variables @@ -8,10 +8,10 @@ @textColor: #111111; @fontWeight: normal; @transition: - opacity @transitionDuration @transitionEasing, - background-color @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing, - background @transitionDuration @transitionEasing + opacity @defaultDuration @defaultEasing, + background-color @defaultDuration @defaultEasing, + color @defaultDuration @defaultEasing, + background @defaultDuration @defaultEasing ; @hoverBackgroundColor: #E0E0E0; diff --git a/src/themes/classic/views/card.overrides b/src/themes/classic/views/card.overrides index 8132fa045..03a88d15f 100644 --- a/src/themes/classic/views/card.overrides +++ b/src/themes/classic/views/card.overrides @@ -75,7 +75,7 @@ @extraPadding: 0.5em 0.75em; @extraColor: @lightTextColor; -@extraTransition: color @transitionDuration @transitionEasing; +@extraTransition: color @defaultDuration @defaultEasing; /*------------------- States diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables index 36db47561..010617a15 100644 --- a/src/themes/default/collections/menu.variables +++ b/src/themes/default/collections/menu.variables @@ -32,9 +32,9 @@ @itemHorizontalPadding: @relativeLarge; @itemTextTransform: none; @itemTransition: - opacity @transitionDuration @transitionEasing, - background @transitionDuration @transitionEasing, - box-shadow @transitionDuration @transitionEasing + opacity @defaultDuration @defaultEasing, + background @defaultDuration @defaultEasing, + box-shadow @defaultDuration @defaultEasing ; @itemFontWeight: normal; @itemTextColor: @textColor; @@ -87,7 +87,7 @@ @arrowSize: 0.6em; @arrowBorderSize: 1px; @arrowBorder: @arrowBorderSize solid @solidBorderColor; -@arrowTransition: background @transitionDuration @transitionEasing; +@arrowTransition: background @defaultDuration @defaultEasing; @arrowZIndex: 11; @arrowHoverColor: #FAFAFA; @@ -215,7 +215,7 @@ @secondaryItemMargin: 0em 0.25em; @secondaryItemPadding: @relativeMini @relativeSmall; @secondaryItemBorderRadius: @defaultBorderRadius; -@secondaryItemTransition: color @transitionDuration @transitionEasing; +@secondaryItemTransition: color @defaultDuration @defaultEasing; @secondaryItemColor: @unselectedTextColor; @secondaryHoverItemBackground: @transparentBlack; @@ -334,7 +334,7 @@ @textMenuItemColor: rgba(0, 0, 0, 0.6); @textMenuItemFontWeight: normal; @textMenuItemMargin: 0em @textMenuItemSpacing; -@textMenuItemTransition: opacity @transitionDuration @transitionEasing; +@textMenuItemTransition: opacity @defaultDuration @defaultEasing; @textMenuSubMenuMargin: 0em; diff --git a/src/themes/default/collections/table.variables b/src/themes/default/collections/table.variables index 53744ccd0..d2db7c619 100644 --- a/src/themes/default/collections/table.variables +++ b/src/themes/default/collections/table.variables @@ -11,9 +11,9 @@ @borderSpacing: 0px; @borderRadius: @defaultBorderRadius; @transition: - background @transitionDuration @transitionEasing, - border-color @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing + background @defaultDuration @defaultEasing, + border-color @defaultDuration @defaultEasing, + color @defaultDuration @defaultEasing ; @background: @white; @color: @textColor; diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables index aa14e3c42..edd93cea9 100644 --- a/src/themes/default/elements/button.variables +++ b/src/themes/default/elements/button.variables @@ -45,7 +45,7 @@ @iconOpacity: 0.8; @iconDistance: 0.4285em; @iconColor: ''; -@iconTransition: opacity @transitionDuration @transitionEasing; +@iconTransition: opacity @defaultDuration @defaultEasing; @iconVerticalAlign: ''; @iconMargin: 0em @iconDistance 0em -(@iconDistance / 2); @@ -58,11 +58,11 @@ @invertedLoaderFillColor: rgba(0, 0, 0, 0.15); @transition: - opacity @transitionDuration @transitionEasing, - background-color @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing, - box-shadow @transitionDuration @transitionEasing, - background @transitionDuration @transitionEasing + opacity @defaultDuration @defaultEasing, + background-color @defaultDuration @defaultEasing, + color @defaultDuration @defaultEasing, + box-shadow @defaultDuration @defaultEasing, + background @defaultDuration @defaultEasing ; /* @willChange: box-shadow, transform, opacity, color, background; @@ -124,7 +124,7 @@ @loadingPointerEvents: auto; @loadingTransition: all 0s linear, - opacity @transitionDuration @defaultEasing + opacity @defaultDuration @defaultEasing ; /*------------------- diff --git a/src/themes/default/elements/input.variables b/src/themes/default/elements/input.variables index 1160dff03..7730de8b1 100644 --- a/src/themes/default/elements/input.variables +++ b/src/themes/default/elements/input.variables @@ -23,9 +23,9 @@ @borderRadius: @defaultBorderRadius; @transition: - background-color @transitionDuration @transitionEasing, - box-shadow @transitionDuration @transitionEasing, - border-color @transitionDuration @transitionEasing + background-color @defaultDuration @defaultEasing, + box-shadow @defaultDuration @defaultEasing, + border-color @defaultDuration @defaultEasing ; @inputColor: @textColor; diff --git a/src/themes/default/elements/label.variables b/src/themes/default/elements/label.variables index 9e6d991f4..c05cfc534 100644 --- a/src/themes/default/elements/label.variables +++ b/src/themes/default/elements/label.variables @@ -22,8 +22,8 @@ @lineHeightOffset: -(@verticalPadding / 2); -@labelTransitionDuration: @transitionDuration; -@labelTransitionEasing: @transitionEasing; +@labelTransitionDuration: @defaultDuration; +@labelTransitionEasing: @defaultEasing; @transition: background @labelTransitionDuration @labelTransitionEasing; /* Group */ diff --git a/src/themes/default/elements/reveal.variables b/src/themes/default/elements/reveal.variables index 3d60664bb..03487019a 100644 --- a/src/themes/default/elements/reveal.variables +++ b/src/themes/default/elements/reveal.variables @@ -5,7 +5,7 @@ @transitionDelay: 0.15s; @transitionDuration: 0.8s; @transitionEasing: cubic-bezier(0.175, 0.885, 0.320, 1); -@transition: all @transitionDuration @transitionEasing @transitionDelay; +@transition: all @defaultDuration @defaultEasing @transitionDelay; @bottomZIndex: 2; @topZIndex: 3; diff --git a/src/themes/default/elements/step.variables b/src/themes/default/elements/step.variables index d79276922..4bd1b79c1 100644 --- a/src/themes/default/elements/step.variables +++ b/src/themes/default/elements/step.variables @@ -14,10 +14,10 @@ @horizontalPadding: @relativeHuge; @transition: - background-color @transitionDuration @transitionEasing, - opacity @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing, - box-shadow @transitionDuration @transitionEasing + background-color @defaultDuration @defaultEasing, + opacity @defaultDuration @defaultEasing, + color @defaultDuration @defaultEasing, + box-shadow @defaultDuration @defaultEasing ; @borderRadius: @defaultBorderRadius; @lineHeight: @relativeLarge; diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index 2eba9f3e1..35be89c1e 100644 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -164,6 +164,13 @@ @columnCount: 16; +/*------------------- + Transitions +--------------------*/ + +@defaultDuration : 0.2s; +@defaultEasing : ease; + /*------------------- Breakpoints --------------------*/ @@ -245,13 +252,6 @@ /* Maximum Glyph Width of Icon */ @iconWidth : 1.18em; -/*------------------- - Easing ---------------------*/ - -@defaultEasing: ease; -@defaultDuration: 0.2s; - /*------------------- All Colors --------------------*/ @@ -376,13 +376,6 @@ @selectedSolidWhiteBorderColor : #999999; -/*------------------- - Transitions ---------------------*/ - -@transitionDuration : 0.2s; -@transitionEasing : ease; - /*------------------- Derived Values --------------------*/ diff --git a/src/themes/default/modules/accordion.variables b/src/themes/default/modules/accordion.variables index 277288f26..b025e01e8 100644 --- a/src/themes/default/modules/accordion.variables +++ b/src/themes/default/modules/accordion.variables @@ -20,8 +20,8 @@ @iconMargin: 0em 0.25rem 0em 0rem; @iconPadding: 0em; @iconTransition: - transform @transitionDuration @transitionEasing, - opacity @transitionDuration @transitionEasing + transform @defaultDuration @defaultEasing, + opacity @defaultDuration @defaultEasing ; @iconVerticalAlign: baseline; @iconTransform: none; @@ -76,11 +76,11 @@ @styledTitlePadding: 0.75em 1em; @styledTitleFontWeight: bold; @styledTitleColor: @unselectedTextColor; -@styledTitleTransition: background-color @transitionDuration @transitionEasing; +@styledTitleTransition: background-color @defaultDuration @defaultEasing; @styledTitleBorder: 1px solid @borderColor; @styledTitleTransition: - background @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing + background @defaultDuration @defaultEasing, + color @defaultDuration @defaultEasing ; /* Styled Title States */ diff --git a/src/themes/default/modules/dropdown.variables b/src/themes/default/modules/dropdown.variables index 2d07ad536..76f13d1c0 100644 --- a/src/themes/default/modules/dropdown.variables +++ b/src/themes/default/modules/dropdown.variables @@ -7,7 +7,7 @@ --------------------*/ @transition: - width @transitionDuration @transitionEasing + width @defaultDuration @defaultEasing ; @borderRadius: @defaultBorderRadius; @@ -35,7 +35,7 @@ @menuBorder: @menuBorderWidth solid @menuBorderColor; @menuBoxShadow: @raisedShadow; @menuBorderRadius: 0em 0em @borderRadius @borderRadius; -@menuTransition: opacity @transitionDuration @transitionEasing; +@menuTransition: opacity @defaultDuration @defaultEasing; @menuMinWidth: ~"calc(100% + "(@menuBorderWidth * 2)~")"; @menuZIndex: 11; @@ -152,7 +152,7 @@ @selectionIconHitbox: @selectionVerticalPadding; @selectionIconMargin: -@selectionIconHitbox; @selectionIconPadding: @selectionIconHitbox; -@selectionIconTransition: opacity @transitionDuration @transitionEasing; +@selectionIconTransition: opacity @defaultDuration @defaultEasing; @selectionMenuBorderRadius: 0em 0em @borderRadius @borderRadius; @selectionMenuBoxShadow: @raisedShadow; diff --git a/src/themes/default/modules/progress.variables b/src/themes/default/modules/progress.variables index 2deff4ecd..5b8d4e4e6 100644 --- a/src/themes/default/modules/progress.variables +++ b/src/themes/default/modules/progress.variables @@ -22,8 +22,8 @@ @barHeight: 1.75em; @barBackground: #888888; @barBorderRadius: @borderRadius; -@barTransitionEasing: @transitionEasing; -@barTransitionDuration: @transitionDuration; +@barTransitionEasing: @defaultEasing; +@barTransitionDuration: @defaultDuration; @barTransition: width @barTransitionDuration @barTransitionEasing, background-color @barTransitionDuration @barTransitionEasing diff --git a/src/themes/default/modules/search.variables b/src/themes/default/modules/search.variables index 26b07dcf9..f41533ff3 100644 --- a/src/themes/default/modules/search.variables +++ b/src/themes/default/modules/search.variables @@ -13,10 +13,10 @@ @promptBorderRadius: @circularRadius; @promptColor: @textColor; @promptTransition: - background-color @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing, - box-shadow @transitionDuration @transitionEasing, - border-color @transitionDuration @transitionEasing + background-color @defaultDuration @defaultEasing, + color @defaultDuration @defaultEasing, + box-shadow @defaultDuration @defaultEasing, + border-color @defaultDuration @defaultEasing ; @promptBoxShadow: 0em 0em 0em 0em transparent inset; diff --git a/src/themes/default/modules/sticky.variables b/src/themes/default/modules/sticky.variables index 083c364d3..551268a0e 100644 --- a/src/themes/default/modules/sticky.variables +++ b/src/themes/default/modules/sticky.variables @@ -2,6 +2,6 @@ Sticky *******************************/ -@transitionDuration: @defaultDuration; +@transsssitionDuration: @defaultDuration; @transition: none; @zIndex: 800; \ No newline at end of file diff --git a/src/themes/default/views/card.variables b/src/themes/default/views/card.variables index 7684880c7..c7f0b61bf 100644 --- a/src/themes/default/views/card.variables +++ b/src/themes/default/views/card.variables @@ -27,8 +27,8 @@ @border: none; @zIndex: ''; @transition: - box-shadow @transitionDuration @transitionEasing, - transform @transitionDuration @transitionEasing + box-shadow @defaultDuration @defaultEasing, + transform @defaultDuration @defaultEasing ; /* Card Group */ @@ -81,7 +81,7 @@ /* Icons */ @actionOpacity: 0.75; @actionHoverOpacity: 1; -@actionTransition: color @transitionDuration @transitionEasing; +@actionTransition: color @defaultDuration @defaultEasing; @starColor: #FFB70A; @starActiveColor: #FFE623; @@ -92,7 +92,7 @@ /* Links */ @contentLinkColor: ''; @contentLinkHoverColor: ''; -@contentLinkTransition: color @transitionDuration @transitionEasing; +@contentLinkTransition: color @defaultDuration @defaultEasing; @headerLinkColor: @headerColor; @headerLinkHoverColor: @linkHoverColor; @@ -130,7 +130,7 @@ @extraPadding: 0.75em 1em; @extraBoxShadow: none; @extraColor: @lightTextColor; -@extraTransition: color @transitionDuration @transitionEasing; +@extraTransition: color @defaultDuration @defaultEasing; /* Extra Links */ @extraLinkColor: @unselectedTextColor; diff --git a/src/themes/default/views/feed.variables b/src/themes/default/views/feed.variables index 79ecc5166..df43af0ec 100644 --- a/src/themes/default/views/feed.variables +++ b/src/themes/default/views/feed.variables @@ -135,7 +135,7 @@ @metadataActionCursor: pointer; @metadataActionOpacity: 1; @metadataActionColor: rgba(0, 0, 0, 0.5); -@metadataActionTransition: color @transitionDuration @transitionEasing; +@metadataActionTransition: color @defaultDuration @defaultEasing; @metadataActionHoverColor: @selectedTextColor; diff --git a/src/themes/default/views/item.variables b/src/themes/default/views/item.variables index 37d5d68ec..f4746033e 100644 --- a/src/themes/default/views/item.variables +++ b/src/themes/default/views/item.variables @@ -19,7 +19,7 @@ @boxShadow: none; @border: none; @zIndex: ''; -@transition: box-shadow @transitionDuration @transitionEasing; +@transition: box-shadow @defaultDuration @defaultEasing; /* Responsive */ @itemSpacing: 1em; @@ -81,7 +81,7 @@ /* Icons */ @actionOpacity: 0.75; @actionHoverOpacity: 1; -@actionTransition: color @transitionDuration @transitionEasing; +@actionTransition: color @defaultDuration @defaultEasing; /* Actions */ @favoriteColor: #FFB70A; @@ -96,7 +96,7 @@ @metaLinkHoverColor: @textColor; @contentLinkColor: ''; @contentLinkHoverColor: ''; -@contentLinkTransition: color @transitionDuration @transitionEasing; +@contentLinkTransition: color @defaultDuration @defaultEasing; /* Description */ @@ -132,7 +132,7 @@ @extraPadding: 0em 0em 0em; @extraBoxShadow: none; @extraColor: @lightTextColor; -@extraTransition: color @transitionDuration @transitionEasing; +@extraTransition: color @defaultDuration @defaultEasing; /*------------------- Variations diff --git a/src/themes/material/elements/button.variables b/src/themes/material/elements/button.variables index 6e274a1c2..19bf89dce 100644 --- a/src/themes/material/elements/button.variables +++ b/src/themes/material/elements/button.variables @@ -28,11 +28,11 @@ @shadowBoxShadow: 0px 0px 0px 0px transparent; @transition: - opacity 0.3s @transitionEasing, - background-color 0.3s @transitionEasing, - color 0.3s @transitionEasing, - box-shadow 0.3s @transitionEasing, - background 0.3s @transitionEasing + opacity 0.3s @defaultEasing, + background-color 0.3s @defaultEasing, + color 0.3s @defaultEasing, + box-shadow 0.3s @defaultEasing, + background 0.3s @defaultEasing ; /*------------------- State diff --git a/src/themes/raised/elements/button.variables b/src/themes/raised/elements/button.variables index 103852435..eced62f81 100644 --- a/src/themes/raised/elements/button.variables +++ b/src/themes/raised/elements/button.variables @@ -19,9 +19,9 @@ /* transition box shadow as well */ @transition: - opacity @transitionDuration @transitionEasing, - background-color @transitionDuration @transitionEasing, - box-shadow @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing, - background @transitionDuration @transitionEasing + opacity @defaultDuration @defaultEasing, + background-color @defaultDuration @defaultEasing, + box-shadow @defaultDuration @defaultEasing, + color @defaultDuration @defaultEasing, + background @defaultDuration @defaultEasing ; \ No newline at end of file diff --git a/src/themes/round/elements/button.variables b/src/themes/round/elements/button.variables index 6f63a21e1..9261206f1 100644 --- a/src/themes/round/elements/button.variables +++ b/src/themes/round/elements/button.variables @@ -22,7 +22,7 @@ /* Icon */ @iconOpacity: 0.8; @iconDistance: 0.4em; -@iconTransition: opacity @transitionDuration @transitionEasing; +@iconTransition: opacity @defaultDuration @defaultEasing; @iconMargin: 0em @iconDistance 0em -(@iconDistance / 2); @iconVerticalAlign: top;