Browse Source

Fix transition variables, adjust list padding to round numbers

pull/2300/head
jlukic 10 years ago
parent
commit
aea99536f6
2 changed files with 13 additions and 21 deletions
  1. 8
      src/definitions/elements/list.less
  2. 26
      src/themes/default/elements/list.variables

8
src/definitions/elements/list.less

@ -802,10 +802,6 @@ ol.ui.horizontal.list li:before,
padding-top: @relaxedVerticalPadding; padding-top: @relaxedVerticalPadding;
padding-bottom: @relaxedVerticalPadding; padding-bottom: @relaxedVerticalPadding;
} }
.ui.relaxed.list .list > .item .header,
.ui.relaxed.list > .item .header {
/*margin-bottom: @relaxedHeaderMargin;*/
}
.ui.horizontal.relaxed.list > .item { .ui.horizontal.relaxed.list > .item {
padding-left: @relaxedHorizontalPadding; padding-left: @relaxedHorizontalPadding;
padding-right: @relaxedHorizontalPadding; padding-right: @relaxedHorizontalPadding;
@ -816,10 +812,6 @@ ol.ui.horizontal.list li:before,
padding-top: @veryRelaxedVerticalPadding; padding-top: @veryRelaxedVerticalPadding;
padding-bottom: @veryRelaxedVerticalPadding; padding-bottom: @veryRelaxedVerticalPadding;
} }
.ui[class*="very relaxed"].list .list > .item .header,
.ui[class*="very relaxed"].list > .item .header {
/*margin-bottom: @veryRelaxedHeaderMargin;*/
}
.ui.horizontal[class*="very relaxed"].list .list > .item, .ui.horizontal[class*="very relaxed"].list .list > .item,
.ui.horizontal[class*="very relaxed"].list > .item { .ui.horizontal[class*="very relaxed"].list > .item {
padding-left: @veryRelaxedHorizontalPadding; padding-left: @veryRelaxedHorizontalPadding;

26
src/themes/default/elements/list.variables

@ -18,7 +18,7 @@
@childListIndent: 1em; @childListIndent: 1em;
/* List Item */ /* List Item */
@itemVerticalPadding: 0.3em;
@itemVerticalPadding: 0.285714em;
@itemHorizontalPadding: 0em; @itemHorizontalPadding: 0em;
@itemLineHeight: 1.2; @itemLineHeight: 1.2;
@ -29,7 +29,7 @@
/* Icon */ /* Icon */
@iconDistance: 0.3em; @iconDistance: 0.3em;
@iconOffset: ((@itemLineHeight - 1rem) / 2); @iconOffset: ((@itemLineHeight - 1rem) / 2);
@iconTransition: color 0.2s ease;
@iconTransition: color @defaultDuration @defaultEasing;
@iconVerticalAlign: top; @iconVerticalAlign: top;
@iconContentVerticalAlign: middle; @iconContentVerticalAlign: middle;
@ -93,7 +93,7 @@
@linkListItemDownColor: @pressedTextColor; @linkListItemDownColor: @pressedTextColor;
@linkListItemActiveColor: @selectedTextColor; @linkListItemActiveColor: @selectedTextColor;
@linkListTransition: @linkListTransition:
0.2s color @defaultEasing
@defaultDuration color @defaultEasing
; ;
/* Inverted Link List */ /* Inverted Link List */
@ -108,9 +108,9 @@
@selectionListItemVerticalPadding: 0.5em; @selectionListItemVerticalPadding: 0.5em;
@selectionListItemHorizontalPadding: 0.5em; @selectionListItemHorizontalPadding: 0.5em;
@selectionListTransition: @selectionListTransition:
0.2s color @defaultEasing,
0.2s padding-left @defaultEasing,
0.2s background-color @defaultEasing
@defaultDuration color @defaultEasing,
@defaultDuration padding-left @defaultEasing,
@defaultDuration background-color @defaultEasing
; ;
/* Selection List States */ /* Selection List States */
@ -135,9 +135,9 @@
/* Animated List */ /* Animated List */
@animatedListTransition: @animatedListTransition:
0.2s color ease,
0.2s padding-left ease,
0.2s background-color ease
@defaultDuration color @defaultEasing,
@defaultDuration padding-left @defaultEasing,
@defaultDuration background-color @defaultEasing
; ;
@animatedListIndent: 1em; @animatedListIndent: 1em;
@ -195,12 +195,12 @@
@horizontalCelledLineHeight: 0.6; @horizontalCelledLineHeight: 0.6;
/* Relaxed */ /* Relaxed */
@relaxedVerticalPadding: 0.5rem;
@relaxedVerticalPadding: (2 * @itemVerticalPadding);
@relaxedHeaderMargin: 0.25rem; @relaxedHeaderMargin: 0.25rem;
@relaxedHorizontalPadding: 1.25rem;
@relaxedHorizontalPadding: 1rem;
/* Very Relaxed */ /* Very Relaxed */
@veryRelaxedVerticalPadding: 1rem;
@veryRelaxedVerticalPadding: (4 * @itemVerticalPadding);
@veryRelaxedHeaderMargin: 0.5rem; @veryRelaxedHeaderMargin: 0.5rem;
@veryRelaxedHorizontalPadding: 2rem;
@veryRelaxedHorizontalPadding: 1.5rem;
Loading…
Cancel
Save