kibana-sinatra 0.0.7 → 0.0.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (99) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/kibana-sinatra.gemspec +1 -0
  4. data/lib/kibana/assets/app/app.js +8 -3
  5. data/lib/kibana/assets/app/components/kbn.js +45 -10
  6. data/lib/kibana/assets/app/components/{underscore.extended.js → lodash.extended.js} +2 -4
  7. data/lib/kibana/assets/app/components/require.config.js +5 -6
  8. data/lib/kibana/assets/app/components/settings.js +1 -1
  9. data/lib/kibana/assets/app/controllers/dash.js +10 -5
  10. data/lib/kibana/assets/app/controllers/dashLoader.js +1 -1
  11. data/lib/kibana/assets/app/controllers/pulldown.js +1 -1
  12. data/lib/kibana/assets/app/controllers/row.js +1 -1
  13. data/lib/kibana/assets/app/dashboards/default.json +1 -1
  14. data/lib/kibana/assets/app/dashboards/logstash.js +4 -4
  15. data/lib/kibana/assets/app/dashboards/logstash.json +1 -1
  16. data/lib/kibana/assets/app/directives/addPanel.js +1 -1
  17. data/lib/kibana/assets/app/directives/arrayJoin.js +1 -1
  18. data/lib/kibana/assets/app/directives/configModal.js +23 -5
  19. data/lib/kibana/assets/app/directives/kibanaPanel.js +70 -50
  20. data/lib/kibana/assets/app/directives/kibanaSimplePanel.js +1 -1
  21. data/lib/kibana/assets/app/factories/store.js +59 -0
  22. data/lib/kibana/assets/app/filters/all.js +6 -13
  23. data/lib/kibana/assets/app/panels/bettermap/module.html +5 -0
  24. data/lib/kibana/assets/app/panels/bettermap/module.js +1 -1
  25. data/lib/kibana/assets/app/panels/column/editor.html +1 -1
  26. data/lib/kibana/assets/app/panels/column/module.js +7 -6
  27. data/lib/kibana/assets/app/panels/dashcontrol/module.js +1 -1
  28. data/lib/kibana/assets/app/panels/derivequeries/module.js +1 -1
  29. data/lib/kibana/assets/app/panels/fields/module.js +1 -1
  30. data/lib/kibana/assets/app/panels/filtering/module.html +10 -17
  31. data/lib/kibana/assets/app/panels/filtering/module.js +19 -1
  32. data/lib/kibana/assets/app/panels/histogram/module.html +4 -4
  33. data/lib/kibana/assets/app/panels/histogram/module.js +62 -12
  34. data/lib/kibana/assets/app/panels/histogram/timeSeries.js +6 -3
  35. data/lib/kibana/assets/app/panels/hits/module.js +1 -1
  36. data/lib/kibana/assets/app/panels/map/module.js +1 -1
  37. data/lib/kibana/assets/app/panels/pie/editor.html +1 -1
  38. data/lib/kibana/assets/app/panels/pie/module.js +1 -1
  39. data/lib/kibana/assets/app/panels/query/meta.html +1 -1
  40. data/lib/kibana/assets/app/panels/query/module.html +1 -1
  41. data/lib/kibana/assets/app/panels/query/module.js +2 -7
  42. data/lib/kibana/assets/app/panels/query/query.css +9 -7
  43. data/lib/kibana/assets/app/panels/sparklines/module.js +2 -2
  44. data/lib/kibana/assets/app/panels/sparklines/timeSeries.js +3 -3
  45. data/lib/kibana/assets/app/panels/stats/editor.html +36 -0
  46. data/lib/kibana/assets/app/panels/stats/module.html +15 -0
  47. data/lib/kibana/assets/app/panels/stats/module.js +199 -0
  48. data/lib/kibana/assets/app/panels/table/editor.html +23 -27
  49. data/lib/kibana/assets/app/panels/table/micropanel.html +3 -1
  50. data/lib/kibana/assets/app/panels/table/module.js +7 -1
  51. data/lib/kibana/assets/app/panels/terms/editor.html +16 -3
  52. data/lib/kibana/assets/app/panels/terms/module.html +14 -5
  53. data/lib/kibana/assets/app/panels/terms/module.js +66 -18
  54. data/lib/kibana/assets/app/panels/text/module.js +1 -1
  55. data/lib/kibana/assets/app/panels/timepicker/editor.html +14 -12
  56. data/lib/kibana/assets/app/panels/timepicker/module.html +3 -8
  57. data/lib/kibana/assets/app/panels/timepicker/module.js +1 -1
  58. data/lib/kibana/assets/app/panels/trends/module.js +1 -1
  59. data/lib/kibana/assets/app/partials/dashLoader.html +10 -10
  60. data/lib/kibana/assets/app/partials/dashboard.html +35 -44
  61. data/lib/kibana/assets/app/partials/dasheditor.html +7 -5
  62. data/lib/kibana/assets/app/partials/paneleditor.html +2 -1
  63. data/lib/kibana/assets/app/partials/panelgeneral.html +1 -1
  64. data/lib/kibana/assets/app/partials/roweditor.html +11 -9
  65. data/lib/kibana/assets/app/services/alertSrv.js +1 -1
  66. data/lib/kibana/assets/app/services/dashboard.js +27 -14
  67. data/lib/kibana/assets/app/services/esVersion.js +70 -31
  68. data/lib/kibana/assets/app/services/fields.js +14 -37
  69. data/lib/kibana/assets/app/services/filterSrv.js +7 -11
  70. data/lib/kibana/assets/app/services/kbnIndex.js +24 -15
  71. data/lib/kibana/assets/app/services/panelMove.js +1 -1
  72. data/lib/kibana/assets/app/services/querySrv.js +20 -6
  73. data/lib/kibana/assets/app/services/timer.js +1 -1
  74. data/lib/kibana/assets/css/bootstrap.dark.min.css +1 -1
  75. data/lib/kibana/assets/css/bootstrap.light.min.css +1 -1
  76. data/lib/kibana/assets/img/cubes.png +0 -0
  77. data/lib/kibana/assets/img/light.png +0 -0
  78. data/lib/kibana/assets/index.html +3 -2
  79. data/lib/kibana/assets/vendor/LICENSE.json +90 -0
  80. data/lib/kibana/assets/vendor/angular/angular-cookies.js +185 -0
  81. data/lib/kibana/assets/vendor/angular/angular-dragdrop.js +33 -4
  82. data/lib/kibana/assets/vendor/blob.js +178 -0
  83. data/lib/kibana/assets/vendor/bootstrap/bootstrap.js +6 -1
  84. data/lib/kibana/assets/vendor/bootstrap/less/bak/bootswatch.dark.less +555 -0
  85. data/lib/kibana/assets/vendor/bootstrap/less/bak/variables.dark.less +304 -0
  86. data/lib/kibana/assets/vendor/bootstrap/less/bootswatch.dark.less +349 -327
  87. data/lib/kibana/assets/vendor/bootstrap/less/bootswatch.light.less +590 -7
  88. data/lib/kibana/assets/vendor/bootstrap/less/modals.less +1 -1
  89. data/lib/kibana/assets/vendor/bootstrap/less/overrides.less +191 -75
  90. data/lib/kibana/assets/vendor/bootstrap/less/variables.dark.less +96 -97
  91. data/lib/kibana/assets/vendor/bootstrap/less/variables.light.less +84 -81
  92. data/lib/kibana/assets/vendor/jquery/jquery.flot.events.js +39 -51
  93. data/lib/kibana/assets/vendor/lodash.js +6785 -0
  94. data/lib/kibana/assets/vendor/numeral.js +565 -0
  95. data/lib/kibana/sinatra/version.rb +1 -1
  96. data/lib/kibana/views/config.erb +1 -0
  97. data/test/sinatra_test.rb +2 -2
  98. metadata +30 -4
  99. data/lib/kibana/assets/vendor/underscore.js +0 -1246
@@ -53,7 +53,7 @@
53
53
  .modal-body {
54
54
  position: relative;
55
55
  overflow-y: auto;
56
- max-height: 700px;
56
+ //max-height: 700px;
57
57
  padding: 15px;
58
58
  }
59
59
  // Remove bottom margin if need be
@@ -1,6 +1,144 @@
1
+ // Media queries
2
+ // ---------------------
3
+ @media (max-width: 767px) {
4
+ div.panel {
5
+ width: 100% !important;
6
+ padding: 0px !important;
7
+ }
8
+ }
9
+
10
+ // ---------------------
11
+
12
+ // Containers
13
+ // ---------------------
14
+ .container-fluid {
15
+ padding-left: 0px;
16
+ padding-right: 0px;
17
+ }
18
+
19
+ .container.kibana-container {
20
+ padding: 5px 10px;
21
+ width: 100%;
22
+ box-sizing: border-box;
23
+ -moz-box-sizing: border-box;
24
+ }
25
+
26
+ // Backgrounds
27
+ // ---------------------
28
+
29
+ .bgNav {
30
+ background: @navbarBackground;
31
+ }
32
+
33
+ .bgPrimary {
34
+ background: @btnPrimaryBackground;
35
+ color: rgba(255,255,255,.90);
36
+ }
37
+
38
+ .bgInfo {
39
+ background: @btnInfoBackground;
40
+ color: rgba(255,255,255,.90);
41
+
42
+ }
43
+
44
+ .bgSuccess {
45
+ background: @btnSuccessBackground;
46
+ color: rgba(255,255,255,.90);
47
+
48
+ }
49
+
50
+ .bgWarning {
51
+ background: @btnWarningBackground;
52
+ color: rgba(255,255,255,.90);
53
+
54
+ }
55
+
56
+ .bgDanger {
57
+ background: @btnDangerBackground;
58
+ color: rgba(255,255,255,.90);
59
+
60
+ }
61
+
62
+ .bgInverse {
63
+ background: @btnInverseBackground;
64
+ color: rgba(255,255,255,.90);
65
+
66
+ }
67
+
68
+ code, pre {
69
+ background-color: @grayLighter;
70
+ }
71
+
72
+ // --------- Panels ---------
73
+
74
+ .panel {
75
+ display: inline-table;
76
+ vertical-align: top;
77
+ }
78
+
79
+ .panel-container {
80
+ padding: 0px 0px 0px 0px;
81
+ background: @kibanaPanelBackground;
82
+ border: 1px solid rgba(100, 100, 100, 0.50);
83
+ margin: 5px;
84
+ }
85
+
86
+ .panel-content {
87
+ padding: 0px 10px 10px 10px;
88
+ }
89
+
90
+ .panel-title {
91
+ padding-left: 10px;
92
+ border: 0px;
93
+ text-transform: uppercase;
94
+ font-weight: bold;
95
+ }
96
+
97
+ .panel-loading {
98
+ position:absolute;
99
+ top: 0px;
100
+ left: 0px;
101
+ z-index: 800;
102
+ }
103
+
104
+ .panel div.panel-extra div.panel-extra-container {
105
+ margin-right: 0px;
106
+ margin-top: 7px;
107
+ }
108
+
109
+ .panel div.panel-extra {
110
+ font-size: 0.9em;
111
+ margin-bottom: 10px;
112
+ }
113
+
114
+ .panel div.panel-extra .extra {
115
+ float:right !important;
116
+ }
117
+
118
+ .panel-error {
119
+ color: @white;
120
+ padding: 3px 10px 0px 10px;
121
+ }
122
+
123
+ .ui-draggable-dragging {
124
+ display: block;
125
+ z-index: 9999;
126
+ }
127
+
128
+ .dragInProgress .panel-container {
129
+ border: 3px solid rgba(100,100,100,0.50);
130
+ }
131
+
132
+ // ---------------------------
133
+
134
+ .row-add-button {
135
+ margin: 5px;
136
+ }
137
+
1
138
  div.editor-row {
2
139
  vertical-align: top;
3
140
  }
141
+
4
142
  div.editor-row div.section {
5
143
  margin-right: 20px;
6
144
  vertical-align: top;
@@ -73,63 +211,72 @@ form input.ng-invalid {
73
211
 
74
212
  .navbar-inner {
75
213
  border-width: 0 0 0px;
76
- padding-left: 0px;
77
- padding-right: 0px;
78
214
  }
79
215
 
80
216
  .kibana-row {
81
- margin-bottom: 10px;
217
+ margin-bottom: 0px;
218
+ }
219
+
220
+ .row-tab {
221
+ padding: 0px;
222
+ cursor: pointer;
223
+ width: 30px;
224
+ height: 30px;
225
+ line-height: 30px;
226
+ vertical-align: middle;
82
227
  }
83
228
 
84
229
  .row-button {
85
- border-left: 1px solid lighten(@bodyBackground, 10%);
86
- border-right: 1px solid darken(@bodyBackground, 10%);
87
- padding: 2px 7px 0px 7px;
230
+ width: 30px;
231
+ text-align: center;
88
232
  float: left;
233
+ cursor: pointer;
89
234
  }
90
235
 
91
236
  .row-text {
237
+ white-space: nowrap;
92
238
  text-transform: uppercase;
93
239
  font-weight: bold;
94
240
  font-size: 0.9em;
241
+ margin: 0px 10px;
242
+ text-align: left;
95
243
  }
96
244
 
97
245
  .row-close {
98
- outline: 1px solid darken(@bodyBackground, 10%);
99
- border-top: 1px solid lighten(@bodyBackground, 10%);
100
246
  padding: 0px;
101
- margin: 0px;
102
- min-height: 24px !important;
103
- line-height: 24px;
104
- background: darken(@bodyBackground, 3%);
105
- }
106
-
107
- .row-open {
108
- text-align: right;
109
- left:-18px;
110
- position: absolute;
111
- font-size: 13pt;
112
- font-weight: 200;
247
+ margin: 5px;
248
+ min-height: 30px !important;
249
+ line-height: 30px;
250
+ background: @kibanaPanelBackground;
251
+ border: 1px solid rgba(100, 100, 100, 0.50);
113
252
  }
114
253
 
115
254
  .top-row-open {
116
- background: darken(@bodyBackground, 3%);
255
+ background: @navbarBackground;
117
256
  padding: 5px 25px 5px 25px;
118
257
  }
119
258
 
120
259
  .top-row-close {
121
- outline: 1px solid darken(@bodyBackground, 10%);
122
- border-top: 1px solid lighten(@bodyBackground, 10%);
123
- padding: 0px;
124
- margin: 1px 0px 0px 0px;
125
- text-align: center;
260
+ padding: 5px 10px;
261
+ text-transform: uppercase;
262
+ margin: 0px;
263
+ text-align: left;
126
264
  min-height: 16px !important;
127
265
  line-height: 16px;
128
- background: darken(@bodyBackground, 3%);
129
266
  }
130
267
 
131
- .row-open i {
132
- font-size: 10pt;
268
+ .row-open {
269
+ margin-top: 5px;
270
+ left:-30px;
271
+ position: absolute;
272
+ z-index: 100;
273
+ transition: .10s left;
274
+ transition-delay: .10s;
275
+ -webkit-transition-delay: .10s;
276
+ }
277
+
278
+ .row-open:hover {
279
+ left:-10px;
133
280
  }
134
281
 
135
282
  .odd {
@@ -149,43 +296,7 @@ form input.ng-invalid {
149
296
  border-top: 0px;
150
297
  }
151
298
 
152
- .panel-loading {
153
- position:absolute;
154
- top: 0px;
155
- left: 0px;
156
- z-index: 800;
157
- }
158
-
159
- .ui-draggable-dragging {
160
- display: block;
161
- visibility: visible;
162
- opacity: 1;
163
- z-index: 9999;
164
- }
165
-
166
- .panel-title {
167
- border: 0px;
168
- margin-left: -11px;
169
- }
170
-
171
- .panel div.panel-extra div.panel-extra-container {
172
- margin-right: -11px;
173
- }
174
-
175
- .panel div.panel-extra {
176
- font-size: 0.9em;
177
- margin-bottom: 10px;
178
- }
179
-
180
- .panel div.panel-extra .extra {
181
- float:right !important;
182
- border-bottom: 1px solid lighten(@bodyBackground, 5%);
183
- }
184
299
 
185
- .dragInProgress {
186
- background-color: darken(@bodyBackground,1%);
187
- border: 1px solid @tableBorder;
188
- }
189
300
 
190
301
  .link {
191
302
  color: @linkColor;
@@ -196,11 +307,6 @@ form input.ng-invalid {
196
307
  color: @linkColorHover;
197
308
  }
198
309
 
199
-
200
- .pointer:hover {
201
- color: @linkColorHover;
202
- }
203
-
204
310
  .pointer {
205
311
  cursor: pointer;
206
312
  }
@@ -279,14 +385,10 @@ div.flot-text {
279
385
  margin-left:0px;
280
386
  padding:3px 0px 3px 0px;
281
387
  width:100%;
282
- color: @textColor;
283
388
  padding-left:20px;
389
+ color: @white;
284
390
  }
285
391
 
286
- .panel-error {
287
- color: @textColor;
288
- padding: 3px 10px 0px 10px;
289
- }
290
392
 
291
393
  .alert-warning {
292
394
  background-color: @warningBackground;
@@ -294,6 +396,20 @@ div.flot-text {
294
396
  color: @warningText;
295
397
  }
296
398
 
399
+ .dropdown-menu,
400
+ .tooltip-inner,
401
+ .nav-pills > li > a
402
+ {
403
+ -webkit-border-radius: 0 !important;
404
+ -moz-border-radius: 0 !important;
405
+ border-radius: 0 !important;
406
+ }
407
+
408
+ .nav-pills > li.open > a {
409
+ border-color: transparent !important;
410
+ border-color: rgba(51, 181, 229, 0.4) !important;
411
+ }
412
+
297
413
  /* ===================================================
298
414
  * popover-extra-placements.css v0.1
299
415
  * http://twitter.github.com/bootstrap-popover-extra-placements
@@ -1,8 +1,3 @@
1
- // Slate 2.3.2
2
- // Variables
3
- // --------------------------------------------------
4
-
5
-
6
1
  // Global values
7
2
  // --------------------------------------------------
8
3
 
@@ -10,53 +5,58 @@
10
5
  // Grays
11
6
  // -------------------------
12
7
  @black: #000;
13
- @grayDarker: #272B30;
14
- @grayDark: #3A3F44;
15
- @gray: #52575C;
16
- @grayLight: #7A8288;
17
- @grayLighter: #BBBFC2;
8
+ @gray: #bbb;
9
+ @grayDark: #333;
10
+ @grayDarker: #1f1f1f;
11
+
12
+ @grayLight: #ADAFAE;
13
+ @grayLighter: #eee;
18
14
  @white: #fff;
19
15
 
20
16
 
21
17
  // Accent colors
22
18
  // -------------------------
23
- @blue: #5bc0de;
24
- @blueDark: #108CBB;
25
- @green: #62c462;
26
- @red: #ee5f5b;
27
- @yellow: #F6D30D;
28
- @orange: #f89406;
29
- @pink: #c3325f;
30
- @purple: #7a43b6;
19
+ @blue: #33B5E5;
20
+ @blueDark: #0099CC;
21
+ @green: #669900;
22
+ @red: #CC0000;
23
+ @yellow: #ECBB13;
24
+ @orange: #FF8800;
25
+ @pink: #FF4444;
26
+ @purple: #9933CC;
27
+
28
+ // Kibana Variables
29
+ // -------------------------
30
+ @kibanaPanelBackground: @grayDarker;
31
31
 
32
32
 
33
33
  // Scaffolding
34
34
  // -------------------------
35
- @bodyBackground: @grayDarker;
36
- @textColor: #C8C8C8;
35
+ @bodyBackground: @grayDark;
36
+ @textColor: @grayLighter;
37
37
 
38
38
 
39
39
  // Links
40
40
  // -------------------------
41
- @linkColor: @white;
42
- @linkColorHover: @white;
41
+ @linkColor: @blue;
42
+ @linkColorHover: darken(@linkColor, 10%);
43
43
 
44
44
 
45
45
  // Typography
46
46
  // -------------------------
47
47
  @sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
48
48
  @serifFontFamily: Georgia, "Times New Roman", Times, serif;
49
- @monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
49
+ @monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
50
50
 
51
51
  @baseFontSize: 14px;
52
52
  @baseFontFamily: @sansFontFamily;
53
- @baseLineHeight: 21px;
53
+ @baseLineHeight: 20px;
54
54
  @altFontFamily: @serifFontFamily;
55
55
 
56
56
  @headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
57
57
  @headingsFontWeight: bold; // instead of browser default, bold
58
- @headingsColor: inherit; // empty to use BS default, @textColor
59
-
58
+ @headingsColor: @white; // empty to use BS default, @textColor
59
+ @inputText: @black;
60
60
 
61
61
  // Component sizing
62
62
  // -------------------------
@@ -70,66 +70,68 @@
70
70
  @paddingSmall: 2px 10px; // 26px
71
71
  @paddingMini: 0px 6px; // 22px
72
72
 
73
- @baseBorderRadius: 4px;
74
- @borderRadiusLarge: 6px;
75
- @borderRadiusSmall: 3px;
73
+ @baseBorderRadius: 3px;
74
+ @borderRadiusLarge: 4px;
75
+ @borderRadiusSmall: 2px;
76
76
 
77
77
 
78
78
  // Tables
79
79
  // -------------------------
80
80
  @tableBackground: transparent; // overall background-color
81
- @tableBackgroundAccent: darken(@grayDark, 5%); // for striping
81
+ @tableBackgroundAccent: rgba(100, 100, 100, 0.3); // for striping
82
82
  @tableBackgroundHover: @grayDark; // for hover
83
- @tableBorder: lighten(@grayDark, 2%); // table and cell border
83
+ @tableBorder: @grayDark; // table and cell border
84
84
 
85
85
  // Buttons
86
86
  // -------------------------
87
- @btnBackground: @gray;
88
- @btnBackgroundHighlight: darken(@gray, 10%);
89
- @btnBorder: darken(@gray, 20%);
87
+ @btnBackground: @grayLight;
88
+ @btnBackgroundHighlight: darken(@grayLight, 15%);
89
+ @btnBorder: #bbb;
90
90
 
91
- @btnPrimaryBackground: @grayLight;
92
- @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
91
+ @btnPrimaryBackground: lighten(@blue, 5%);
92
+ @btnPrimaryBackgroundHighlight: darken(@blue, 5%);
93
93
 
94
- @btnInfoBackground: @blue;
95
- @btnInfoBackgroundHighlight: #2f96b4;
94
+ @btnInfoBackground: lighten(@purple, 5%);
95
+ @btnInfoBackgroundHighlight: darken(@purple, 5%);
96
96
 
97
- @btnSuccessBackground: @green;
98
- @btnSuccessBackgroundHighlight: #51a351;
97
+ @btnSuccessBackground: lighten(@green, 5%);
98
+ @btnSuccessBackgroundHighlight: darken(@green, 5%);
99
+
100
+ @btnWarningBackground: lighten(@orange, 5%);
101
+ @btnWarningBackgroundHighlight: darken(@orange, 5%);
102
+
103
+ @btnDangerBackground: lighten(@red, 5%);
104
+ @btnDangerBackgroundHighlight: darken(@red, 5%);
105
+
106
+ @btnInverseBackground: lighten(@black, 5%);
107
+ @btnInverseBackgroundHighlight: darken(@black, 5%);
99
108
 
100
- @btnWarningBackground: lighten(@orange, 15%);
101
- @btnWarningBackgroundHighlight: @orange;
102
109
 
103
- @btnDangerBackground: @red;
104
- @btnDangerBackgroundHighlight: #bd362f;
105
110
 
106
- @btnInverseBackground: @gray;
107
- @btnInverseBackgroundHighlight: @grayDarker;
108
111
 
109
112
  // Forms
110
113
  // -------------------------
111
- @inputText: @white;
112
- @inputBackground: @gray;
113
- @inputBorder: @grayLight;
114
+ @inputBackground: lighten(@grayDark,10%);
115
+ @inputBorder: lighten(@grayDark,20%);
114
116
  @inputBorderRadius: @baseBorderRadius;
115
- @inputDisabledBackground: @grayLighter;
116
- @formActionsBackground: darken(@grayDarker, 3%);
117
+ @inputDisabledBackground: #555;
118
+ @formActionsBackground: transparent;
117
119
  @inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
118
120
 
119
121
 
120
122
  // Dropdowns
121
123
  // -------------------------
122
- @dropdownBackground: @grayDark;
124
+ @dropdownBackground: @heroUnitBackground;
123
125
  @dropdownBorder: rgba(0,0,0,.2);
124
126
  @dropdownDividerTop: transparent;
125
- @dropdownDividerBottom: darken(@grayDarker, 5%);
127
+ @dropdownDividerBottom: #222;
126
128
 
127
- @dropdownLinkColor: @grayLight;
129
+ @dropdownLinkColor: @textColor;
128
130
  @dropdownLinkColorHover: @white;
129
131
  @dropdownLinkColorActive: @white;
130
132
 
131
- @dropdownLinkBackgroundActive: @grayDarker;
132
- @dropdownLinkBackgroundHover: @grayDarker;
133
+ @dropdownLinkBackgroundActive: @linkColor;
134
+ @dropdownLinkBackgroundHover: @blue;
133
135
 
134
136
 
135
137
 
@@ -143,7 +145,7 @@
143
145
  // Try to avoid customizing these :)
144
146
  @zindexDropdown: 1000;
145
147
  @zindexPopover: 1010;
146
- @zindexTooltip: 1030;
148
+ @zindexTooltip: 1020;
147
149
  @zindexFixedNavbar: 1030;
148
150
  @zindexModalBackdrop: 1040;
149
151
  @zindexModal: 1050;
@@ -162,7 +164,7 @@
162
164
 
163
165
  // Hr border color
164
166
  // -------------------------
165
- @hrBorder: darken(@grayDarker, 5%);
167
+ @hrBorder: @grayDark;
166
168
 
167
169
 
168
170
  // Horizontal forms & lists
@@ -172,58 +174,58 @@
172
174
 
173
175
  // Wells
174
176
  // -------------------------
175
- @wellBackground: darken(@grayDarker, 3%);
177
+ @wellBackground: #131517;
176
178
 
177
179
 
178
180
  // Navbar
179
181
  // -------------------------
180
-
181
182
  @navbarCollapseWidth: 979px;
182
183
  @navbarCollapseDesktopWidth: @navbarCollapseWidth + 1;
183
- @navbarHeight: 40px;
184
+
185
+ @navbarHeight: 50px;
186
+ @navbarBackgroundHighlight: @grayDarker;
184
187
  @navbarBackground: @grayDarker;
185
- @navbarBackgroundHighlight: @grayDark;
186
188
  @navbarBorder: darken(@navbarBackground, 12%);
187
189
 
188
- @navbarText: @textColor;
189
- @navbarLinkColor: @textColor;
190
+ @navbarText: @grayLight;
191
+ @navbarLinkColor: @grayLight;
190
192
  @navbarLinkColorHover: @white;
191
193
  @navbarLinkColorActive: @navbarLinkColorHover;
192
- @navbarLinkBackgroundHover: @grayDark;
194
+ @navbarLinkBackgroundHover: transparent;
193
195
  @navbarLinkBackgroundActive: @navbarBackground;
194
196
 
195
- @navbarBrandColor: @grayLighter;
197
+ @navbarBrandColor: @navbarLinkColor;
196
198
 
197
199
  // Inverted navbar
198
- @navbarInverseBackground: darken(@grayDarker, 10%);
199
- @navbarInverseBackgroundHighlight: @grayDarker;
200
- @navbarInverseBorder: #252525;
200
+ @navbarInverseBackground: #252A30;
201
+ @navbarInverseBackgroundHighlight: #252A30;
202
+ @navbarInverseBorder: transparent;
201
203
 
202
204
  @navbarInverseText: @grayLight;
203
205
  @navbarInverseLinkColor: @grayLight;
204
206
  @navbarInverseLinkColorHover: @white;
205
207
  @navbarInverseLinkColorActive: @navbarInverseLinkColorHover;
206
- @navbarInverseLinkBackgroundHover: transparent;
207
- @navbarInverseLinkBackgroundActive: @navbarInverseBackground;
208
+ @navbarInverseLinkBackgroundHover: #242A31;
209
+ @navbarInverseLinkBackgroundActive: @navbarInverseLinkBackgroundHover;
208
210
 
209
211
  @navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%);
210
212
  @navbarInverseSearchBackgroundFocus: @white;
211
213
  @navbarInverseSearchBorder: @navbarInverseBackground;
212
- @navbarInverseSearchPlaceholderColor: #ccc;
214
+ @navbarInverseSearchPlaceholderColor: @white;
213
215
 
214
216
  @navbarInverseBrandColor: @navbarInverseLinkColor;
215
217
 
216
218
 
217
219
  // Pagination
218
220
  // -------------------------
219
- @paginationBackground: #fff;
220
- @paginationBorder: #ddd;
221
- @paginationActiveBackground: #f5f5f5;
221
+ @paginationBackground: @bodyBackground;
222
+ @paginationBorder: transparent;
223
+ @paginationActiveBackground: @blue;
222
224
 
223
225
 
224
226
  // Hero unit
225
227
  // -------------------------
226
- @heroUnitBackground: darken(@grayDarker, 3%);
228
+ @heroUnitBackground: @grayDark;
227
229
  @heroUnitHeadingColor: inherit;
228
230
  @heroUnitLeadColor: inherit;
229
231
 
@@ -231,33 +233,33 @@
231
233
  // Form states and alerts
232
234
  // -------------------------
233
235
  @warningText: #c09853;
234
- @warningBackground: #fcf8e3;
235
- @warningBorder: darken(spin(@warningBackground, -10), 3%);
236
+ @warningBackground: @grayLighter;
237
+ @warningBorder: transparent;
236
238
 
237
239
  @errorText: #b94a48;
238
- @errorBackground: #f2dede;
240
+ @errorBackground: @grayLighter;
239
241
  @errorBorder: darken(spin(@errorBackground, -10), 3%);
240
242
 
241
243
  @successText: #468847;
242
- @successBackground: #dff0d8;
244
+ @successBackground: @grayLighter;
243
245
  @successBorder: darken(spin(@successBackground, -10), 5%);
244
246
 
245
- @infoText: #3a87ad;
246
- @infoBackground: #d9edf7;
247
+ @infoText: @blueDark;
248
+ @infoBackground: @grayLighter;
247
249
  @infoBorder: darken(spin(@infoBackground, -10), 7%);
248
250
 
249
251
 
250
252
  // Tooltips and popovers
251
253
  // -------------------------
252
254
  @tooltipColor: #fff;
253
- @tooltipBackground: @dropdownBackground;
255
+ @tooltipBackground: @heroUnitBackground;
254
256
  @tooltipArrowWidth: 5px;
255
257
  @tooltipArrowColor: @tooltipBackground;
256
258
 
257
- @popoverBackground: @dropdownBackground;
259
+ @popoverBackground: @heroUnitBackground;
258
260
  @popoverArrowWidth: 10px;
259
- @popoverArrowColor: @dropdownBackground;
260
- @popoverTitleBackground: lighten(@popoverBackground, 3%);
261
+ @popoverArrowColor: @popoverBackground;
262
+ @popoverTitleBackground: @popoverBackground;
261
263
 
262
264
  // Special enhancement for popovers
263
265
  @popoverArrowOuterWidth: @popoverArrowWidth + 1;
@@ -273,32 +275,29 @@
273
275
  // -------------------------
274
276
  @gridColumns: 12;
275
277
  @gridColumnWidth: 60px;
276
- @gridGutterWidth: 10px;
278
+ @gridGutterWidth: 20px;
277
279
  @gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
278
280
 
279
281
  // 1200px min
280
282
  @gridColumnWidth1200: 70px;
281
- @gridGutterWidth1200: 10px;
283
+ @gridGutterWidth1200: 30px;
282
284
  @gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
283
285
 
284
286
  // 768px-979px
285
287
  @gridColumnWidth768: 42px;
286
- @gridGutterWidth768: 10px;
288
+ @gridGutterWidth768: 20px;
287
289
  @gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
288
290
 
289
291
 
290
292
  // Fluid grid
291
293
  // -------------------------
292
294
  @fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
293
- @gridGutterWidth: 10px;
294
- //@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
295
+ @fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
295
296
 
296
297
  // 1200px min
297
- @fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
298
- @gridGutterWidth: 10px;
299
- //@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
298
+ @fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
299
+ @fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
300
300
 
301
301
  // 768px-979px
302
- @fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
303
- @gridGutterWidth: 10px;
304
- //@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
302
+ @fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
303
+ @fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);