From cb715a9d48feafa8fce622eed5e8d046d3d97b82 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 22 Jun 2015 18:41:04 -0700 Subject: [PATCH] [Frontend] Merge in platform CSS changes WTD-1319 WTD-768 WTD-841 Change CSS for autoflow-tabular header; --- .../general/res/css/theme-espresso.css | 54 ++++++++++--------- .../commonUI/general/res/sass/_autoflow.scss | 4 ++ 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index ef43a9da06..0ee4204f37 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -84,7 +84,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -105,38 +105,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -4726,20 +4726,24 @@ input[type="text"] { .autoflow .l-autoflow-header { bottom: auto; height: 22px; - line-height: 22px; } - /* line 34, ../sass/_autoflow.scss */ + line-height: 22px; + min-width: 225px; } + /* line 35, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header span { vertical-align: middle; } - /* line 37, ../sass/_autoflow.scss */ + /* line 38, ../sass/_autoflow.scss */ .autoflow .l-autoflow-header .l-filter { margin-left: 5px; } - /* line 42, ../sass/_autoflow.scss */ + /* line 40, ../sass/_autoflow.scss */ + .autoflow .l-autoflow-header .l-filter input.t-filter-input { + width: 100px; } + /* line 46, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items { overflow-x: scroll; overflow-y: hidden; top: 32px; white-space: nowrap; } - /* line 48, ../sass/_autoflow.scss */ + /* line 52, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -4750,7 +4754,7 @@ input[type="text"] { padding-right: 5px; vertical-align: top; width: 225px; } - /* line 58, ../sass/_autoflow.scss */ + /* line 62, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -4762,37 +4766,37 @@ input[type="text"] { margin-bottom: 1px; margin-top: 1px; position: relative; } - /* line 67, ../sass/_autoflow.scss */ + /* line 71, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:first-child { border-top: none; } - /* line 70, ../sass/_autoflow.scss */ + /* line 74, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:hover { background: rgba(255, 255, 255, 0.1); } - /* line 75, ../sass/_autoflow.scss */ + /* line 79, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.l { color: rgba(255, 255, 255, 0.3) !important; font-style: italic; } - /* line 76, ../sass/_autoflow.scss */ + /* line 80, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.s-stale .l-autoflow-item.r { color: rgba(255, 255, 255, 0.5) !important; font-style: italic; } - /* line 79, ../sass/_autoflow.scss */ + /* line 83, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row:not(.s-stale) .l-autoflow-item.r { color: #b3b3b3; } - /* line 83, ../sass/_autoflow.scss */ + /* line 87, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row.first-in-group { border-top: 1px solid gray; } - /* line 86, ../sass/_autoflow.scss */ + /* line 90, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item { display: block; } - /* line 88, ../sass/_autoflow.scss */ + /* line 92, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.l { float: none; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; width: auto; } - /* line 95, ../sass/_autoflow.scss */ + /* line 99, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col .l-autoflow-row .l-autoflow-item.r { -moz-border-radius: 2px; -webkit-border-radius: 2px; @@ -4802,7 +4806,7 @@ input[type="text"] { padding-left: 2px; padding-right: 2px; text-align: right; } - /* line 106, ../sass/_autoflow.scss */ + /* line 110, ../sass/_autoflow.scss */ .autoflow .l-autoflow-items .l-autoflow-col:first-child { border-left: none; padding-left: 0; } diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index 448a4203be..c7b6a85c5a 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -31,11 +31,15 @@ bottom: auto; height: $headerH; line-height: $headerH; + min-width: $colW; span { vertical-align: middle; } .l-filter { margin-left: $interiorMargin; + input.t-filter-input { + width: 100px; + } } }