From 0c3f5f4405da71200cc1c7df20dc4c36f4ee61f2 Mon Sep 17 00:00:00 2001 From: jlukic Date: Tue, 2 Dec 2014 17:28:58 -0500 Subject: [PATCH] Fix transition duration in ui input to use site defaults --- src/definitions/elements/input.less | 14 +++++--------- src/themes/default/elements/input.variables | 7 +++---- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less index a3baf88b1..f751fe83c 100755 --- a/src/definitions/elements/input.less +++ b/src/definitions/elements/input.less @@ -29,14 +29,15 @@ ---------------------*/ .ui.input { - display: inline-block; position: relative; + display: inline-block; color: @inputColor; } .ui.input input { margin: 0em; width: 100%; outline: none; + -webkit-tap-highlight-color: rgba(255, 255, 255, 0); text-align: @textAlign; line-height: @lineHeight; @@ -50,8 +51,6 @@ transition: @transition; box-shadow: @boxShadow; - box-sizing: border-box; - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); } @@ -218,18 +217,15 @@ .ui.icon.input > .icon { cursor: default; position: absolute; - opacity: @iconOpacity; + text-align: center; top: 0px; right: 0px; - margin: 0em; - width: @iconWidth; height: 100%; - text-align: center; - + width: @iconWidth; + opacity: @iconOpacity; border-radius: 0em @borderRadius @borderRadius 0em; - box-sizing: border-box; transition: @iconTransition; } .ui.icon.input > .icon:before, diff --git a/src/themes/default/elements/input.variables b/src/themes/default/elements/input.variables index 2671d001e..8f6a80a81 100644 --- a/src/themes/default/elements/input.variables +++ b/src/themes/default/elements/input.variables @@ -7,7 +7,6 @@ --------------------*/ @pageFont: "Helvetica Neue", "Helvetica", Arial; - @verticalPadding: 0.78571em; @horizontalPadding: 1em; @@ -24,9 +23,9 @@ @borderRadius: @defaultBorderRadius; @transition: - background-color 0.3s ease-out, - box-shadow 0.2s ease, - border-color 0.2s ease + background-color @transitionDuration @transitionEasing, + box-shadow @transitionDuration @transitionEasing, + border-color @transitionDuration @transitionEasing ; @inputColor: @textColor;