Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7364]: Deconcatenate selectors for table-vis, agg-table, app-switcher, and doc-viewer. #7540

Merged
merged 5 commits into from
Jun 28, 2016
Merged

[7364]: Deconcatenate selectors for table-vis, agg-table, app-switcher, and doc-viewer. #7540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b740227
[7364]: Deconcatenate selectors in src/plugins/table_vis/public/table…
cjcenizal Jun 23, 2016
537b6db
[7364]: Deconcatenate selectors in src/ui/public/chrome/directives/ap…
cjcenizal Jun 23, 2016
10ad36e
[7364]: Deconcatenate selectors in src/ui/public/doc_viewer/doc_viewe…
cjcenizal Jun 23, 2016
0883956
[7364]: Deconcatenate and refactor filter-bar styles.
cjcenizal Jun 23, 2016
52f6922
[7364]: Deconcatenate selectors in src/ui/public/notify/notify.less.
cjcenizal Jun 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/plugins/table_vis/public/table_vis.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
display: flex;
flex-direction: column;
flex: 1 0 100%;
}

&-error {
.table-vis-error {
display: flex;
flex-direction: column;
justify-content: center;
flex: 1 0 100%;

text-align: center;
}

&-container {
.table-vis-container {
kbn-agg-table-group > .table > tbody > tr > td {
border-top: 0px;
}
Expand All @@ -25,4 +25,3 @@
display: none;
}
}
}
6 changes: 3 additions & 3 deletions src/ui/public/agg_table/agg_table.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ kbn-agg-table-group {
display: flex;
flex: 1 1 auto;
flex-direction: column;
}

&-paginated {
.agg-table-paginated {
flex: 1 1 auto;
overflow: auto;

Expand All @@ -23,7 +24,7 @@ kbn-agg-table-group {
}
}

&-controls {
.agg-table-controls {
flex: 0 0 auto;
display: flex;
align-items: center;
Expand All @@ -35,4 +36,3 @@ kbn-agg-table-group {
padding: 0;
}
}
}
14 changes: 10 additions & 4 deletions src/ui/public/chrome/directives/app_switcher/app_switcher.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@ body { overflow-x: hidden; }
background-color: #e8488b;
}
}

.bottom-apps {
position: absolute;
bottom: 0;
}
}

.app-wrapper {
.real-flex-parent();
position: absolute;
Expand All @@ -55,16 +57,20 @@ body { overflow-x: hidden; }
margin: 0 auto;
background-color: #fff;

&.hidden-chrome { left: 0; }
&-panel {
.flex-parent(@shrink: 0);
box-shadow: -4px 0px 3px rgba(0,0,0,0.2);
&.hidden-chrome {
left: 0;
}

.navbar-right {
margin-right: 0;
}
}

.app-wrapper-panel {
.flex-parent(@shrink: 0);
box-shadow: -4px 0px 3px rgba(0,0,0,0.2);
}

.app-links {
text-align: justify;

Expand Down
28 changes: 18 additions & 10 deletions src/ui/public/doc_viewer/doc_viewer.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
@import (reference) "~ui/styles/variables";

doc-viewer .doc-viewer {

&-buttons, &-field {
white-space: nowrap;
}

&-value, pre {
.doc-viewer {
pre {
display: inline-block;
word-break: break-all;
word-wrap: break-word;
white-space: pre-wrap;
}

td, pre {
td,
pre {
font-family: "Lucida Console", Monaco, monospace;
}
}

&-content {
.doc-viewer-content {
margin-top: @padding-base-vertical;
}
}

.doc-viewer-buttons,
.doc-viewer-field {
white-space: nowrap;
}

.doc-viewer-value {
display: inline-block;
word-break: break-all;
word-wrap: break-word;
white-space: pre-wrap;
}
6 changes: 3 additions & 3 deletions src/ui/public/filter_bar/filter_bar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="confirm" ng-show="newFilters.length">
<div class="filter-bar-confirm" ng-show="newFilters.length">
<form ng-submit="applyFilters(newFilters)">
<ul class="list-unstyled">
<li>Apply these filters?</li>
Expand All @@ -9,7 +9,7 @@
</form>
</div>

<div class="bar" ng-show="filters.length">
<div class="filter-bar" ng-show="filters.length">
<div class="filter" ng-class="{ negate: filter.meta.negate, disabled: filter.meta.disabled }" ng-repeat="filter in filters">
<div class="filter-description">
<span ng-if="filter.$state.store == 'globalState'"><i class="fa fa-fw fa-thumb-tack pinned"></i></span>
Expand Down Expand Up @@ -79,7 +79,7 @@
</div>
</div>

<div class="bar bar-condensed" ng-show="filters.length && showFilterActions">
<div class="filter-bar filter-bar-condensed" ng-show="filters.length && showFilterActions">
<div class="filter-actions-all">
<div class="filter-link">
<div class="filter-description"><strong>All filters:</strong></div>
Expand Down
16 changes: 8 additions & 8 deletions src/ui/public/filter_bar/filter_bar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import (reference) "~ui/styles/variables";

filter-bar .confirm {
.filter-bar-confirm {
padding: 8px 10px 4px;
background: @filter-bar-confirm-bg;
border-bottom: 1px solid;
Expand Down Expand Up @@ -46,17 +46,11 @@ filter-bar .confirm {
}
}

filter-bar .bar {
.filter-bar {
padding: 5px 6px 3px 6px;
background: @filter-bar-bar-bg;
border-bottom: 0;

&-condensed {
padding: 6px 6px 2px 6px !important;
font-size: 0.9em;
background: @filter-bar-bar-condensed-bg;
}

.ace_editor {
height: 175px;
margin: 15px 0;
Expand Down Expand Up @@ -159,3 +153,9 @@ filter-bar .bar {
}
}
}

.filter-bar-condensed {
padding: 6px 6px 2px 6px !important;
font-size: 0.9em;
background: @filter-bar-bar-condensed-bg;
}
8 changes: 4 additions & 4 deletions src/ui/public/notify/notify.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,15 @@
margin-right: 4px;
}
}
}

&-message {
.toast-message {
flex: 1 1 auto;
.ellipsis();
line-height: normal;
}

&-stack {
.toast-stack {
padding-bottom: 10px;

pre {
Expand All @@ -65,7 +66,7 @@
}
}

&-controls {
.toast-controls {
display: flex;

button {
Expand All @@ -75,7 +76,6 @@
padding: 10px 15px;
}
}
}

// add darkened background to the different badges
.alert-success .badge {
Expand Down
27 changes: 12 additions & 15 deletions src/ui/public/styles/dark-theme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,16 +268,13 @@


// /src/ui/public/agg_table/agg_table.less
.agg-table {

&-paginated {
tr:hover td {
background-color: @table-row-hover-bg;
}
.agg-table-paginated {
tr:hover td {
background-color: @table-row-hover-bg;
}

.cell-hover:hover {
background-color: @table-cell-hover-hover-bg;
}
.cell-hover:hover {
background-color: @table-cell-hover-hover-bg;
}
}

Expand Down Expand Up @@ -441,7 +438,7 @@


// /src/ui/public/filter_bar/filter_bar.less
filter-bar .confirm {
.filter-bar-confirm {
background: @filter-bar-confirm-bg;
border-bottom-color: @filter-bar-confirm-border;

Expand All @@ -451,14 +448,10 @@
}
}

filter-bar .bar {
.filter-bar {
background: @filter-bar-bar-bg;
border-bottom-color: @filter-bar-bar-border;

&-condensed {
background: @filter-bar-bar-condensed-bg;
}

.filter {
background-color: @filter-bar-bar-filter-bg;
color: @filter-bar-bar-filter-color;
Expand All @@ -473,6 +466,10 @@
}
}

.filter-bar-condensed {
background: @filter-bar-bar-condensed-bg;
}


// /src/ui/public/styles/config.less
.config {
Expand Down