From ffeed5b05f2a189a24c56e02be6e151d5b511388 Mon Sep 17 00:00:00 2001 From: Lucas Hrabovsky Date: Fri, 24 Jul 2015 15:30:10 -0400 Subject: [PATCH] INT-421: Fix "Refine" button wrapping Also relocate some LESS rules to the correct components. --- src/home/index.less | 27 --------------------------- src/index.less | 7 ++++--- src/refine-view/index.jade | 8 ++++---- src/refine-view/index.less | 14 ++++++++++++-- src/sampling-message/index.less | 14 ++++++++++++++ 5 files changed, 34 insertions(+), 36 deletions(-) create mode 100644 src/sampling-message/index.less diff --git a/src/home/index.less b/src/home/index.less index 6970399cdc5..aa9e9f9c967 100644 --- a/src/home/index.less +++ b/src/home/index.less @@ -53,38 +53,11 @@ } .collection-view { - .sampling-status { - position: absolute; - margin: 3px 0 0 6px; - z-index: 2; - - span { - font-size: 13px; - font-weight: 200; - - a { - font-weight: normal; - } - } - } header { padding: 12px 20px; position: relative; z-index: 1; } - .refine-view-container { - background: @gray8; - padding: 12px 20px; - position: relative; - z-index: 1; - - input.form-control.input-sm { - width: 90%; - background: @pw; - height: 28px; - margin-right: 10px; - } - } .column-container { display: flex; overflow: hidden; diff --git a/src/index.less b/src/index.less index 3b3627aa7f5..d8580352043 100644 --- a/src/index.less +++ b/src/index.less @@ -2,10 +2,11 @@ @import "../styles/index.less"; // Components +@import "./src/collection-stats/index.less"; +@import "./src/document-list/index.less"; +@import "./src/field-list/index.less"; @import "./src/home/index.less"; @import "./src/minicharts/index.less"; @import "./src/refine-view/index.less"; -@import "./src/field-list/index.less"; -@import "./src/document-list/index.less"; -@import "./src/collection-stats/index.less"; +@import "./src/sampling-message/index.less"; @import "./src/statusbar/index.less"; diff --git a/src/refine-view/index.jade b/src/refine-view/index.jade index 04af70eb0dc..ccc6379f13b 100644 --- a/src/refine-view/index.jade +++ b/src/refine-view/index.jade @@ -1,5 +1,5 @@ -.refine-view-container - form.form-inline - div(data-hook='refine-input-group') - input#refineInput.form-control.input-sm(type='text', data-hook='refine-input') +.refine-view-container: .row: .col-md-12 + form.form-inline: .input-group(data-hook='refine-input-group') + input.form-control.input-sm(type='text', data-hook='refine-input') + span.input-group-btn button.btn.btn-default.btn-sm(type='button', data-hook='refine-button') Refine diff --git a/src/refine-view/index.less b/src/refine-view/index.less index 34939ce14c7..da814970238 100644 --- a/src/refine-view/index.less +++ b/src/refine-view/index.less @@ -1,5 +1,15 @@ .refine-view-container { - input { - font-family: "Source Code Pro", sans-serif; + background: @gray8; + padding: 12px 20px; + position: relative; + z-index: 1; + + input[type='text'] { + font-family: @font-family-monospace; + background: @pw; + height: 28px; + & + .input-group-btn { + padding-left: 10px; + } } } diff --git a/src/sampling-message/index.less b/src/sampling-message/index.less new file mode 100644 index 00000000000..a93f52961ac --- /dev/null +++ b/src/sampling-message/index.less @@ -0,0 +1,14 @@ +.sampling-status { + position: absolute; + margin: 10px 0px 0px 20px; + z-index: 2; + + span { + font-size: 13px; + font-weight: 200; + + a { + font-weight: normal; + } + } +}