Rashid Khan 12 лет назад
Родитель
Сommit
91db870d77

+ 1 - 1
src/app/panels/query/module.html

@@ -16,7 +16,7 @@
     </form>
   </div>
   <div style="display:inline-block" ng-repeat="id in querySrv.ids|pinnedQuery:true">
-    <span class="pointer" ng-show="$first" ng-click="panel.pinned = !panel.pinned"><span class="pins">Pinned</span> <i ng-class="{'icon-caret-right':panel.pinned,'icon-caret-left':!panel.pinned}"></i></span>
+    <span class="pointer badge pins" ng-show="$first" ng-click="panel.pinned = !panel.pinned">Pinned <i ng-class="{'icon-caret-right':panel.pinned,'icon-caret-left':!panel.pinned}"></i></span>
     <span ng-show="panel.pinned" class="badge pinned">
       <i class="icon-circle pointer" ng-show="querySrv.list[id].enable" ng-style="{color: querySrv.list[id].color}" data-unique="1" bs-popover="'app/panels/query/meta.html'" data-placement="bottomLeft"></i>
       <i class="pointer icon-circle-blank" bs-tooltip="'Activate query'" ng-click="querySrv.list[id].enable=true;dashboard.refresh();" ng-hide="querySrv.list[id].enable" ng-style="{color: querySrv.list[id].color}"></i>

+ 0 - 3
src/app/panels/query/query.css

@@ -39,9 +39,6 @@
 .form-search:hover .remove-query {
   opacity: 1;
 }
-.query-panel .pins {
-  text-decoration: underline;
-}
 .query-panel .pinned {
   margin-right: 5px;
 }

+ 5 - 5
src/app/partials/dashboard.html

@@ -10,7 +10,7 @@
     <kibana-simple-panel type="pulldown.type" ng-cloak></kibana-simple-panel>
   </div>
 </nil>
-<div class="clearfix bgNav nav-shadow" ></div>
+<div class="clearfix bgNav" ></div>
 <div class="container-fluid main">
   <div class="row-fluid">
     <div class="row-fluid container" style="margin-top:10px; width:98%">
@@ -19,8 +19,8 @@
         <div class="row-control">
           <div class="row-fluid" style="padding:0px;margin:0px;position:relative;">
 
-            <div class="row-close shadow span12" ng-show="row.collapse" data-placement="bottom" >
-              <span class="row-button bgInverse" bs-modal="'app/partials/roweditor.html'" class="pointer">
+            <div class="row-close span12" ng-show="row.collapse" data-placement="bottom" >
+              <span class="row-button bgWarning" bs-modal="'app/partials/roweditor.html'" class="pointer">
                 <i bs-tooltip="'Configure row'" data-placement="right" ng-show="row.editable" class="icon-cog pointer"></i>
               </span>
               <span class="row-button bgPrimary" ng-click="toggle_row(row)" ng-show="row.collapsable">
@@ -34,11 +34,11 @@
                 <i bs-tooltip="'Hide row'" data-placement="right"  class="icon-caret-right" ></i>
                 <br>
               </div>
-              <div bs-modal="'app/partials/roweditor.html'" class='row-tab bgInverse' ng-show="row.editable">
+              <div bs-modal="'app/partials/roweditor.html'" class='row-tab bgWarning' ng-show="row.editable">
                 <i bs-tooltip="'Configure row'" data-placement="right"  class="icon-cog pointer"></i>
                 <br>
               </div>
-              <div ng-show="rowSpan(row) > 12" class='row-tab bgWarning'>
+              <div ng-show="rowSpan(row) > 12" class='row-tab bgDanger'>
                 <i bs-tooltip="'Total span > 12. This row may format poorly'" data-placement="right" class="icon-warning-sign"></i>
                 <br>
               </div>

+ 3 - 1
src/app/services/filterSrv.js

@@ -232,7 +232,9 @@ define([
       var idCount = dashboard.current.services.filter.ids.length;
       if(idCount > 0) {
         // Make a sorted copy of the ids array
-        var ids = _.clone(dashboard.current.services.filter.ids).sort();
+        var ids = _.sortBy(_.clone(dashboard.current.services.filter.ids),function(num){
+          return num;
+        });
         return kbn.smallestMissing(ids);
       } else {
         // No ids currently in list

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/bootstrap.dark.min.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/bootstrap.light.min.css


+ 555 - 0
src/vendor/bootstrap/less/bak/bootswatch.dark.less

@@ -0,0 +1,555 @@
+// Slate 2.3.2
+// Bootswatch
+// -----------------------------------------------------
+
+// KIBANA
+.panelCont {
+    outline: 1px solid darken(@bodyBackground, 10%);
+    border-top: 1px solid lighten(@bodyBackground, 10%);
+    padding: 0px 10px 10px 10px;
+    background: darken(@bodyBackground, 3%);
+    margin: 0px;
+}
+
+
+// TYPOGRAPHY
+// -----------------------------------------------------
+
+h1, h2, h3, h4, h5, h6 {
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+}
+
+code, pre {
+	background-color: #F7F7F7;
+	border: 1px solid darken(@grayDarker, 5%);
+	text-shadow: none;
+}
+
+// SCAFFOLDING
+// -----------------------------------------------------
+
+legend, .page-header {
+	border-bottom: 1px solid @hrBorder;
+}
+
+hr {
+	border-bottom: none;
+}
+
+// NAVBAR
+// -----------------------------------------------------
+
+.navbar {
+
+	.navbar-inner {
+		#gradient > .vertical-three-colors(@grayDark, darken(@bodyBackground,3%), 70%, darken(@bodyBackground,3%));
+	}
+
+	.brand {
+		text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+		border-right: none;
+	}
+
+	.navbar-text {
+		padding: 0 15px;
+		font-weight: bold;
+	}
+
+	.nav > li > a  {
+		text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+		border-right: 1px solid rgba(0, 0, 0, 0.2);
+		border-left: 1px solid rgba(255, 255, 255, 0.1);
+
+		&:hover {
+			#gradient > .directional(@grayDarker, @grayDark, 280deg);
+			border-left: 1px solid transparent;
+			border-right: 1px solid transparent;
+		}
+	}
+
+	.nav > li.active > a,
+	.nav > li.active > a:hover {
+		color: @grayLighter;
+		background-color: @grayDark;
+		#gradient > .directional(lighten(@grayDarker, 2%), lighten(@grayDark, 2%), 0deg);
+		border-right: 1px solid darken(@gray, 15%);
+	}
+
+	.navbar-search .search-query {
+		border: 1px solid darken(@gray, 15%);
+	}
+
+	.btn,
+	.btn-group {
+		margin: 4px 0;
+	}
+
+	.divider-vertical {
+		background-color: transparent;
+		border-right: none;
+	}
+
+	.dropdown-menu::after {
+		border-bottom: 6px solid @grayDark;
+	}
+
+	&-inverse {
+
+		.navbar-inner {
+			#gradient > .vertical-three-colors(darken(@grayDarker, 3%), darken(@grayDarker, 8%), 70%, darken(@grayDarker, 8%));
+		}
+
+		.nav li > a {
+			background-image: none;
+			background-color: transparent;
+		}
+
+		.nav li > a:hover,
+		.nav li.active > a,
+		.nav li.active > a:hover {
+			#gradient > .directional(darken(@grayDarker, 10%), darken(@grayDarker, 5%), 280deg);
+		}
+	}
+}
+
+@media (max-width: @navbarCollapseWidth) {
+
+	.navbar .nav-collapse {
+
+		.nav li > a,
+		.nav li > a:hover,
+		.nav .active > a,
+		.nav .active > a:hover {
+			.box-shadow(none);
+			color: @grayLighter;
+			border: 1px solid transparent;
+			background-color: transparent;
+			background-image: none;
+		}
+
+		.nav li > a:hover,
+		.nav .active > a:hover {
+			background-color: @grayDarker;
+		}
+
+		.navbar-form,
+		.navbar-search {
+			border-color: transparent;
+			.box-shadow(none);
+		}
+
+		.nav-header {
+			color: @grayLight;
+		}
+	}
+
+	.navbar-inverse .nav-collapse {
+
+		.nav li > a:hover,
+		.nav .active > a:hover {
+			background-color: @grayDarker !important;
+		}
+	}
+}
+
+.nav-tabs {
+	.active > a, .active a:hover {
+		border-bottom: 1px solid darken(@grayDark, 5%);;
+	}
+}
+
+div.subnav {
+
+	margin: 0 1px;
+	//#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+	border: 1px solid transparent;
+	.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
+
+	.nav > li > a {
+		color: @grayLighter;
+		text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+		border-right: 1px solid darken(@gray, 15%);
+		border-left: 1px solid @gray;
+
+		&:hover {
+			color: @grayLighter;
+			background-color: @grayDark;
+			//#gradient > .directional(@grayDarker, @grayDark, 280deg);
+			border-left: 1px solid transparent;
+			border-right: 1px solid transparent;
+		}
+	}
+
+	.nav > li.active > a,
+	.nav > li.active > a:hover {
+		color: @grayLighter;
+		background-color: @grayDark;
+		#gradient > .directional(lighten(@grayDarker, 4%), lighten(@grayDark, 4%), 280deg);
+		border-right: 1px solid darken(@gray, 15%);
+	}
+
+	.nav > li:first-child > a,
+	.nav > li:first-child > a:hover {
+		border-left: 1px solid transparent;
+	}
+
+	.nav > li.active:last-child > a,
+	.nav > li:last-child > a:hover {
+		border-right: 1px solid darken(@gray, 15%);
+	}
+
+	.open .dropdown-toggle {
+		border-right: 1px solid darken(@gray, 15%);
+		border-left: 1px solid @gray;
+	}
+
+	&.subnav-fixed {
+		top: @navbarHeight;
+		margin: 0;
+		.box-shadow(none);
+
+		.nav > li.active:first-child > a,
+		.nav > li:first-child > a:hover {
+			border-left: 1px solid darken(@gray, 15%);
+		}
+	}
+}
+
+// NAV
+// -----------------------------------------------------
+
+.nav {
+
+	.nav-header {
+		text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
+	}
+
+	& > li > a {
+		//#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+		.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
+		border: none;
+		color: @grayLight;
+		font-weight: bold;
+		text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+	}
+
+	li.active > a,
+	li.active > a:hover {
+		background-color: transparent;
+		color: @white;
+	}
+
+	& > li.disabled > a,
+	& > li.disabled > a:hover {
+		color: @gray;
+	}
+
+	li > a:hover {
+		background-color: transparent;
+		color: @grayLighter;
+	}
+
+}
+
+.breadcrumb {
+	border: 1px solid transparent;
+	#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+	.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
+
+	a {
+		color: @grayLighter;
+		font-weight: bold;
+	}
+
+	li {
+		color: @grayLight;
+		font-weight: bold;
+		text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+	}
+}
+
+.pagination {
+
+	ul {
+		.box-shadow(none);
+	}
+
+	ul > li > a,
+	ul > li > span {
+		border-left: 1px solid @gray;
+		border-right: 1px solid darken(@gray, 15%);
+		border-top: none;
+		border-bottom: none;
+		#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+		.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
+		color: @grayLighter;
+		font-weight: bold;
+		text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+
+		&:hover {
+			#gradient > .directional(@grayDarker, @grayDark, 280deg);
+			border-left: 1px solid transparent;
+		}
+	}
+
+	ul > .active > a,
+	ul > .active > a:hover,
+	ul > .active > span,
+	ul > .active > span:hover {
+		color: @grayLighter;
+		background-color: @grayDark;
+		#gradient > .directional(lighten(@grayDarker, 4%), lighten(@grayDark, 4%), 280deg);
+		border-left: 1px solid transparent;
+	}
+
+	ul > .disabled > a,
+	ul > .disabled > a:hover,
+	ul > .disabled > span,
+	ul > .disabled > span:hover {
+		border-left: 1px solid @gray;
+		border-right: 1px solid darken(@gray, 15%);
+		border-top: none;
+		border-bottom: none;
+		#gradient > .vertical-three-colors(@grayLight, @gray, 70%, @gray);
+	}
+}
+
+.pager {
+
+	li > a,
+	li > span {
+
+		border: 1px solid transparent;
+		.box-shadow('0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1)');
+		#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+
+		&:hover {
+			#gradient > .directional(@grayDarker, @grayDark, 280deg);
+			border: 1px solid transparent;
+		}
+	}
+
+	.disabled a,
+	.disabled a:hover {
+		background-color: transparent;
+		#gradient > .vertical-three-colors(@gray, @grayDark, 70%, @grayDark);
+	}
+}
+
+// BUTTONS
+// -----------------------------------------------------
+
+.btn {
+    .buttonBackground(@gray, darken(@gray, 10%));
+	.border-radius(3px);
+	border: 1px solid @grayDarker;
+}
+
+.btn, .btn:hover {
+	color: @white;
+	font-weight: bold;
+	text-shadow: -1px -1px 1px rgba(0, 0, 0, 0.3);
+}
+
+.btn-primary {
+	.buttonBackground(@btnPrimaryBackground, spin(@btnPrimaryBackground, 20));
+	color: @grayDark;
+	text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.3);
+}
+
+.btn-warning {
+	.buttonBackground(lighten(@orange, 15%), @orange);
+}
+
+.btn-danger {
+	.buttonBackground(@red, #bd362f);
+}
+
+.btn-success {
+	.buttonBackground(@green, #51a351);
+}
+
+.btn-info {
+	.buttonBackground(@blue, #2f96b4);
+}
+
+.btn-inverse {
+	.buttonBackground(@gray, @grayDarker);
+}
+
+.caret {
+	border-top-color: @white;
+}
+
+// TABLES
+// -----------------------------------------------------
+
+.table {
+
+	tbody tr.success td {
+		background-color: @successText;
+	}
+
+	tbody tr.error td {
+		background-color: @errorText;
+	}
+
+	tbody tr.info td {
+		background-color: @infoText;
+	}
+
+}
+
+
+// FORMS
+// -----------------------------------------------------
+
+label, input, button, select, textarea, legend {
+	color: @textColor;
+}
+
+legend, label {
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+}
+
+.input-prepend .add-on,
+.input-append .add-on {
+	vertical-align: top;
+	background-color: @gray;
+	border-top: 1px solid @grayLight;
+	border-left: 1px solid @grayLight;
+	border-bottom: 1px solid @grayDark;
+	border-right: 1px solid @grayDark;
+	text-shadow: none;
+}
+
+.input-append .btn,
+.input-prepend .btn {
+	margin-top: -1px;
+	padding: 5px 14px;
+}
+
+.uneditable-input,
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+	color: @gray;
+	background: @grayDarker;
+}
+
+.form-actions {
+	border-top: none;
+}
+
+// DROPDOWNS
+// -----------------------------------------------------
+
+.dropdown-menu {
+	.box-shadow(0 5px 5px rgba(0, 0, 0, 0.2));
+}
+
+.dropdown.open .dropdown-toggle {
+	background-color: @grayDark;
+	color: @grayLighter;
+}
+
+.dropdown-submenu > a::after {
+	border-left-color: @white;
+}
+
+// ALERTS, LABELS, BADGES
+// -----------------------------------------------------
+
+.label, .alert {
+  	color: rgba(255, 255, 255, 0.9);
+	text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.3);
+	.box-shadow(1px 1px 1px rgba(0, 0, 0, 0.3));
+}
+
+.alert {
+  background-color: @orange;
+  border-color: @orange;
+
+	.alert-heading {
+		color: rgba(255, 255, 255, 0.9);
+		text-shadow: -1px -1px 0 rgba(0, 0, 0, 0.4);
+	}
+}
+
+.alert-success {
+  background-color: @successText;
+  border-color: @successText;
+}
+
+.alert-error {
+  background-color: @errorText;
+  border-color: @errorText;
+}
+
+.alert-info {
+  background-color: @infoText;
+  border-color: @infoText;
+}
+
+// MISC
+// -----------------------------------------------------
+
+.well, .hero-unit {
+	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5));
+}
+
+.thumbnail,
+a.thumbnail:hover {
+  border: 1px solid darken(@grayDarker, 5%);
+}
+
+.progress {
+	background-color: darken(@grayDarker, 3%);
+	#gradient > .vertical(darken(@grayDarker, 3%), darken(@grayDarker, 3%));
+	.box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5));
+}
+
+.footer {
+	border-top: 1px solid darken(@grayDarker, 5%);
+
+	p {
+		color: @textColor;
+	}
+}
+
+.modal {
+
+	background-color: darken(@grayDark, 5%);
+
+	&-header {
+		border-bottom: none;
+	}
+
+	&-body {
+		border-bottom: 1px solid #1C1E22;
+	}
+
+	&-footer {
+		border-top: none;
+		background-color: @grayDarker;
+		.box-shadow(none);
+	}
+}
+
+// MEDIA QUERIES
+// -----------------------------------------------------
+
+@media (max-width: 979px) {
+	.navbar .brand {
+		border-right: none;
+	}
+}
+
+@media (max-width: 768px) {
+	div.subnav .nav > li + li > a {
+		border-top: 1px solid transparent;
+	}
+}

+ 304 - 0
src/vendor/bootstrap/less/bak/variables.dark.less

@@ -0,0 +1,304 @@
+// Slate 2.3.2
+// Variables
+// --------------------------------------------------
+
+
+// Global values
+// --------------------------------------------------
+
+
+// Grays
+// -------------------------
+@black:                 #000;
+@grayDarker:            #272B30;
+@grayDark:              #3A3F44;
+@gray:                  #52575C;
+@grayLight:             #7A8288;
+@grayLighter:           #BBBFC2;
+@white:                 #fff;
+
+
+// Accent colors
+// -------------------------
+@blue:                  #5bc0de;
+@blueDark:              #108CBB;
+@green:                 #62c462;
+@red:                   #ee5f5b;
+@yellow:                #F6D30D;
+@orange:                #f89406;
+@pink:                  #c3325f;
+@purple:                #7a43b6;
+
+
+// Scaffolding
+// -------------------------
+@bodyBackground:        @grayDarker;
+@textColor:             #C8C8C8;
+
+
+// Links
+// -------------------------
+@linkColor:             @white;
+@linkColorHover:        @white;
+
+
+// Typography
+// -------------------------
+@sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+@serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+@monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
+
+@baseFontSize:          14px;
+@baseFontFamily:        @sansFontFamily;
+@baseLineHeight:        21px;
+@altFontFamily:         @serifFontFamily;
+
+@headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
+@headingsFontWeight:    bold;    // instead of browser default, bold
+@headingsColor:         inherit; // empty to use BS default, @textColor
+
+
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+@fontSizeLarge:         @baseFontSize * 1.25; // ~18px
+@fontSizeSmall:         @baseFontSize * 0.85; // ~12px
+@fontSizeMini:          @baseFontSize * 0.75; // ~11px
+
+@paddingLarge:          11px 19px; // 44px
+@paddingSmall:          2px 10px;  // 26px
+@paddingMini:           0px 6px;   // 22px
+
+@baseBorderRadius:      4px;
+@borderRadiusLarge:     6px;
+@borderRadiusSmall:     3px;
+
+
+// Tables
+// -------------------------
+@tableBackground:                   transparent; // overall background-color
+@tableBackgroundAccent:             darken(@grayDark, 5%); // for striping
+@tableBackgroundHover:              @grayDark; // for hover
+@tableBorder:                       lighten(@grayDark, 2%); // table and cell border
+
+// Buttons
+// -------------------------
+@btnBackground:                     @gray;
+@btnBackgroundHighlight:            darken(@gray, 10%);
+@btnBorder:                         darken(@gray, 20%);
+
+@btnPrimaryBackground:              @grayLight;
+@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 15%);
+
+@btnInfoBackground:                 @blue;
+@btnInfoBackgroundHighlight:        #2f96b4;
+
+@btnSuccessBackground:              @green;
+@btnSuccessBackgroundHighlight:     #51a351;
+
+@btnWarningBackground:              lighten(@orange, 15%);
+@btnWarningBackgroundHighlight:     @orange;
+
+@btnDangerBackground:               @red;
+@btnDangerBackgroundHighlight:      #bd362f;
+
+@btnInverseBackground:              @gray;
+@btnInverseBackgroundHighlight:     @grayDarker;
+
+// Forms
+// -------------------------
+@inputText:                     @white;
+@inputBackground:               @gray;
+@inputBorder:                   @grayLight;
+@inputBorderRadius:             @baseBorderRadius;
+@inputDisabledBackground:       @grayLighter;
+@formActionsBackground:         darken(@grayDarker, 3%);
+@inputHeight:                   @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+
+
+// Dropdowns
+// -------------------------
+@dropdownBackground:            @grayDark;
+@dropdownBorder:                rgba(0,0,0,.2);
+@dropdownDividerTop:            transparent;
+@dropdownDividerBottom:         darken(@grayDarker, 5%);
+
+@dropdownLinkColor:             @grayLight;
+@dropdownLinkColorHover:        @white;
+@dropdownLinkColorActive:       @white;
+
+@dropdownLinkBackgroundActive:  @grayDarker;
+@dropdownLinkBackgroundHover:   @grayDarker;
+
+
+
+// COMPONENT VARIABLES
+// --------------------------------------------------
+
+
+// Z-index master list
+// -------------------------
+// Used for a bird's eye view of components dependent on the z-axis
+// Try to avoid customizing these :)
+@zindexDropdown:          1000;
+@zindexPopover:           1010;
+@zindexTooltip:           1030;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+
+
+// Sprite icons path
+// -------------------------
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
+
+
+// Input placeholder text color
+// -------------------------
+@placeholderText:         @grayLight;
+
+
+// Hr border color
+// -------------------------
+@hrBorder:                darken(@grayDarker, 5%);
+
+
+// Horizontal forms & lists
+// -------------------------
+@horizontalComponentOffset:       180px;
+
+
+// Wells
+// -------------------------
+@wellBackground:                  darken(@grayDarker, 3%);
+
+
+// Navbar
+// -------------------------
+
+@navbarCollapseWidth:             979px;
+@navbarCollapseDesktopWidth:      @navbarCollapseWidth + 1;
+@navbarHeight:                    40px;
+@navbarBackground:                @grayDarker;
+@navbarBackgroundHighlight:       @grayDark;
+@navbarBorder:                    darken(@navbarBackground, 12%);
+
+@navbarText:                      @textColor;
+@navbarLinkColor:                 @textColor;
+@navbarLinkColorHover:            @white;
+@navbarLinkColorActive:           @navbarLinkColorHover;
+@navbarLinkBackgroundHover:       @grayDark;
+@navbarLinkBackgroundActive:      @navbarBackground;
+
+@navbarBrandColor:                @grayLighter;
+
+// Inverted navbar
+@navbarInverseBackground:                darken(@grayDarker, 10%);
+@navbarInverseBackgroundHighlight:       @grayDarker;
+@navbarInverseBorder:                    #252525;
+
+@navbarInverseText:                      @grayLight;
+@navbarInverseLinkColor:                 @grayLight;
+@navbarInverseLinkColorHover:            @white;
+@navbarInverseLinkColorActive:           @navbarInverseLinkColorHover;
+@navbarInverseLinkBackgroundHover:       transparent;
+@navbarInverseLinkBackgroundActive:      @navbarInverseBackground;
+
+@navbarInverseSearchBackground:          lighten(@navbarInverseBackground, 25%);
+@navbarInverseSearchBackgroundFocus:     @white;
+@navbarInverseSearchBorder:              @navbarInverseBackground;
+@navbarInverseSearchPlaceholderColor:    #ccc;
+
+@navbarInverseBrandColor:                @navbarInverseLinkColor;
+
+
+// Pagination
+// -------------------------
+@paginationBackground:                #fff;
+@paginationBorder:                    #ddd;
+@paginationActiveBackground:          #f5f5f5;
+
+
+// Hero unit
+// -------------------------
+@heroUnitBackground:              darken(@grayDarker, 3%);
+@heroUnitHeadingColor:            inherit;
+@heroUnitLeadColor:               inherit;
+
+
+// Form states and alerts
+// -------------------------
+@warningText:             #c09853;
+@warningBackground:       #fcf8e3;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
+
+@errorText:               #b94a48;
+@errorBackground:         #f2dede;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
+
+@successText:             #468847;
+@successBackground:       #dff0d8;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
+
+@infoText:                #3a87ad;
+@infoBackground:          #d9edf7;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+
+// Tooltips and popovers
+// -------------------------
+@tooltipColor:            #fff;
+@tooltipBackground:       @dropdownBackground;
+@tooltipArrowWidth:       5px;
+@tooltipArrowColor:       @tooltipBackground;
+
+@popoverBackground:       @dropdownBackground;
+@popoverArrowWidth:       10px;
+@popoverArrowColor:       @dropdownBackground;
+@popoverTitleBackground:  lighten(@popoverBackground, 3%);
+
+// Special enhancement for popovers
+@popoverArrowOuterWidth:  @popoverArrowWidth + 1;
+@popoverArrowOuterColor:  rgba(0,0,0,.25);
+
+
+
+// GRID
+// --------------------------------------------------
+
+
+// Default 940px grid
+// -------------------------
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         10px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
+
+// 1200px min
+@gridColumnWidth1200:     70px;
+@gridGutterWidth1200:     10px;
+@gridRowWidth1200:        (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
+
+// 768px-979px
+@gridColumnWidth768:      42px;
+@gridGutterWidth768:      10px;
+@gridRowWidth768:         (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
+
+
+// Fluid grid
+// -------------------------
+@fluidGridColumnWidth:    percentage(@gridColumnWidth/@gridRowWidth);
+@gridGutterWidth:         10px;
+//@fluidGridGutterWidth:    percentage(@gridGutterWidth/@gridRowWidth);
+
+// 1200px min
+@fluidGridColumnWidth1200:    percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@gridGutterWidth:             10px;
+//@fluidGridGutterWidth1200:     percentage(@gridGutterWidth1200/@gridRowWidth1200);
+
+// 768px-979px
+@fluidGridColumnWidth768:   percentage(@gridColumnWidth768/@gridRowWidth768);
+@gridGutterWidth:           10px;
+//@fluidGridGutterWidth768:      percentage(@gridGutterWidth768/@gridRowWidth768);

+ 25 - 27
src/vendor/bootstrap/less/bootswatch.dark.less

@@ -12,9 +12,7 @@ label, input, button, select, textarea,
 	color: @gray;
 }
 
-code, pre {
-	background-color: @grayLighter;
-}
+
 
 blockquote {
 	border-left: 5px solid @grayDark;
@@ -35,7 +33,8 @@ body {
 	min-height: 100%;
 	//#gradient > .vertical (@bodyBackground, #252A30);
 	//background: @bodyBackground;
-	background: @bodyBackground url('../img/cubes.png') repeat right top;
+	background: @bodyBackground;
+	// url('../img/cubes.png') repeat right top;
 }
 
 .page-header {
@@ -163,6 +162,11 @@ hr {
 	}
 }
 
+.dropdown-menu {
+	.border-radius(0);
+}
+
+
 div.subnav {
 
 	margin: 0 1px;
@@ -463,13 +467,6 @@ legend, label {
 	}
 }
 
-// DROPDOWNS
-// -----------------------------------------------------
-
-.dropdown-menu {
-	.box-shadow(0 2px 4px rgba(0, 0, 0, 0.8));
-}
-
 // ALERTS, LABELS, BADGES
 // -----------------------------------------------------
 
@@ -492,6 +489,11 @@ legend, label {
 	color: @grayLighter;
 }
 
+.badge {
+	border-radius: 0;
+	font-weight: 200;
+}
+
 .label, .alert { background-color: darken(@gray, 20%); }
 
 .label:hover { background-color: darken(@gray, 30%); }
@@ -518,7 +520,7 @@ legend, label {
 // -----------------------------------------------------
 
 .well, .hero-unit {
-	.border-radius(1px);
+	.border-radius(0px);
 }
 
 .well, .hero-unit {
@@ -549,27 +551,23 @@ legend, label {
 .modal-footer {
 	background-color: @grayDark;
 	border-top: 1px solid @grayDark;
-	.border-radius(0 0 6px 6px);
+	.border-radius(0 0 0px 0px);
 	.box-shadow(none);
 }
 
+.popover {
+	.border-radius(0);
+
+	&-title {
+		border-bottom: none;
+		color: @white;
+	}
+
+}
+
 .footer {
 	border-top: 1px solid @grayDark;
 }
 
 // MEDIA QUERIES
 // -----------------------------------------------------
-
-@media (max-width: 768px) {
-	div.subnav .nav > li + li > a,
-	div.subnav .nav > li:first-child > a {
-		border-top: 1px solid @grayDark;
-		border-left: 1px solid @grayDark;
-	}
-
-	.subnav .nav > li + li > a:hover,
-	.subnav .nav > li:first-child > a:hover {
-			border-bottom: 0;
-			background-color: @blue;
-	}
-}

+ 4 - 25
src/vendor/bootstrap/less/bootswatch.light.less

@@ -8,7 +8,8 @@
 
 body {
 	font-weight: 300;
-	background: @bodyBackground url('../img/light.png') repeat right top;
+	background: @bodyBackground;
+	//url('../img/light.png') repeat right top;
 }
 
 h1 {
@@ -507,6 +508,7 @@ legend {
 	.border-radius(0);
 	font-weight: 300;
 	text-shadow: none;
+	color: @black;
 
 	&-success {
 		background-color: @green;
@@ -555,32 +557,9 @@ a.thumbnail {
 }
 
 .progress {
-	height: 6px;
-	.border-radius(0);
-	.box-shadow(none);
 	background-color: @grayLighter;
 	background-image: none;
-
-	.bar {
-		//background-color: @blue;
-		background-image: none;
-	}
-
-	&-info {
-		background-color: @purple;
-	}
-
-	&-success {
-		background-color: @green;
-	}
-
-	&-warning {
-		background-color: @orange;
-	}
-
-	&-danger {
-		background-color: @red;
-	}
+	.border-radius(0);
 }
 
 .modal {

+ 23 - 18
src/vendor/bootstrap/less/overrides.less

@@ -1,3 +1,11 @@
+// Containers
+// ---------------------
+.container-fluid {
+  padding-left: 0px;
+  padding-right: 0px;
+}
+
+
 // Backgrounds
 // ---------------------
 
@@ -40,13 +48,17 @@
 
 }
 
+code, pre {
+  background-color: @grayLighter;
+}
+
 // KIBANA
 .panelCont {
   padding: 0px 10px 10px 10px;
   background: @kibanaPanelBackground;
-  box-shadow: 0px 0px 8px rgba(30, 30, 30, 0.75);
+  //box-shadow: 0px 0px 8px rgba(30, 30, 30, 0.75);
   margin: 0px;
-  .border-radius(1);
+  border: 1px solid rgba(100, 100, 100, 0.25);
 }
 
 div.editor-row {
@@ -125,8 +137,6 @@ form input.ng-invalid {
 
 .navbar-inner {
   border-width: 0 0 0px;
-  padding-left: 0px;
-  padding-right: 0px;
 }
 
 .kibana-row {
@@ -150,6 +160,7 @@ form input.ng-invalid {
 }
 
 .row-text {
+  white-space: nowrap;
   text-transform: uppercase;
   font-weight: bold;
   font-size: 0.9em;
@@ -169,10 +180,6 @@ form input.ng-invalid {
   padding: 5px 25px 5px 25px;
 }
 
-.shadow {
-  box-shadow: 0px 0px 8px rgba(50, 50, 50, 0.75);
-}
-
 .top-row-close {
   padding: 5px 10px;
   text-transform: uppercase;
@@ -182,17 +189,14 @@ form input.ng-invalid {
   line-height: 16px;
 }
 
-.nav-shadow {
-  box-shadow: 0 4px 2px -2px rgba(50, 50, 50, 0.75);
-  border-bottom: 1px solid lighten(@navbarBackground,20%);
-}
-
 .row-open {
-  text-align: right;
-  left:-32px;
+  left:-34px;
   position: absolute;
-  font-weight: 200;
-  box-shadow: 0px 0px 8px rgba(50, 50, 50, 0.75);
+  z-index: 100;
+}
+
+.row-open:hover {
+  left:-12px;
 }
 
 .odd {
@@ -340,10 +344,11 @@ div.flot-text {
   padding:3px 0px 3px 0px;
   width:100%;
   padding-left:20px;
+  color: @white;
 }
 
 .panel-error {
-  color: @textColor;
+  color: @white;
   padding: 3px 10px 0px 10px;
 }
 

+ 18 - 18
src/vendor/bootstrap/less/variables.dark.less

@@ -7,7 +7,7 @@
 @black:                 #000;
 @gray:                  #bbb;
 @grayDark:              #333;
-@grayDarker:            #090909;
+@grayDarker:            #1f1f1f;
 
 @grayLight:             #ADAFAE;
 @grayLighter:           #eee;
@@ -32,8 +32,8 @@
 
 // Scaffolding
 // -------------------------
-@bodyBackground:        lighten(@grayDark,20%);
-@textColor:             @gray;
+@bodyBackground:        @grayDark;
+@textColor:             @grayLighter;
 
 
 // Links
@@ -84,27 +84,27 @@
 
 // Buttons
 // -------------------------
-@btnBackground:                     @gray;
-@btnBackgroundHighlight:            darken(@gray, 2%);
-@btnBorder:                         rgba(0, 0, 0, 0);
+@btnBackground:                     @grayLight;
+@btnBackgroundHighlight:            darken(@grayLight, 15%);
+@btnBorder:                         #bbb;
 
-@btnPrimaryBackground:              @blueDark;
-@btnPrimaryBackgroundHighlight:     darken(@blueDark, 10%);
+@btnPrimaryBackground:              lighten(@blue, 5%);
+@btnPrimaryBackgroundHighlight:     darken(@blue, 5%);
 
-@btnInfoBackground:                 darken(@gray, 40%);
-@btnInfoBackgroundHighlight:        darken(@gray, 50%);
+@btnInfoBackground:                 lighten(@purple, 5%);
+@btnInfoBackgroundHighlight:        darken(@purple, 5%);
 
-@btnSuccessBackground:              lighten(@green, 10%);
-@btnSuccessBackgroundHighlight:     @green;
+@btnSuccessBackground:              lighten(@green, 5%);
+@btnSuccessBackgroundHighlight:     darken(@green, 5%);
 
-@btnWarningBackground:              lighten(@orange, 15%);
-@btnWarningBackgroundHighlight:     @orange;
+@btnWarningBackground:              lighten(@orange, 5%);
+@btnWarningBackgroundHighlight:     darken(@orange, 5%);
 
-@btnDangerBackground:               lighten(@red, 10%);
-@btnDangerBackgroundHighlight:      @red;
+@btnDangerBackground:               lighten(@red, 5%);
+@btnDangerBackgroundHighlight:      darken(@red, 5%);
 
-@btnInverseBackground:              lighten(@purple, 5%);
-@btnInverseBackgroundHighlight:     @purple;
+@btnInverseBackground:              lighten(@black, 5%);
+@btnInverseBackgroundHighlight:     darken(@black, 5%);
 
 
 

+ 8 - 8
src/vendor/bootstrap/less/variables.light.less

@@ -35,7 +35,7 @@
 
 // Scaffolding
 // -------------------------
-@bodyBackground:        @white;
+@bodyBackground:        @grayLighter;
 @textColor:             #555;
 
 
@@ -233,19 +233,19 @@
 
 // Form states and alerts
 // -------------------------
-@warningText:             @white;
+@warningText:             lighten(@orange, 10%);
 @warningBackground:       @orange;
 @warningBorder:           transparent;
 
-@errorText:               @white;
+@errorText:               lighten(@red, 10%);
 @errorBackground:         @red;
 @errorBorder:             transparent;
 
-@successText:             @white;
+@successText:             lighten(@green, 10%);
 @successBackground:       @green;
 @successBorder:           transparent;
 
-@infoText:                @white;
+@infoText:                lighten(@purple,10%);
 @infoBackground:          @purple;
 @infoBorder:              transparent;
 
@@ -257,10 +257,10 @@
 @tooltipArrowWidth:       5px;
 @tooltipArrowColor:       @tooltipBackground;
 
-@popoverBackground:       @bodyBackground;
+@popoverBackground:       @white;
 @popoverArrowWidth:       15px;
-@popoverArrowColor:       @bodyBackground;
-@popoverTitleBackground:  @bodyBackground;
+@popoverArrowColor:       @white;
+@popoverTitleBackground:  @white;
 
 // Special enhancement for popovers
 @popoverArrowOuterWidth:  @popoverArrowWidth + 1;

Некоторые файлы не были показаны из-за большого количества измененных файлов