From 82d05e98a0b678845b3be430c68d7a1babbb8c51 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Fri, 24 Jun 2016 13:03:16 -0700 Subject: [PATCH 1/5] [7364]: Deconcatenate selectors in src/ui/public/styles/base.less. Former-commit-id: 2b5f50ec13e9d1edc49981810ac73b3620f79cf7 --- src/ui/public/styles/base.less | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/ui/public/styles/base.less b/src/ui/public/styles/base.less index c91f4742e93fa..490e4dde19126 100644 --- a/src/ui/public/styles/base.less +++ b/src/ui/public/styles/base.less @@ -67,13 +67,13 @@ ul.navbar-inline li { font-size: 8pt; font-weight: normal; opacity: 90%; +} - &-inner { + .tooltip-inner { word-break: normal; word-wrap: break-word; white-space: normal; } -} .content { .real-flex-parent(@flow: row nowrap); @@ -158,14 +158,16 @@ a { border-radius: 0; } } + .kibana-nav-info { line-height: 30px; padding: 0 10px; - &-title { + } + + .kibana-nav-info-title { font-weight: bold; margin-right: 10px; } - } } > config { @@ -221,10 +223,6 @@ a { padding-right: 7px !important; } - &-time-desc > .fa-clock-o { - padding-right: 5px; - } - .fa { font-size: 16px; vertical-align: middle; @@ -236,6 +234,10 @@ a { } } + .navbar-timepicker-time-desc > .fa-clock-o { + padding-right: 5px; + } + kbn-info i { cursor: help; } @@ -431,15 +433,15 @@ paginated-selectable-list { } } - div.finder-form { + .finder-form { position: relative; + } - &-options { + .finder-form-options { .flex-parent(); flex-direction: row; justify-content: flex-end; } - } .finder-options { max-height: 300px; @@ -560,11 +562,13 @@ style-compile { .cell-hover { background-color: @table-cell-hover-bg; - &-show { +} + + .cell-hover-show { // so that the cell doesn't change size on hover visibility: hidden; } -} + .cell-hover:hover { background-color: @table-cell-hover-hover-bg; cursor: cell; From 4ca6b364b6c081379df93415ab198712562c289c Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Fri, 24 Jun 2016 13:03:42 -0700 Subject: [PATCH 2/5] [7364]: Deconcatenate selectors in src/ui/public/styles/hintbox.less. Former-commit-id: c19459b2009f0790db78cdbb36d89c9032c3fa35 --- src/ui/public/styles/hintbox.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ui/public/styles/hintbox.less b/src/ui/public/styles/hintbox.less index a04adef6dee2c..cedaff991a3d1 100644 --- a/src/ui/public/styles/hintbox.less +++ b/src/ui/public/styles/hintbox.less @@ -18,11 +18,6 @@ background-color: @hintbox-pre-bg; } - &-label, - &-label[ng-click] { - cursor: help; - } - ul, ol { padding-left: 25px; } @@ -58,3 +53,8 @@ } } } + + .hintbox-label, + .hintbox-label[ng-click] { + cursor: help; + } From a2bfd9f27d26caea3cfbad65329d24388ccfff30 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Fri, 24 Jun 2016 13:04:17 -0700 Subject: [PATCH 3/5] [7364]: Deconcatenate selectors for pagination. Former-commit-id: 8192b9c01799e785d0a17f4f7398ef0b1bc4759c --- src/ui/public/styles/dark-theme.less | 18 ++++++++---------- src/ui/public/styles/pagination.less | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/ui/public/styles/dark-theme.less b/src/ui/public/styles/dark-theme.less index 93bfded83a4c8..6fc7eb8b58bb8 100644 --- a/src/ui/public/styles/dark-theme.less +++ b/src/ui/public/styles/dark-theme.less @@ -520,16 +520,14 @@ // /src/ui/public/styles/pagination.less paginate { paginate-controls { - .pagination-other-pages { - &-list { - > li { - a { - background-color: @dark-button-bg; - color: @white; - } - &.active a { - color: @paginate-page-link-active-color; - } + .pagination-other-pages-list { + > li { + a { + background-color: @dark-button-bg; + color: @white; + } + &.active a { + color: @paginate-page-link-active-color; } } } diff --git a/src/ui/public/styles/pagination.less b/src/ui/public/styles/pagination.less index d8fa68704e628..7b380a625d635 100644 --- a/src/ui/public/styles/pagination.less +++ b/src/ui/public/styles/pagination.less @@ -14,8 +14,9 @@ paginate { flex: 1 0 auto; display: flex; justify-content: center; + } - &-list { + .pagination-other-pages-list { flex: 0 0 auto; display: flex; justify-content: center; @@ -46,7 +47,6 @@ paginate { } } } - } .pagination-size { flex: 0 0 auto; From 565cc72b07f926a4c27f402f43e21a5d13daab85 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Fri, 24 Jun 2016 13:04:46 -0700 Subject: [PATCH 4/5] [7364]: Deconcatenate selectors for src/ui/public/styles/sidebar.less. Former-commit-id: 477f8cd19bddd76b36fed261b30c55eb78ae3ee0 --- src/ui/public/styles/sidebar.less | 51 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/src/ui/public/styles/sidebar.less b/src/ui/public/styles/sidebar.less index f6671b25ace87..1e54e9fc5a23b 100644 --- a/src/ui/public/styles/sidebar.less +++ b/src/ui/public/styles/sidebar.less @@ -31,19 +31,12 @@ padding-right: 10px; } } + ul { list-style: none; margin-bottom: 0px; } - &-header { - padding-left: 10px; - padding-right: 10px; - color: @sidebar-header-color; - border: 1px solid; - border-color: @sidebar-header-border; - } - .sidebar-item { border-top-color: @sidebar-border; font-size: @sidebar-item-font-size; @@ -57,9 +50,21 @@ } } - &-title, - &-text, - &-button { + .active { + background-color: @sidebar-active-bg !important; + color: @sidebar-active-color; + + &:hover, + &:hover .text-muted { + color: @sidebar-active-hover-color; + background-color: @sidebar-active-hover-bg; + } + } + } + + .sidebar-item-title, + .sidebar-item-text, + .sidebar-item-button { margin: 0; padding: 5px 10px; text-align: center; @@ -68,7 +73,7 @@ border-radius: 0; } - &-title { + .sidebar-item-title { text-align: left; white-space: nowrap; .ellipsis(); @@ -78,11 +83,11 @@ } } - &-text { + .sidebar-item-text { background: @sidebar-item-text-bg; } - &-button { + .sidebar-item-button { font-size: inherit; display: block; @@ -120,19 +125,15 @@ .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border); } } + } - .active { - background-color: @sidebar-active-bg !important; - color: @sidebar-active-color; - - &:hover, - &:hover .text-muted { - color: @sidebar-active-hover-color; - background-color: @sidebar-active-hover-bg; - } - } + .sidebar-list-header { + padding-left: 10px; + padding-right: 10px; + color: @sidebar-header-color; + border: 1px solid; + border-color: @sidebar-header-border; } - } .index-pattern { font-weight: bold; From 43c8e7f3b267ee44805a9bfbf3deb02e8c0e5352 Mon Sep 17 00:00:00 2001 From: CJ Cenizal Date: Fri, 24 Jun 2016 13:05:04 -0700 Subject: [PATCH 5/5] [7364]: Deconcatenate selectors for src/ui/public/styles/theme.less. Former-commit-id: 99464dfe3adb7607b2cb04cd8470cbee1c767ca5 --- src/ui/public/styles/theme.less | 50 ++++++++++++++------------------- 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/src/ui/public/styles/theme.less b/src/ui/public/styles/theme.less index fe616afd08ca6..9d1e06beac8fa 100644 --- a/src/ui/public/styles/theme.less +++ b/src/ui/public/styles/theme.less @@ -15,8 +15,9 @@ .navbar { border-width: 0; +} - &-static-top { + .navbar-static-top { background-color: @kibanaGray5; color: @kibanaGray2; .navbar-brand:hover, @@ -54,7 +55,8 @@ } } } - &-btn-link { + + .navbar-btn-link { margin: 0; border-radius: 0; @@ -64,14 +66,14 @@ } } - &-default { + .navbar-default { .badge { background-color: @navbar-default-badge-bg; color: @navbar-default-badge-color; } } - &-inverse { + .navbar-inverse { .logo { height: @navbar-height; width: 252px; @@ -90,25 +92,24 @@ } } - .navbar-nav > .active > a { - border-bottom-color: @kibanaGray2; - background-color: transparent; - } - - &-brand { + .navbar-brand { cursor: default; font-size: 1.8em; user-select: none; } - &-nav { + .navbar-nav { font-size: @font-size-small; + + & > .active > a { + border-bottom-color: @kibanaGray2; + background-color: transparent; + } } - &-toggle { + .navbar-toggle { margin-top: 4px; } -} // Buttons ==================================================================== @@ -174,25 +175,16 @@ table, color: @table-special-color; } } +} - // > thead > tr > th, - // > tbody > tr > th, - // > tfoot > tr > th, - // > thead > tr > td, - // > tbody > tr > td, - // > tfoot > tr > td { - // border: none; - // } - - &-bordered > thead > tr > th, - &-bordered > tbody > tr > th, - &-bordered > tfoot > tr > th, - &-bordered > thead > tr > td, - &-bordered > tbody > tr > td, - &-bordered > tfoot > tr > td { + .table-bordered > thead > tr > th, + .table-bordered > tbody > tr > th, + .table-bordered > tfoot > tr > th, + .table-bordered > thead > tr > td, + .table-bordered > tbody > tr > td, + .table-bordered > tfoot > tr > td { border: 1px solid @table-border-color; } -} // Forms ======================================================================