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 in vislib and visualize. #7549

Merged
merged 4 commits into from
Jun 28, 2016
Merged

[7364]: Deconcatenate selectors in vislib and visualize. #7549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc1539f
[7364]: Deconcatenate selectors and reduce specificity in src/ui/pub…
cjcenizal Jun 24, 2016
de80212
[7364]: Deconcatenate selectors in src/ui/public/vislib/styles/_legen…
cjcenizal Jun 24, 2016
32849f5
[7364]: Deconcatenate selectors in src/ui/public/vislib/styles/_toolt…
cjcenizal Jun 24, 2016
6c7ed37
[7364]: Deconcatenate selectors and reduce specificity in src/ui/publ…
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
50 changes: 23 additions & 27 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 @@ -283,18 +283,16 @@


// /src/ui/public/visualize/visualize.less
visualize-spy {
.visualize-show-spy {
border-top-color: @visualize-show-spy-border;
.visualize-show-spy {
border-top-color: @visualize-show-spy-border;
}

}
.visualize-spy-container {
pre {
border-color: @visualize-show-spy-border;
color: @visualize-spy-container-pre-color;
opacity: 1;
background-color: @visualize-spy-container-pre-bg;
}
.visualize-spy-container {
pre {
border-color: @visualize-show-spy-border;
color: @visualize-spy-container-pre-color;
opacity: 1;
background-color: @visualize-spy-container-pre-bg;
}
}

Expand Down Expand Up @@ -330,28 +328,26 @@

}

.legend-value {
&-title {
padding: 3px;
.legend-value-title {
padding: 3px;

&:hover {
background-color: @sidebar-hover-bg;
}
&:hover {
background-color: @sidebar-hover-bg;
}
}

&-full {
background-color: @gray3;
}
.legend-value-full {
background-color: @gray3;
}

&-details {
border-bottom: 1px solid @sidebar-bg;
.legend-value-details {
border-bottom: 1px solid @sidebar-bg;

.filter-button {
background-color: @sidebar-bg;
.filter-button {
background-color: @sidebar-bg;

&:hover {
background-color: @sidebar-hover-bg;
}
&:hover {
background-color: @sidebar-hover-bg;
}
}
}
Expand Down
53 changes: 28 additions & 25 deletions src/ui/public/vislib/styles/_alerts.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

.vis-alerts {
position: relative;
}

&-tray {
.vis-alerts-tray {
position: absolute;
bottom: 5px;
left: 0px;
Expand All @@ -16,6 +17,19 @@
transition-duration: 50ms;
}

.vis-alerts-icon {
margin: 0;
padding: 0 10px;
flex: 0 0 auto;
align-self: center;
}

.vis-alerts-text {
flex: 1 1 auto;
margin: 0;
padding: 0;
}

.vis-alert {
margin: 0 10px 10px;
padding: 5px 10px 5px 5px;
Expand All @@ -24,31 +38,20 @@
border: 1px solid;
border-color: @alert-vis-alert-border;
display: flex;
}

&-success {
.alert-variant(fade(@alert-success-bg, 75%); @alert-success-border; @alert-success-text);
}
&-info {
.alert-variant(fade(@alert-info-bg, 75%); @alert-info-border; @alert-info-text);
}
&-warning {
.alert-variant(fade(@alert-warning-bg, 75%); @alert-warning-border; @alert-warning-text);
}
&-danger {
.alert-variant(fade(@alert-danger-bg, 75%); @alert-danger-border; @alert-danger-text);
}
}

&-icon {
margin: 0;
padding: 0 10px;
flex: 0 0 auto;
align-self: center;
.vis-alert-success {
.alert-variant(fade(@alert-success-bg, 75%); @alert-success-border; @alert-success-text);
}

&-text {
flex: 1 1 auto;
margin: 0;
padding: 0;
.vis-alert-info {
.alert-variant(fade(@alert-info-bg, 75%); @alert-info-border; @alert-info-text);
}

.vis-alert-warning {
.alert-variant(fade(@alert-warning-bg, 75%); @alert-warning-border; @alert-warning-text);
}

.vis-alert-danger {
.alert-variant(fade(@alert-danger-bg, 75%); @alert-danger-border; @alert-danger-text);
}
}
20 changes: 10 additions & 10 deletions src/ui/public/vislib/styles/_legend.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,32 @@ visualize-legend {
}

.legend-value {
&-title {
&:hover {
cursor: pointer;
}
}

.legend-value-title {
padding: 3px;

&:hover {
background-color: @sidebar-hover-bg;
}
}

&-truncate {
.legend-value-truncate {
overflow-x: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

&-full {
.legend-value-full {
white-space: normal;
word-break: break-all;
background-color: @sidebar-hover-bg;
}

&-details {
.legend-value-details {
border-bottom: 1px solid @sidebar-bg;

.filter-button {
Expand All @@ -98,7 +103,7 @@ visualize-legend {
}
}

&-color-picker {
.legend-value-color-picker {
width: 130px;
margin: auto;

Expand All @@ -113,8 +118,3 @@ visualize-legend {
font-size: 18px
}
}
}

.legend-value:hover {
cursor: pointer;
}
14 changes: 7 additions & 7 deletions src/ui/public/vislib/styles/_tooltip.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@
margin-bottom: 0;
}

&-icon {
+ * {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this be improved at all? + div, etc?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I hesitate to dig into this component, since I'm not sure of its scope. I'll tackle this guy separately.

margin-top: @tooltip-space;
}
}

.vis-tooltip-header-icon {
flex: 0 0 auto;
padding-right: @tooltip-space;
}

&-text {
.vis-tooltip-header-text {
flex: 1 1 200px;
}

+ * {
margin-top: @tooltip-space;
}
}

.vis-tooltip-sizing-clone {
visibility: hidden;
position: fixed;
Expand Down
123 changes: 63 additions & 60 deletions src/ui/public/visualize/visualize.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,87 +75,90 @@ visualize-spy {
padding-top: 0px;
}

.visualize-show-spy {
flex: 0 0 auto;
&-tab {
color: @kibanaGray4;
position: absolute;
z-index: 100;
left: 5px;
bottom: 0px;
}
}

.visualize-spy-fill {
margin-right: 5px;
}

.visualize-spy-container {
flex: 1 1 auto;

display: flex;
flex-direction: column;
&.only {
.visualize-spy-container {
height: auto;
}
}

height: 482px;
overflow-y: auto;
pre {
word-break: break-all;
word-wrap: break-word;
white-space: pre-wrap;
}
}

header {
padding: 0 0 15px;
}
.visualize-spy-container {
flex: 1 1 auto;

header + * {
flex: 1 1 auto;
}
display: flex;
flex-direction: column;

> .alert {
flex: 0 0 auto;
}
height: 482px;
overflow-y: auto;

tr > td {
font-size: 0.85em;
}
header {
padding: 0 0 15px;
}

&.only .visualize-spy-container {
height: auto;
header + * {
flex: 1 1 auto;
}

.visualize-spy-nav {
> .alert {
flex: 0 0 auto;
}

a.btn {
margin: @padding-small-vertical @padding-small-vertical;
}
tr > td {
font-size: 0.85em;
}
}

.visualize-spy-content {
position: relative;
.visualize-spy-nav {
flex: 0 0 auto;

.visualize-spy-loading {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
text-align: center;
a.btn {
margin: @padding-small-vertical @padding-small-vertical;
}
}

&-text {
display: inline-block;
margin: 0;
background: @alert-info-bg;
color: @alert-info-text;
padding: 5px 10px;
border-radius: @border-radius-base;
.visualize-spy-content {
position: relative;
}

.visualize-spy-loading {
position: absolute;
top: 0px;
left: 0px;
right: 0px;
text-align: center;
}

.spinner > * {
background-color: @alert-info-text;
}
.visualize-spy-loading-text {
display: inline-block;
margin: 0;
background: @alert-info-bg;
color: @alert-info-text;
padding: 5px 10px;
border-radius: @border-radius-base;

.spinner > * {
background-color: @alert-info-text;
}
}
}

pre {
word-break: break-all;
word-wrap: break-word;
white-space: pre-wrap;
}
.visualize-show-spy {
flex: 0 0 auto;
}

.visualize-show-spy-tab {
color: @kibanaGray4;
position: absolute;
z-index: 100;
left: 5px;
bottom: 0px;
}