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.

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

[CSS] Cleaned up some CSS and normalized styles #6435

Merged
merged 1 commit into from
Mar 7, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/optimize/BaseOptimizer.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class BaseOptimizer {
{ test: /\.json$/, loader: 'json' },
{ test: /\.(html|tmpl)$/, loader: 'raw' },
{ test: /\.png$/, loader: 'url?limit=10000&name=[path][name].[ext]' },
{ test: /\.(woff|woff2|ttf|eot|svg|ico|gif)(\?|$)/, loader: 'file?name=[path][name].[ext]' },
{ test: /\.(woff|woff2|ttf|eot|svg|ico)(\?|$)/, loader: 'file?name=[path][name].[ext]' },
{ test: /[\/\\]src[\/\\](plugins|ui)[\/\\].+\.js$/, loader: `rjs-repack${mapQ}` },
{
test: /\.js$/,
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/kibana/public/dashboard/index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div dashboard-app class="app-container dashboard-container">
<navbar name="dashboard-options">
<div class="dashboard-info">
<span ng-show="dash.id" class="dashboard-info-title">
<navbar name="dashboard-options" class="kibana-nav-options">
<div class="kibana-nav-info">
<span ng-show="dash.id" class="kibana-nav-info-title">
<span ng-bind="::dash.title"></span>
</span>

</div>

<div class="button-group dashboard-actions" role="toolbar">
<div class="button-group kibana-nav-actions" role="toolbar">
<button ng-click="newDashboard()"
aria-label="New Dashboard">
<span>New</span>
Expand Down
7 changes: 0 additions & 7 deletions src/plugins/kibana/public/dashboard/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

.tab-dashboard {
background-color: @dashboard-bg;
navbar[name="dashboard-options"] {
padding-bottom: 0;
}
}

dashboard-grid {
Expand Down Expand Up @@ -158,10 +155,6 @@ dashboard-grid {
}
}

.dashboard-actions {
margin-left: auto;
}

.dashboard-panel-picker > .list-group-item {
border-top: 0;
}
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/kibana/public/discover/index.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div ng-controller="discover" class="app-container">
<navbar name="discover-options">
<div class="discover-info">
<span ng-show="opts.savedSearch.id" class="discover-info-title">
<navbar name="discover-options" class="kibana-nav-options">
<div class="kibana-nav-info">
<span ng-show="opts.savedSearch.id" class="kibana-nav-info-title">
<span ng-bind="::opts.savedSearch.title"></span>
<i aria-label="Reload Saved Search" tooltip="Reload Saved Search" ng-click="resetQuery();" class="fa fa-undo small"></i>
</span>

<strong class="discover-info-hits">{{(hits || 0) | number:0}}</strong>
<ng-pluralize count="hits" when="{'1':'hit', 'other':'hits'}"></ng-pluralize>
</div>
<div class="discover-actions button-group" role="toolbar">
<div class="kibana-nav-actions button-group" role="toolbar">
<button
ng-click="newQuery()"
aria-label="New Search">
Expand Down
7 changes: 0 additions & 7 deletions src/plugins/kibana/public/discover/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

.tab-discover {
overflow-x: hidden;
navbar[name="discover-options"] {
padding-bottom: 0;
}
}

.discover {
Expand Down Expand Up @@ -77,10 +74,6 @@
}
}

&-actions {
margin-left: auto;
}

&-info {
line-height: 30px;
padding: 0px 10px;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/kibana/public/visualize/editor/editor.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div ng-controller="VisEditor" class="vis-editor vis-type-{{ vis.type.name }}">
<navbar ng-if="chrome.getVisible()" name="visualize-options">
<div ng-controller="VisEditor" class="app-container vis-editor vis-type-{{ vis.type.name }}">
<navbar name="visualize-options" class="kibana-nav-options" ng-if="chrome.getVisible()">
<div class="vis-editor-info">
<span ng-show="savedVis.id" class="vis-editor-info-title">
<span ng-bind="::savedVis.title"></span>
</span>
</div>

<div class="button-group vis-editor-actions">
<div class="button-group kibana-nav-actions">
<button ng-click="startOver()" aria-label="New Visualization">
<span>New</span>
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,6 @@
}
}

navbar[name="visualize-options"] {
padding-bottom: 0;
}


&-actions {
margin-left: auto;
}

&-content {
.flex-parent();
Expand Down
13 changes: 0 additions & 13 deletions src/plugins/kibana/public/visualize/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,5 @@
}
}

.visualize-info {
align-self: flex-end;

&-tab {
background-color: @visualize-info-bg;
padding: 5px 10px;
margin-left: @padding-base-horizontal;
border-bottom-left-radius: @border-radius-base;
text-align: right;
font-weight: bold;
}

}

@import "../editor/styles/_editor.less";
13 changes: 7 additions & 6 deletions src/ui/public/chrome/directives/app_switcher/app_switcher.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
@as-open-width: 160px;
@as-closed-width: 53px;
@app-icon-height: 38px;
@app-line-height: 24px;
@transition-time: .35s;
@transition-delay: .25s;
@app-links-wrapper-background: #3caed2;
@app-links-active-background: lighten(@app-links-wrapper-background, 7.5%);

@firstLinkColor: #E4BB51;
@secondLinkColor: #8AC336;
Expand Down Expand Up @@ -81,17 +83,17 @@ body { overflow-x: hidden; }
.app-link {
width: @as-open-width;
height: @app-icon-height;
line-height: 24px;
line-height: @app-line-height;


> a {
display: block;
height: 100%;
color: #fff;
color: @white;
}

&:hover {
background-color: lighten(@app-links-wrapper-background, 7.5%);
background-color: @app-links-active-background;
}

.app-icon {
Expand All @@ -103,8 +105,6 @@ body { overflow-x: hidden; }
display: inline-block;
height: @app-icon-height;
width: @as-closed-width;
> i {
}

> img {
height: 18px;
Expand All @@ -118,6 +118,7 @@ body { overflow-x: hidden; }
font-size: 1.7em;
display: inline-block;
height: @app-icon-height;
line-height: @app-icon-height;
width: @as-closed-width;
background-position: center;
background-size: contain;
Expand All @@ -135,7 +136,7 @@ body { overflow-x: hidden; }
}

&.active {
background-color: lighten(@app-links-wrapper-background, 10%);
background-color: @app-links-active-background;
> a {
color: #333;
text-decoration: none;
Expand Down
Binary file removed src/ui/public/images/kibana.gif
Binary file not shown.
18 changes: 16 additions & 2 deletions src/ui/public/styles/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ul.navbar-inline li {
.flex-parent(@shrink: 0);
position: relative;
z-index: 0;
background-color: #fff;
background-color: @white;
}

.top-fixed {
Expand Down Expand Up @@ -140,11 +140,25 @@ a {
z-index: 0;
}

> navbar:first-child { padding-bottom: 0; }
.kibana-nav-options {
padding-bottom: 0;
.kibana-nav-actions {
margin-left: auto;
}
.kibana-nav-info {
line-height: 30px;
padding: 0 10px;
&-title {
font-weight: bold;
margin-right: 10px;
}
}
}

> config {
z-index: 1;
}
> navbar { padding-bottom: 4px; }

> nav,
> navbar {
Expand Down
31 changes: 0 additions & 31 deletions src/ui/public/styles/control_group.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,6 @@
}
}

button {
padding: 4px 10px;
font-size: @font-size-base;
color: @control-group-link-color;
background-color: @control-group-bg;

&:hover {
color: @control-group-link-hover-color;
background-color: @control-group-link-hover-bg;
}

.active, &:active, &:focus {
color: @control-group-link-active-color;
background-color: @control-group-link-active-bg;
}

&[disabled] {
color: @control-group-link-disabled-color;
background-color: @control-group-link-disabled-bg;
}

&:focus {
// because some buttons are all side-to-side, the browser's outline
// is cut off by the next button. This causes the outline to be
// drawn inside the button. Appplied to all buttons so that it's
// uniform within this widget
outline-offset: -4px;
}
}


// horizontal group of buttons/form elements
.button-group,
.inline-form .input-group {
Expand Down
6 changes: 4 additions & 2 deletions src/ui/public/styles/navbar.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@import "./control_group";

@navbar-margin: @padding-small-vertical;

navbar {
.control-group();

Expand All @@ -21,8 +23,8 @@ navbar {
}

.navbar-text {
margin-top: 6px;
margin-bottom: 6px;
margin-top: @navbar-margin;
margin-bottom: @navbar-margin;
}

// the "brand" that is displayed, usually on the left of the navbar
Expand Down
2 changes: 2 additions & 0 deletions src/ui/public/styles/variables/for-theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@
@tooltip-color: @gray-lighter;

@tooltip-table-border: @gray;
@tooltip-bold: 600;



// Svg =========================================================================
Expand Down
5 changes: 2 additions & 3 deletions src/ui/public/timepicker/toggle.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</li>

<li
ng-show="timefilter.refreshInterval.value > 0 || configTemplate.is('interval') || configTemplate.is('filter')"
class="to-body">
ng-show="timefilter.refreshInterval.value > 0 || configTemplate.is('interval') || configTemplate.is('filter')">

<button ng-click="configTemplate.toggle('interval')"
ng-class="{active: configTemplate.is('interval') }"
Expand All @@ -20,7 +19,7 @@

</li>

<li class="to-body" >
<li>
<button ng-class="{active: configTemplate.is('filter')}"
ng-click="configTemplate.toggle('filter')"
aria-haspopup="true"
Expand Down
4 changes: 1 addition & 3 deletions src/ui/public/vislib/styles/_tooltip.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@import (reference) "~ui/styles/variables";

@semi-bold: 600;

.vis-tooltip,
.vis-tooltip-sizing-clone {
visibility: hidden;
Expand Down Expand Up @@ -30,7 +28,7 @@
font-family: @font-family-sans-serif;

th {
font-weight: @semi-bold;
font-weight: @tooltip-bold;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/visualize/visualize.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h4>No results found</h4>
ng-style="loadingStyle"
ng-class="{ loading: vis.type.requiresSearch && searchSource.activeFetchCount > 0 }"
class="visualize-chart"></div>
<visualize-legend ng-show="vis.params.addLegend"></visualize-legend>
<visualize-legend></visualize-legend>
</div>
<!-- <pre>{{chartData | json}}</pre> -->
<visualize-spy ng-if="vis.type.requiresSearch && showSpyPanel"></visualize-spy>