From caa489f58a57dbe856296532c8a6f38fc48313dc Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 31 Jan 2017 16:09:24 -0800 Subject: [PATCH] [Frontend] WIP Style Guide Fixes #1233 Mods to core CSS for consistency --- .../general/res/sass/controls/_controls.scss | 21 +++++++++++++----- .../general/res/sass/items/_item.scss | 22 +++++++++---------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index b490a1dc59..81d909c5c6 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -212,14 +212,20 @@ label.form-control.checkbox { } } -/******************************************************** INPUTS */ +/******************************************************** PLACEHOLDERS */ input[type="text"], -input[type="search"] { - @include nice-input(); +input[type="search"], +textarea { @include placeholder { color: rgba($colorInputFg, 0.4); font-style: italic; } +} + +/******************************************************** INPUTS */ +input[type="text"], +input[type="search"] { + @include nice-input(); &.numeric { text-align: right; } @@ -231,11 +237,16 @@ input[type="text"].lg { width: 100% !important; } input[type="text"].med { width: 200px !important; } .l-input-sm input[type="text"], input[type="text"].sm { width: 50px !important; } -.l-textarea-sm textarea, -textarea.sm { position: relative; height: 50px; } .l-numeric input[type="text"], input[type="text"].numeric { text-align: right; } +.l-textarea-sm textarea, +textarea.sm { position: relative; height: 50px; } +.l-textarea-med textarea, +textarea.med { position: relative; height: 150px; } +.l-textarea-lg textarea, +textarea.lg { position: relative; height: 300px; } + .input-labeled { // Used in toolbar margin-left: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index ef1bacae42..e1cad5c032 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -26,20 +26,20 @@ top: 0; } .item { + $d: $ueBrowseGridItemLg; + $iconMargin: 40px; + $iconD: ($d - ($iconMargin * 2)) * 0.85; + box-sizing: border-box; + float: left; + height: $d; + width: $d; + margin-bottom: $interiorMarginSm; + margin-right: $interiorMarginSm; + position: relative; &.grid-item { - $d: $ueBrowseGridItemLg; - $iconMargin: 40px; - $iconD: ($d - ($iconMargin * 2)) * 0.85; $transTime: 200ms; @include btnSubtle($bg: $colorItemBg, $bgHov: $colorItemBgHov, $fg: $colorItemFg, $fgHov: pullForward($colorItemFg, $hoverRatioPercent), $ic: $colorItemIc); - box-sizing: border-box; cursor: pointer; - float: left; - height: $d; - width: $d; - margin-bottom: $interiorMarginSm; - margin-right: $interiorMarginSm; - position: relative; &:hover .item-main { .item-type { color: lighten($colorKey, 10%); @@ -51,7 +51,7 @@ opacity: 1; } } - .contents { + .abs.contents { $m: $interiorMarginLg; top: $m; right: $m; bottom: $m; left: $m; }