Browse Source

Fix @defaultEasing and @transitionEasing variable duplication, Fix @defaultDuration and @transitionDuration variable duplication

pull/2300/head
jlukic 10 years ago
parent
commit
663e2c2569
26 changed files with 82 additions and 88 deletions
  1. 4
      src/definitions/elements/button.less
  2. 2
      src/definitions/elements/icon.less
  3. 1
      src/definitions/elements/input.less
  4. 6
      src/definitions/elements/reveal.less
  5. 2
      src/definitions/modules/checkbox.less
  6. 8
      src/themes/amazon/elements/button.variables
  7. 2
      src/themes/classic/views/card.overrides
  8. 12
      src/themes/default/collections/menu.variables
  9. 6
      src/themes/default/collections/table.variables
  10. 14
      src/themes/default/elements/button.variables
  11. 6
      src/themes/default/elements/input.variables
  12. 4
      src/themes/default/elements/label.variables
  13. 2
      src/themes/default/elements/reveal.variables
  14. 8
      src/themes/default/elements/step.variables
  15. 21
      src/themes/default/globals/site.variables
  16. 10
      src/themes/default/modules/accordion.variables
  17. 6
      src/themes/default/modules/dropdown.variables
  18. 4
      src/themes/default/modules/progress.variables
  19. 8
      src/themes/default/modules/search.variables
  20. 2
      src/themes/default/modules/sticky.variables
  21. 10
      src/themes/default/views/card.variables
  22. 2
      src/themes/default/views/feed.variables
  23. 8
      src/themes/default/views/item.variables
  24. 10
      src/themes/material/elements/button.variables
  25. 10
      src/themes/raised/elements/button.variables
  26. 2
      src/themes/round/elements/button.variables

4
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;
}

2
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;

1
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;

6
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);
}

2
src/definitions/modules/checkbox.less

@ -102,7 +102,7 @@
opacity: 0;
color: @checkboxColor;
transition: all @transitionDuration @transitionEasing;
transition: all @defaultDuration @defaultEasing;
}
/*--------------

8
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;

2
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

12
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;

6
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;

14
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
;
/*-------------------

6
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;

4
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 */

2
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;

8
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;

21
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
--------------------*/

10
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 */

6
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;

4
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

8
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;

2
src/themes/default/modules/sticky.variables

@ -2,6 +2,6 @@
Sticky
*******************************/
@transitionDuration: @defaultDuration;
@transsssitionDuration: @defaultDuration;
@transition: none;
@zIndex: 800;

10
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;

2
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;

8
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

10
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

10
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
;

2
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;

Loading…
Cancel
Save