From aea99536f62723f8676418d45c257e1a14cdda91 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 18 May 2015 13:46:06 -0400 Subject: [PATCH] Fix transition variables, adjust list padding to round numbers --- src/definitions/elements/list.less | 8 ------- src/themes/default/elements/list.variables | 26 +++++++++++----------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/src/definitions/elements/list.less b/src/definitions/elements/list.less index 88f613ca2..a77ec2405 100755 --- a/src/definitions/elements/list.less +++ b/src/definitions/elements/list.less @@ -802,10 +802,6 @@ ol.ui.horizontal.list li:before, padding-top: @relaxedVerticalPadding; padding-bottom: @relaxedVerticalPadding; } -.ui.relaxed.list .list > .item .header, -.ui.relaxed.list > .item .header { - /*margin-bottom: @relaxedHeaderMargin;*/ -} .ui.horizontal.relaxed.list > .item { padding-left: @relaxedHorizontalPadding; padding-right: @relaxedHorizontalPadding; @@ -816,10 +812,6 @@ ol.ui.horizontal.list li:before, padding-top: @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 > .item { padding-left: @veryRelaxedHorizontalPadding; diff --git a/src/themes/default/elements/list.variables b/src/themes/default/elements/list.variables index 23854a80b..3feee2d52 100644 --- a/src/themes/default/elements/list.variables +++ b/src/themes/default/elements/list.variables @@ -18,7 +18,7 @@ @childListIndent: 1em; /* List Item */ -@itemVerticalPadding: 0.3em; +@itemVerticalPadding: 0.285714em; @itemHorizontalPadding: 0em; @itemLineHeight: 1.2; @@ -29,7 +29,7 @@ /* Icon */ @iconDistance: 0.3em; @iconOffset: ((@itemLineHeight - 1rem) / 2); -@iconTransition: color 0.2s ease; +@iconTransition: color @defaultDuration @defaultEasing; @iconVerticalAlign: top; @iconContentVerticalAlign: middle; @@ -93,7 +93,7 @@ @linkListItemDownColor: @pressedTextColor; @linkListItemActiveColor: @selectedTextColor; @linkListTransition: - 0.2s color @defaultEasing + @defaultDuration color @defaultEasing ; /* Inverted Link List */ @@ -108,9 +108,9 @@ @selectionListItemVerticalPadding: 0.5em; @selectionListItemHorizontalPadding: 0.5em; @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 */ @@ -135,9 +135,9 @@ /* Animated List */ @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; @@ -195,12 +195,12 @@ @horizontalCelledLineHeight: 0.6; /* Relaxed */ -@relaxedVerticalPadding: 0.5rem; +@relaxedVerticalPadding: (2 * @itemVerticalPadding); @relaxedHeaderMargin: 0.25rem; -@relaxedHorizontalPadding: 1.25rem; +@relaxedHorizontalPadding: 1rem; /* Very Relaxed */ -@veryRelaxedVerticalPadding: 1rem; +@veryRelaxedVerticalPadding: (4 * @itemVerticalPadding); @veryRelaxedHeaderMargin: 0.5rem; -@veryRelaxedHorizontalPadding: 2rem; +@veryRelaxedHorizontalPadding: 1.5rem;