Merge lp:~james-page/horizon/theme-refresh-perms-fix into lp:~ubuntu-server-dev/horizon/havana

Proposed by James Page on 2013-10-04
Status: Merged
Approved by: Chuck Short on 2013-10-04
Approved revision: 177
Merged at revision: 177
Proposed branch: lp:~james-page/horizon/theme-refresh-perms-fix
Merge into: lp:~ubuntu-server-dev/horizon/havana
Diff against target: 5241 lines (+1812/-1303)
3 files modified
debian/changelog (+10/-0)
debian/openstack-dashboard.postinst (+2/-2)
debian/theme/css/ubuntu.css (+1800/-1301)
To merge this branch: bzr merge lp:~james-page/horizon/theme-refresh-perms-fix
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2013-10-04 Pending
Review via email: mp+189314@code.launchpad.net

Description of the change

Ubuntu Theme Refresh

Fixup for incorrectly set permissions on /var/lib/openstack-dashboard (charm issue - will be resolved there as well).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-03 12:48:45 +0000
3+++ debian/changelog 2013-10-04 13:48:05 +0000
4@@ -1,3 +1,13 @@
5+horizon (1:2013.2~rc1-0ubuntu2) saucy; urgency=low
6+
7+ * d/theme/css/ubuntu.css: Refresh Ubuntu theme against new Havana
8+ stylesheets, fixing network and chart layouts (LP: #1235249).
9+ * d/openstack-dashboard.postinst: Allow horizon user to read and
10+ write data in /var/lib/openstack-dashboard inline with user and
11+ group permissions set in Apache configuration.
12+
13+ -- James Page <james.page@ubuntu.com> Fri, 04 Oct 2013 14:17:43 +0100
14+
15 horizon (1:2013.2~rc1-0ubuntu1) saucy; urgency=low
16
17 [ James Page ]
18
19=== modified file 'debian/openstack-dashboard.postinst'
20--- debian/openstack-dashboard.postinst 2013-10-02 09:46:14 +0000
21+++ debian/openstack-dashboard.postinst 2013-10-04 13:48:05 +0000
22@@ -52,11 +52,11 @@
23 if [ -d /var/lib/openstack-dashboard ] ; then
24 # Generated secret storage for single node use - see local_settings.py
25 # for more details of SECRET_KEY
26- chown root:www-data /var/lib/openstack-dashboard
27- chmod 0770 /var/lib/openstack-dashboard
28+ chmod 0700 /var/lib/openstack-dashboard
29 if [ -f /etc/openstack-dashboard/secret_key ]; then
30 mv /etc/openstack-dashboard/secret_key /var/lib/openstack-dashboard
31 fi
32+ chown -R horizon:horizon /var/lib/openstack-dashboard
33 fi
34 fi
35
36
37=== modified file 'debian/theme/css/ubuntu.css'
38--- debian/theme/css/ubuntu.css 2013-04-22 13:09:18 +0000
39+++ debian/theme/css/ubuntu.css 2013-10-04 13:48:05 +0000
40@@ -1,12 +1,3 @@
41-/*!
42- * Bootstrap v2.0.1
43- *
44- * Copyright 2012 Twitter, Inc
45- * Licensed under the Apache License v2.0
46- * http://www.apache.org/licenses/LICENSE-2.0
47- *
48- * Designed and built with all the love in the world @twitter by @mdo and @fat.
49- */
50 article,
51 aside,
52 details,
53@@ -19,9 +10,7 @@
54 section {
55 display: block;
56 }
57-audio,
58-canvas,
59-video {
60+audio, canvas, video {
61 display: inline-block;
62 *display: inline;
63 *zoom: 1;
64@@ -35,16 +24,14 @@
65 -ms-text-size-adjust: 100%;
66 }
67 a:focus {
68- outline: thin dotted #333;
69+ outline: thin dotted #333333;
70 outline: 5px auto -webkit-focus-ring-color;
71 outline-offset: -2px;
72 }
73-a:hover,
74-a:active {
75+a:hover, a:active {
76 outline: 0;
77 }
78-sub,
79-sup {
80+sub, sup {
81 position: relative;
82 font-size: 75%;
83 line-height: 0;
84@@ -62,28 +49,20 @@
85 border: 0;
86 -ms-interpolation-mode: bicubic;
87 }
88-button,
89-input,
90-select,
91-textarea {
92+button, input, select, textarea {
93 margin: 0;
94 font-size: 100%;
95 vertical-align: middle;
96 }
97-button,
98-input {
99+button, input {
100 *overflow: visible;
101 line-height: normal;
102 }
103-button::-moz-focus-inner,
104-input::-moz-focus-inner {
105+button::-moz-focus-inner, input::-moz-focus-inner {
106 padding: 0;
107 border: 0;
108 }
109-button,
110-input[type="button"],
111-input[type="reset"],
112-input[type="submit"] {
113+button, input[type="button"], input[type="reset"], input[type="submit"] {
114 cursor: pointer;
115 -webkit-appearance: button;
116 }
117@@ -104,8 +83,7 @@
118 .clearfix {
119 *zoom: 1;
120 }
121-.clearfix:before,
122-.clearfix:after {
123+.clearfix:before, .clearfix:after {
124 display: table;
125 content: "";
126 }
127@@ -132,8 +110,7 @@
128 margin-left: -20px;
129 *zoom: 1;
130 }
131-.row:before,
132-.row:after {
133+.row:before, .row:after {
134 display: table;
135 content: "";
136 }
137@@ -177,8 +154,7 @@
138 .span11 {
139 width: 860px;
140 }
141-.span12,
142-.container {
143+.span12, .container {
144 width: 940px;
145 }
146 .offset1 {
147@@ -218,8 +194,7 @@
148 width: 100%;
149 *zoom: 1;
150 }
151-.row-fluid:before,
152-.row-fluid:after {
153+.row-fluid:before, .row-fluid:after {
154 display: table;
155 content: "";
156 }
157@@ -249,25 +224,25 @@
158 width: 40.425531911%;
159 }
160 .row-fluid > .span6 {
161- width: 48.93617020799999%;
162+ width: 48.936170208%;
163 }
164 .row-fluid > .span7 {
165 width: 57.446808505%;
166 }
167 .row-fluid > .span8 {
168- width: 65.95744680199999%;
169+ width: 65.957446802%;
170 }
171 .row-fluid > .span9 {
172 width: 74.468085099%;
173 }
174 .row-fluid > .span10 {
175- width: 82.97872339599999%;
176+ width: 82.978723396%;
177 }
178 .row-fluid > .span11 {
179 width: 91.489361693%;
180 }
181 .row-fluid > .span12 {
182- width: 99.99999998999999%;
183+ width: 99.99999999%;
184 }
185 .container {
186 width: 940px;
187@@ -275,8 +250,7 @@
188 margin-right: auto;
189 *zoom: 1;
190 }
191-.container:before,
192-.container:after {
193+.container:before, .container:after {
194 display: table;
195 content: "";
196 }
197@@ -288,8 +262,7 @@
198 padding-right: 20px;
199 *zoom: 1;
200 }
201-.container-fluid:before,
202-.container-fluid:after {
203+.container-fluid:before, .container-fluid:after {
204 display: table;
205 content: "";
206 }
207@@ -312,23 +285,13 @@
208 font-weight: 200;
209 line-height: 27px;
210 }
211-h1,
212-h2,
213-h3,
214-h4,
215-h5,
216-h6 {
217+h1, h2, h3, h4, h5, h6 {
218 margin: 0;
219 font-weight: bold;
220 color: #333333;
221 text-rendering: optimizelegibility;
222 }
223-h1 small,
224-h2 small,
225-h3 small,
226-h4 small,
227-h5 small,
228-h6 small {
229+h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
230 font-weight: normal;
231 color: #999999;
232 }
233@@ -353,9 +316,7 @@
234 h3 small {
235 font-size: 14px;
236 }
237-h4,
238-h5,
239-h6 {
240+h4, h5, h6 {
241 line-height: 18px;
242 }
243 h4 {
244@@ -380,15 +341,11 @@
245 .page-header h1 {
246 line-height: 1;
247 }
248-ul,
249-ol {
250+ul, ol {
251 padding: 0;
252 margin: 0 0 9px 25px;
253 }
254-ul ul,
255-ul ol,
256-ol ol,
257-ol ul {
258+ul ul, ul ol, ol ol, ol ul {
259 margin-bottom: 0;
260 }
261 ul {
262@@ -400,8 +357,7 @@
263 li {
264 line-height: 18px;
265 }
266-ul.unstyled,
267-ol.unstyled {
268+ul.unstyled, ol.unstyled {
269 margin-left: 0;
270 list-style: none;
271 }
272@@ -412,8 +368,7 @@
273 dl {
274 margin-bottom: 18px;
275 }
276-dt,
277-dd {
278+dt, dd {
279 line-height: 18px;
280 }
281 dt {
282@@ -440,7 +395,7 @@
283 abbr {
284 font-size: 90%;
285 text-transform: uppercase;
286- border-bottom: 1px dotted #ddd;
287+ border-bottom: 1px dotted #dddddd;
288 cursor: help;
289 }
290 blockquote {
291@@ -469,14 +424,10 @@
292 border-left: 0;
293 border-right: 5px solid #eeeeee;
294 }
295-blockquote.pull-right p,
296-blockquote.pull-right small {
297+blockquote.pull-right p, blockquote.pull-right small {
298 text-align: right;
299 }
300-q:before,
301-q:after,
302-blockquote:before,
303-blockquote:after {
304+q:before, q:after, blockquote:before, blockquote:after {
305 content: "";
306 }
307 address {
308@@ -491,8 +442,7 @@
309 cite {
310 font-style: normal;
311 }
312-code,
313-pre {
314+code, pre {
315 padding: 0 3px 2px;
316 font-family: Menlo, Monaco, "Courier New", monospace;
317 font-size: 12px;
318@@ -503,7 +453,7 @@
319 }
320 code {
321 padding: 3px 4px;
322- color: #d14;
323+ color: #dd1144;
324 background-color: #f7f7f9;
325 border: 1px solid #e1e1e8;
326 }
327@@ -514,8 +464,8 @@
328 font-size: 12px;
329 line-height: 18px;
330 background-color: #f5f5f5;
331- border: 1px solid #ccc;
332- border: 1px solid rgba(0, 0, 0, 0.15);
333+ border: 1px solid #cccccc;
334+ border: 1px solid rgba(0,0,0,.15);
335 -webkit-border-radius: 4px;
336 -moz-border-radius: 4px;
337 border-radius: 4px;
338@@ -554,25 +504,18 @@
339 line-height: 36px;
340 color: #333333;
341 border: 0;
342- border-bottom: 1px solid #eee;
343+ border-bottom: 1px solid #eeeeee;
344 }
345 legend small {
346 font-size: 13.5px;
347 color: #999999;
348 }
349-label,
350-input,
351-button,
352-select,
353-textarea {
354+label, input, button, select, textarea {
355 font-size: 13px;
356 font-weight: normal;
357 line-height: 18px;
358 }
359-input,
360-button,
361-select,
362-textarea {
363+input, button, select, textarea {
364 font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
365 }
366 label {
367@@ -580,10 +523,7 @@
368 margin-bottom: 5px;
369 color: #333333;
370 }
371-input,
372-textarea,
373-select,
374-.uneditable-input {
375+input, textarea, select, .uneditable-input {
376 display: inline-block;
377 width: 210px;
378 height: 18px;
379@@ -592,7 +532,7 @@
380 font-size: 13px;
381 line-height: 18px;
382 color: #555555;
383- border: 1px solid #ccc;
384+ border: 1px solid #cccccc;
385 -webkit-border-radius: 3px;
386 -moz-border-radius: 3px;
387 border-radius: 3px;
388@@ -601,29 +541,21 @@
389 width: auto;
390 height: auto;
391 }
392-label input,
393-label textarea,
394-label select {
395+label input, label textarea, label select {
396 display: block;
397 }
398-input[type="image"],
399-input[type="checkbox"],
400-input[type="radio"] {
401+input[type="image"], input[type="checkbox"], input[type="radio"] {
402 width: auto;
403 height: auto;
404 padding: 0;
405 margin: 3px 0;
406 *margin-top: 0;
407- /* IE7 */
408-
409 line-height: normal;
410 cursor: pointer;
411 -webkit-border-radius: 0;
412 -moz-border-radius: 0;
413 border-radius: 0;
414 border: 0 \9;
415- /* IE9 and down */
416-
417 }
418 input[type="image"] {
419 border: 0;
420@@ -639,20 +571,13 @@
421 -moz-box-shadow: none;
422 box-shadow: none;
423 }
424-input[type="button"],
425-input[type="reset"],
426-input[type="submit"] {
427+input[type="button"], input[type="reset"], input[type="submit"] {
428 width: auto;
429 height: auto;
430 }
431-select,
432-input[type="file"] {
433+select, input[type="file"] {
434 height: 28px;
435- /* In IE7, the height of the select element cannot be changed by height, only font-size */
436-
437 *margin-top: 4px;
438- /* For IE7, add top margin to align select with labels */
439-
440 line-height: 28px;
441 }
442 input[type="file"] {
443@@ -662,8 +587,7 @@
444 width: 220px;
445 background-color: #ffffff;
446 }
447-select[multiple],
448-select[size] {
449+select[multiple], select[size] {
450 height: auto;
451 }
452 input[type="image"] {
453@@ -677,51 +601,42 @@
454 input[type="hidden"] {
455 display: none;
456 }
457-.radio,
458-.checkbox {
459+.radio, .checkbox {
460 padding-left: 18px;
461 }
462-.radio input[type="radio"],
463-.checkbox input[type="checkbox"] {
464+.radio input[type="radio"], .checkbox input[type="checkbox"] {
465 float: left;
466 margin-left: -18px;
467 }
468-.controls > .radio:first-child,
469-.controls > .checkbox:first-child {
470+.controls > .radio:first-child, .controls > .checkbox:first-child {
471 padding-top: 5px;
472 }
473-.radio.inline,
474-.checkbox.inline {
475+.radio.inline, .checkbox.inline {
476 display: inline-block;
477 padding-top: 5px;
478 margin-bottom: 0;
479 vertical-align: middle;
480 }
481-.radio.inline + .radio.inline,
482-.checkbox.inline + .checkbox.inline {
483+.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
484 margin-left: 10px;
485 }
486-input,
487-textarea {
488- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
489- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
490- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
491- -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
492- -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
493- -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
494- -o-transition: border linear 0.2s, box-shadow linear 0.2s;
495- transition: border linear 0.2s, box-shadow linear 0.2s;
496+input, textarea {
497+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
498+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
499+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
500+ -webkit-transition: border linear .2s, box-shadow linear .2s;
501+ -moz-transition: border linear .2s, box-shadow linear .2s;
502+ -ms-transition: border linear .2s, box-shadow linear .2s;
503+ -o-transition: border linear .2s, box-shadow linear .2s;
504+ transition: border linear .2s, box-shadow linear .2s;
505 }
506-input:focus,
507-textarea:focus {
508- border-color: rgba(82, 168, 236, 0.8);
509- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
510- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
511- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
512+input:focus, textarea:focus {
513+ border-color: rgba(82,168,236,.8);
514+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
515+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
516+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
517 outline: 0;
518 outline: thin dotted \9;
519- /* IE6-9 */
520-
521 }
522 input[type="file"]:focus,
523 input[type="radio"]:focus,
524@@ -730,7 +645,7 @@
525 -webkit-box-shadow: none;
526 -moz-box-shadow: none;
527 box-shadow: none;
528- outline: thin dotted #333;
529+ outline: thin dotted #333333;
530 outline: 5px auto -webkit-focus-ring-color;
531 outline-offset: -2px;
532 }
533@@ -759,64 +674,40 @@
534 float: none;
535 margin-left: 0;
536 }
537-input.span1,
538-textarea.span1,
539-.uneditable-input.span1 {
540+input.span1, textarea.span1, .uneditable-input.span1 {
541 width: 50px;
542 }
543-input.span2,
544-textarea.span2,
545-.uneditable-input.span2 {
546+input.span2, textarea.span2, .uneditable-input.span2 {
547 width: 130px;
548 }
549-input.span3,
550-textarea.span3,
551-.uneditable-input.span3 {
552+input.span3, textarea.span3, .uneditable-input.span3 {
553 width: 210px;
554 }
555-input.span4,
556-textarea.span4,
557-.uneditable-input.span4 {
558+input.span4, textarea.span4, .uneditable-input.span4 {
559 width: 290px;
560 }
561-input.span5,
562-textarea.span5,
563-.uneditable-input.span5 {
564+input.span5, textarea.span5, .uneditable-input.span5 {
565 width: 370px;
566 }
567-input.span6,
568-textarea.span6,
569-.uneditable-input.span6 {
570+input.span6, textarea.span6, .uneditable-input.span6 {
571 width: 450px;
572 }
573-input.span7,
574-textarea.span7,
575-.uneditable-input.span7 {
576+input.span7, textarea.span7, .uneditable-input.span7 {
577 width: 530px;
578 }
579-input.span8,
580-textarea.span8,
581-.uneditable-input.span8 {
582+input.span8, textarea.span8, .uneditable-input.span8 {
583 width: 610px;
584 }
585-input.span9,
586-textarea.span9,
587-.uneditable-input.span9 {
588+input.span9, textarea.span9, .uneditable-input.span9 {
589 width: 690px;
590 }
591-input.span10,
592-textarea.span10,
593-.uneditable-input.span10 {
594+input.span10, textarea.span10, .uneditable-input.span10 {
595 width: 770px;
596 }
597-input.span11,
598-textarea.span11,
599-.uneditable-input.span11 {
600+input.span11, textarea.span11, .uneditable-input.span11 {
601 width: 850px;
602 }
603-input.span12,
604-textarea.span12,
605-.uneditable-input.span12 {
606+input.span12, textarea.span12, .uneditable-input.span12 {
607 width: 930px;
608 }
609 input[disabled],
610@@ -826,18 +717,18 @@
611 select[readonly],
612 textarea[readonly] {
613 background-color: #f5f5f5;
614- border-color: #ddd;
615+ border-color: #dddddd;
616 cursor: not-allowed;
617 }
618 .control-group.warning > label,
619 .control-group.warning .help-block,
620 .control-group.warning .help-inline {
621- color: #c09853;
622+ color: #333333;
623 }
624 .control-group.warning input,
625 .control-group.warning select,
626 .control-group.warning textarea {
627- color: #c09853;
628+ color: #333333;
629 border-color: #c09853;
630 }
631 .control-group.warning input:focus,
632@@ -850,19 +741,19 @@
633 }
634 .control-group.warning .input-prepend .add-on,
635 .control-group.warning .input-append .add-on {
636- color: #c09853;
637+ color: #333333;
638 background-color: #fcf8e3;
639- border-color: #c09853;
640+ border-color: #333333;
641 }
642 .control-group.error > label,
643 .control-group.error .help-block,
644 .control-group.error .help-inline {
645- color: #b94a48;
646+ color: #333333;
647 }
648 .control-group.error input,
649 .control-group.error select,
650 .control-group.error textarea {
651- color: #b94a48;
652+ color: #333333;
653 border-color: #b94a48;
654 }
655 .control-group.error input:focus,
656@@ -875,19 +766,19 @@
657 }
658 .control-group.error .input-prepend .add-on,
659 .control-group.error .input-append .add-on {
660- color: #b94a48;
661+ color: #333333;
662 background-color: #f2dede;
663- border-color: #b94a48;
664+ border-color: #333333;
665 }
666 .control-group.success > label,
667 .control-group.success .help-block,
668 .control-group.success .help-inline {
669- color: #468847;
670+ color: #333333;
671 }
672 .control-group.success input,
673 .control-group.success select,
674 .control-group.success textarea {
675- color: #468847;
676+ color: #333333;
677 border-color: #468847;
678 }
679 .control-group.success input:focus,
680@@ -900,9 +791,9 @@
681 }
682 .control-group.success .input-prepend .add-on,
683 .control-group.success .input-append .add-on {
684- color: #468847;
685+ color: #333333;
686 background-color: #dff0d8;
687- border-color: #468847;
688+ border-color: #333333;
689 }
690 input:focus:required:invalid,
691 textarea:focus:required:invalid,
692@@ -923,15 +814,15 @@
693 margin-top: 18px;
694 margin-bottom: 18px;
695 background-color: #f5f5f5;
696- border-top: 1px solid #ddd;
697+ border-top: 1px solid #dddddd;
698 }
699 .uneditable-input {
700 display: block;
701 background-color: #ffffff;
702- border-color: #eee;
703- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
704- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
705- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
706+ border-color: #eeeeee;
707+ -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.025);
708+ -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.025);
709+ box-shadow: inset 0 1px 2px rgba(0,0,0,.025);
710 cursor: not-allowed;
711 }
712 :-moz-placeholder {
713@@ -949,50 +840,44 @@
714 .help-inline {
715 display: inline-block;
716 *display: inline;
717- /* IE7 inline-block hack */
718-
719 *zoom: 1;
720 margin-bottom: 9px;
721 vertical-align: middle;
722 padding-left: 5px;
723 }
724-.input-prepend,
725-.input-append {
726+.input-prepend, .input-append {
727 margin-bottom: 5px;
728 *zoom: 1;
729 }
730 .input-prepend:before,
731+.input-prepend:after,
732 .input-append:before,
733-.input-prepend:after,
734 .input-append:after {
735 display: table;
736 content: "";
737 }
738-.input-prepend:after,
739-.input-append:after {
740+.input-prepend:after, .input-append:after {
741 clear: both;
742 }
743 .input-prepend input,
744+.input-prepend .uneditable-input,
745 .input-append input,
746-.input-prepend .uneditable-input,
747 .input-append .uneditable-input {
748 -webkit-border-radius: 0 3px 3px 0;
749 -moz-border-radius: 0 3px 3px 0;
750 border-radius: 0 3px 3px 0;
751 }
752 .input-prepend input:focus,
753+.input-prepend .uneditable-input:focus,
754 .input-append input:focus,
755-.input-prepend .uneditable-input:focus,
756 .input-append .uneditable-input:focus {
757 position: relative;
758 z-index: 2;
759 }
760-.input-prepend .uneditable-input,
761-.input-append .uneditable-input {
762- border-left-color: #ccc;
763+.input-prepend .uneditable-input, .input-append .uneditable-input {
764+ border-left-color: #cccccc;
765 }
766-.input-prepend .add-on,
767-.input-append .add-on {
768+.input-prepend .add-on, .input-append .add-on {
769 float: left;
770 display: block;
771 width: auto;
772@@ -1006,31 +891,27 @@
773 text-align: center;
774 text-shadow: 0 1px 0 #ffffff;
775 background-color: #f5f5f5;
776- border: 1px solid #ccc;
777+ border: 1px solid #cccccc;
778 -webkit-border-radius: 3px 0 0 3px;
779 -moz-border-radius: 3px 0 0 3px;
780 border-radius: 3px 0 0 3px;
781 }
782-.input-prepend .active,
783-.input-append .active {
784+.input-prepend .active, .input-append .active {
785 background-color: #a9dba9;
786 border-color: #46a546;
787 }
788 .input-prepend .add-on {
789 *margin-top: 1px;
790- /* IE6-7 */
791-
792 }
793-.input-append input,
794-.input-append .uneditable-input {
795+.input-append input, .input-append .uneditable-input {
796 float: left;
797 -webkit-border-radius: 3px 0 0 3px;
798 -moz-border-radius: 3px 0 0 3px;
799 border-radius: 3px 0 0 3px;
800 }
801 .input-append .uneditable-input {
802- border-left-color: #eee;
803- border-right-color: #ccc;
804+ border-left-color: #eeeeee;
805+ border-right-color: #cccccc;
806 }
807 .input-append .add-on {
808 margin-right: 0;
809@@ -1054,26 +935,24 @@
810 border-radius: 14px;
811 }
812 .form-search input,
813-.form-inline input,
814-.form-horizontal input,
815 .form-search textarea,
816+.form-search select,
817+.form-search .help-inline,
818+.form-search .uneditable-input,
819+.form-inline input,
820 .form-inline textarea,
821+.form-inline select,
822+.form-inline .help-inline,
823+.form-inline .uneditable-input,
824+.form-horizontal input,
825 .form-horizontal textarea,
826-.form-search select,
827-.form-inline select,
828 .form-horizontal select,
829-.form-search .help-inline,
830-.form-inline .help-inline,
831 .form-horizontal .help-inline,
832-.form-search .uneditable-input,
833-.form-inline .uneditable-input,
834 .form-horizontal .uneditable-input {
835 display: inline-block;
836 margin-bottom: 0;
837 }
838-.form-search .hide,
839-.form-inline .hide,
840-.form-horizontal .hide {
841+.form-search .hide, .form-inline .hide, .form-horizontal .hide {
842 display: none;
843 }
844 .form-search label,
845@@ -1108,8 +987,7 @@
846 margin-bottom: 18px;
847 *zoom: 1;
848 }
849-.form-horizontal .control-group:before,
850-.form-horizontal .control-group:after {
851+.form-horizontal .control-group:before, .form-horizontal .control-group:after {
852 display: table;
853 content: "";
854 }
855@@ -1137,13 +1015,12 @@
856 width: 100%;
857 margin-bottom: 18px;
858 }
859-.table th,
860-.table td {
861+.table th, .table td {
862 padding: 8px;
863 line-height: 18px;
864 text-align: left;
865 vertical-align: top;
866- border-top: 1px solid #ddd;
867+ border-top: 1px solid #dddddd;
868 }
869 .table th {
870 font-weight: bold;
871@@ -1151,19 +1028,17 @@
872 .table thead th {
873 vertical-align: bottom;
874 }
875-.table thead:first-child tr th,
876-.table thead:first-child tr td {
877+.table thead:first-child tr th, .table thead:first-child tr td {
878 border-top: 0;
879 }
880 .table tbody + tbody {
881- border-top: 2px solid #ddd;
882+ border-top: 2px solid #dddddd;
883 }
884-.table-condensed th,
885-.table-condensed td {
886+.table-condensed th, .table-condensed td {
887 padding: 4px 5px;
888 }
889 .table-bordered {
890- border: 1px solid #ddd;
891+ border: 1px solid #dddddd;
892 border-collapse: separate;
893 *border-collapse: collapsed;
894 -webkit-border-radius: 4px;
895@@ -1174,7 +1049,7 @@
896 .table-bordered td + td,
897 .table-bordered th + td,
898 .table-bordered td + th {
899- border-left: 1px solid #ddd;
900+ border-left: 1px solid #dddddd;
901 }
902 .table-bordered thead:first-child tr:first-child th,
903 .table-bordered tbody:first-child tr:first-child th,
904@@ -1205,12 +1080,10 @@
905 -moz-border-radius: 0 0 4px 0;
906 border-radius: 0 0 4px 0;
907 }
908-.table-striped tbody tr:nth-child(odd) td,
909-.table-striped tbody tr:nth-child(odd) th {
910+.table-striped tbody tr:nth-child(odd)td, .table-striped tbody tr:nth-child(odd)th {
911 background-color: #f9f9f9;
912 }
913-.table tbody tr:hover td,
914-.table tbody tr:hover th {
915+.table tbody tr:hover td, .table tbody tr:hover th {
916 background-color: #f5f5f5;
917 }
918 table .span1 {
919@@ -1273,27 +1146,25 @@
920 width: 924px;
921 margin-left: 0;
922 }
923-[class^="icon-"],
924-[class*=" icon-"] {
925+[class^="icon-"], [class*=" icon-"] {
926 display: inline-block;
927 width: 14px;
928 height: 14px;
929 line-height: 14px;
930 vertical-align: text-top;
931- xbackground-image: url('/static/bootstrap/img/glyphicons-halflings.png?531d4b607365');
932+ background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
933 background-position: 14px 14px;
934 background-repeat: no-repeat;
935 *margin-right: .3em;
936 }
937-[class^="icon-"]:last-child,
938-[class*=" icon-"]:last-child {
939+[class^="icon-"]:last-child, [class*=" icon-"]:last-child {
940 *margin-left: 0;
941 }
942 .icon-white {
943- xbackground-image: url('/static/bootstrap/img/glyphicons-halflings-white.png?11118ae8db79');
944+ background-image: url('/static/bootstrap/img/glyphicons-halflings-white.png');
945 }
946 .icon-glass {
947- background-position: 0 0;
948+ background-position: 0 0;
949 }
950 .icon-music {
951 background-position: -24px 0;
952@@ -1658,8 +1529,7 @@
953 .dropdown-toggle {
954 *margin-bottom: -3px;
955 }
956-.dropdown-toggle:active,
957-.open .dropdown-toggle {
958+.dropdown-toggle:active, .open .dropdown-toggle {
959 outline: 0;
960 }
961 .caret {
962@@ -1680,8 +1550,7 @@
963 margin-top: 8px;
964 margin-left: 2px;
965 }
966-.dropdown:hover .caret,
967-.open.dropdown .caret {
968+.dropdown:hover .caret, .open.dropdown .caret {
969 opacity: 1;
970 filter: alpha(opacity=100);
971 }
972@@ -1698,16 +1567,16 @@
973 margin: 0;
974 list-style: none;
975 background-color: #ffffff;
976- border-color: #ccc;
977- border-color: rgba(0, 0, 0, 0.2);
978+ border-color: #cccccc;
979+ border-color: rgba(0,0,0,.2);
980 border-style: solid;
981 border-width: 1px;
982 -webkit-border-radius: 0 0 5px 5px;
983 -moz-border-radius: 0 0 5px 5px;
984 border-radius: 0 0 5px 5px;
985- -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
986- -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
987- box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
988+ -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
989+ -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
990+ box-shadow: 0 5px 10px rgba(0,0,0,.2);
991 -webkit-background-clip: padding-box;
992 -moz-background-clip: padding;
993 background-clip: padding-box;
994@@ -1735,7 +1604,7 @@
995 font-weight: normal;
996 line-height: 18px;
997 color: #555555;
998- white-space: nowrap;
999+ word-wrap: break-word;
1000 }
1001 .dropdown-menu li > a:hover,
1002 .dropdown-menu .active > a,
1003@@ -1749,8 +1618,8 @@
1004 }
1005 .dropdown.open .dropdown-toggle {
1006 color: #ffffff;
1007- background: #ccc;
1008- background: rgba(0, 0, 0, 0.3);
1009+ background: #cccccc;
1010+ background: rgba(0,0,0,.3);
1011 }
1012 .dropdown.open .dropdown-menu {
1013 display: block;
1014@@ -1766,36 +1635,36 @@
1015 padding: 19px;
1016 margin-bottom: 20px;
1017 background-color: #f5f5f5;
1018- border: 1px solid #eee;
1019- border: 1px solid rgba(0, 0, 0, 0.05);
1020+ border: 1px solid #eeeeee;
1021+ border: 1px solid rgba(0,0,0,.05);
1022 -webkit-border-radius: 4px;
1023 -moz-border-radius: 4px;
1024 border-radius: 4px;
1025- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
1026- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
1027- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
1028+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
1029+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
1030+ box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
1031 }
1032 .well blockquote {
1033- border-color: #ddd;
1034- border-color: rgba(0, 0, 0, 0.15);
1035+ border-color: #dddddd;
1036+ border-color: rgba(0,0,0,.15);
1037 }
1038 .fade {
1039- -webkit-transition: opacity 0.15s linear;
1040- -moz-transition: opacity 0.15s linear;
1041- -ms-transition: opacity 0.15s linear;
1042- -o-transition: opacity 0.15s linear;
1043- transition: opacity 0.15s linear;
1044+ -webkit-transition: opacity .15s linear;
1045+ -moz-transition: opacity .15s linear;
1046+ -ms-transition: opacity .15s linear;
1047+ -o-transition: opacity .15s linear;
1048+ transition: opacity .15s linear;
1049 opacity: 0;
1050 }
1051 .fade.in {
1052 opacity: 1;
1053 }
1054 .collapse {
1055- -webkit-transition: height 0.35s ease;
1056- -moz-transition: height 0.35s ease;
1057- -ms-transition: height 0.35s ease;
1058- -o-transition: height 0.35s ease;
1059- transition: height 0.35s ease;
1060+ -webkit-transition: height .35s ease;
1061+ -moz-transition: height .35s ease;
1062+ -ms-transition: height .35s ease;
1063+ -o-transition: height .35s ease;
1064+ transition: height .35s ease;
1065 position: relative;
1066 overflow: hidden;
1067 height: 0;
1068@@ -1809,7 +1678,7 @@
1069 font-weight: bold;
1070 line-height: 18px;
1071 color: #000000;
1072- text-shadow: 0 1px 0 #ffffff;
1073+ text-shadow: 0 1px 0 #ffffff01;
1074 opacity: 0.2;
1075 filter: alpha(opacity=20);
1076 }
1077@@ -1828,42 +1697,37 @@
1078 line-height: 18px;
1079 color: #333333;
1080 text-align: center;
1081- text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
1082+ text-shadow: 0 1px 1px rgba(255,255,255,.75);
1083 vertical-align: middle;
1084 background-color: #f5f5f5;
1085- background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
1086- background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
1087- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
1088- background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
1089- background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
1090- background-image: linear-gradient(top, #ffffff, #e6e6e6);
1091+ background-image: -moz-linear-gradient(top,#ffffff,#e6e6e6 );
1092+ background-image: -ms-linear-gradient(top,#ffffff,#e6e6e6 );
1093+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#e6e6e6 ));
1094+ background-image: -webkit-linear-gradient(top,#ffffff,#e6e6e6 );
1095+ background-image: -o-linear-gradient(top,#ffffff,#e6e6e6 );
1096+ background-image: linear-gradient(top,#ffffff,#e6e6e6 );
1097 background-repeat: repeat-x;
1098- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
1099- border-color: #e6e6e6 #e6e6e6 #bfbfbf;
1100- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1101+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6 ', GradientType=0);
1102+ border-color: #e6e6e6 #e6e6e6 #c0c0c0;
1103+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1104 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1105- border: 1px solid #ccc;
1106- border-bottom-color: #bbb;
1107+ border: 1px solid #cccccc;
1108+ border-bottom-color: #bbbbbb;
1109 -webkit-border-radius: 4px;
1110 -moz-border-radius: 4px;
1111 border-radius: 4px;
1112- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1113- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1114- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1115+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
1116+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
1117+ box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
1118 cursor: pointer;
1119 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1120 *margin-left: .3em;
1121 }
1122-.btn:hover,
1123-.btn:active,
1124-.btn.active,
1125-.btn.disabled,
1126-.btn[disabled] {
1127+.btn:hover, .btn:active, .btn.active, .btn.disabled, .btn[disabled] {
1128 background-color: #e6e6e6;
1129 }
1130-.btn:active,
1131-.btn.active {
1132- background-color: #cccccc \9;
1133+.btn:active, .btn.active {
1134+ background-color: #cdcdcd \9;
1135 }
1136 .btn:first-child {
1137 *margin-left: 0;
1138@@ -1873,29 +1737,27 @@
1139 text-decoration: none;
1140 background-color: #e6e6e6;
1141 background-position: 0 -15px;
1142- -webkit-transition: background-position 0.1s linear;
1143- -moz-transition: background-position 0.1s linear;
1144- -ms-transition: background-position 0.1s linear;
1145- -o-transition: background-position 0.1s linear;
1146- transition: background-position 0.1s linear;
1147+ -webkit-transition: background-position .1s linear;
1148+ -moz-transition: background-position .1s linear;
1149+ -ms-transition: background-position .1s linear;
1150+ -o-transition: background-position .1s linear;
1151+ transition: background-position .1s linear;
1152 }
1153 .btn:focus {
1154- outline: thin dotted #333;
1155+ outline: thin dotted #333333;
1156 outline: 5px auto -webkit-focus-ring-color;
1157 outline-offset: -2px;
1158 }
1159-.btn.active,
1160-.btn:active {
1161+.btn.active, .btn:active {
1162 background-image: none;
1163- -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
1164- -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
1165- box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
1166+ -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
1167+ -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
1168+ box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
1169 background-color: #e6e6e6;
1170 background-color: #d9d9d9 \9;
1171 outline: 0;
1172 }
1173-.btn.disabled,
1174-.btn[disabled] {
1175+.btn.disabled, .btn[disabled] {
1176 cursor: default;
1177 background-image: none;
1178 background-color: #e6e6e6;
1179@@ -1941,8 +1803,8 @@
1180 .btn-info:hover,
1181 .btn-inverse,
1182 .btn-inverse:hover {
1183- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
1184- color: #fff;
1185+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
1186+ color: #ffffff;
1187 }
1188 .btn-primary.active,
1189 .btn-warning.active,
1190@@ -1950,57 +1812,44 @@
1191 .btn-success.active,
1192 .btn-info.active,
1193 .btn-dark.active {
1194- color: #fff,
1195- background-color: #c44012;
1196-
1197+ color: rgba(255,255,255,.75);
1198 }
1199-
1200 .btn-primary {
1201- color: #fff;
1202- border: 1px solid #ab370f;
1203- background-color: #DD4814;
1204- background-image: linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
1205- background-image: -o-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
1206- background-image: -moz-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
1207- background-image: -webkit-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
1208- background-image: -ms-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
1209- -webkit-box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2);
1210- box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2);
1211+ background-color: #006ccc;
1212+ background-image: -moz-linear-gradient(top,#dd4814,#dd4a14 );
1213+ background-image: -ms-linear-gradient(top,#dd4814,#dd4a14 );
1214+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4814),to(#dd4a14 ));
1215+ background-image: -webkit-linear-gradient(top,#dd4814,#dd4a14 );
1216+ background-image: -o-linear-gradient(top,#dd4814,#dd4a14 );
1217+ background-image: linear-gradient(top,#dd4814,#dd4a14 );
1218+ background-repeat: repeat-x;
1219+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dd4814', endColorstr='#dd4a14 ', GradientType=0);
1220+ border-color: #dd4a14 #dd4a14 #002a80;
1221+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1222+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1223 }
1224 .btn-primary:hover,
1225 .btn-primary:active,
1226 .btn-primary.active,
1227 .btn-primary.disabled,
1228 .btn-primary[disabled] {
1229- background-color: #DD4814;
1230-}
1231-/*.btn-primary.active {
1232- background-color: #c44012 \9;
1233-}*/
1234-$.btn-primary:active,
1235-.btn-primary:active {
1236- background-color: #DD4814;
1237- background-image: linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
1238- background-image: -o-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
1239- background-image: -moz-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
1240- background-image: -webkit-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
1241- background-image: -ms-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
1242- text-decoration: none;
1243-}
1244-
1245-
1246+ background-color: #dd4a14;
1247+}
1248+.btn-primary:active, .btn-primary.active {
1249+ background-color: #003399 \9;
1250+}
1251 .btn-warning {
1252- background-color: #faa732;
1253- background-image: -moz-linear-gradient(top, #fbb450, #f89406);
1254- background-image: -ms-linear-gradient(top, #fbb450, #f89406);
1255- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
1256- background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
1257- background-image: -o-linear-gradient(top, #fbb450, #f89406);
1258- background-image: linear-gradient(top, #fbb450, #f89406);
1259+ background-color: #f9a732;
1260+ background-image: -moz-linear-gradient(top,#fbb450 ,#f89406);
1261+ background-image: -ms-linear-gradient(top,#fbb450 ,#f89406);
1262+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450 ),to(#f89406));
1263+ background-image: -webkit-linear-gradient(top,#fbb450 ,#f89406);
1264+ background-image: -o-linear-gradient(top,#fbb450 ,#f89406);
1265+ background-image: linear-gradient(top,#fbb450 ,#f89406);
1266 background-repeat: repeat-x;
1267- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
1268+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450 ', endColorstr='#f89406', GradientType=0);
1269 border-color: #f89406 #f89406 #ad6704;
1270- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1271+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1272 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1273 }
1274 .btn-warning:hover,
1275@@ -2010,22 +1859,21 @@
1276 .btn-warning[disabled] {
1277 background-color: #f89406;
1278 }
1279-.btn-warning:active,
1280-.btn-warning.active {
1281+.btn-warning:active, .btn-warning.active {
1282 background-color: #c67605 \9;
1283 }
1284 .btn-danger {
1285- background-color: #da4f49;
1286- background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
1287- background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
1288- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
1289- background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
1290- background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
1291- background-image: linear-gradient(top, #ee5f5b, #bd362f);
1292+ background-color: #da4e49;
1293+ background-image: -moz-linear-gradient(top,#ee5f5b,#bd362f);
1294+ background-image: -ms-linear-gradient(top,#ee5f5b,#bd362f);
1295+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));
1296+ background-image: -webkit-linear-gradient(top,#ee5f5b,#bd362f);
1297+ background-image: -o-linear-gradient(top,#ee5f5b,#bd362f);
1298+ background-image: linear-gradient(top,#ee5f5b,#bd362f);
1299 background-repeat: repeat-x;
1300 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
1301 border-color: #bd362f #bd362f #802420;
1302- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1303+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1304 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1305 }
1306 .btn-danger:hover,
1307@@ -2035,22 +1883,21 @@
1308 .btn-danger[disabled] {
1309 background-color: #bd362f;
1310 }
1311-.btn-danger:active,
1312-.btn-danger.active {
1313+.btn-danger:active, .btn-danger.active {
1314 background-color: #942a25 \9;
1315 }
1316 .btn-success {
1317- background-color: #5bb75b;
1318- background-image: -moz-linear-gradient(top, #62c462, #51a351);
1319- background-image: -ms-linear-gradient(top, #62c462, #51a351);
1320- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
1321- background-image: -webkit-linear-gradient(top, #62c462, #51a351);
1322- background-image: -o-linear-gradient(top, #62c462, #51a351);
1323- background-image: linear-gradient(top, #62c462, #51a351);
1324+ background-color: #5bb65b;
1325+ background-image: -moz-linear-gradient(top,#62c462,#51a351);
1326+ background-image: -ms-linear-gradient(top,#62c462,#51a351);
1327+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
1328+ background-image: -webkit-linear-gradient(top,#62c462,#51a351);
1329+ background-image: -o-linear-gradient(top,#62c462,#51a351);
1330+ background-image: linear-gradient(top,#62c462,#51a351);
1331 background-repeat: repeat-x;
1332 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
1333 border-color: #51a351 #51a351 #387038;
1334- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1335+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1336 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1337 }
1338 .btn-success:hover,
1339@@ -2060,22 +1907,21 @@
1340 .btn-success[disabled] {
1341 background-color: #51a351;
1342 }
1343-.btn-success:active,
1344-.btn-success.active {
1345+.btn-success:active, .btn-success.active {
1346 background-color: #408140 \9;
1347 }
1348 .btn-info {
1349 background-color: #49afcd;
1350- background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
1351- background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
1352- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
1353- background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
1354- background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
1355- background-image: linear-gradient(top, #5bc0de, #2f96b4);
1356+ background-image: -moz-linear-gradient(top,#5bc0de,#2f96b4);
1357+ background-image: -ms-linear-gradient(top,#5bc0de,#2f96b4);
1358+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));
1359+ background-image: -webkit-linear-gradient(top,#5bc0de,#2f96b4);
1360+ background-image: -o-linear-gradient(top,#5bc0de,#2f96b4);
1361+ background-image: linear-gradient(top,#5bc0de,#2f96b4);
1362 background-repeat: repeat-x;
1363 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
1364 border-color: #2f96b4 #2f96b4 #1f6377;
1365- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1366+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1367 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1368 }
1369 .btn-info:hover,
1370@@ -2085,22 +1931,21 @@
1371 .btn-info[disabled] {
1372 background-color: #2f96b4;
1373 }
1374-.btn-info:active,
1375-.btn-info.active {
1376+.btn-info:active, .btn-info.active {
1377 background-color: #24748c \9;
1378 }
1379 .btn-inverse {
1380- background-color: #393939;
1381- background-image: -moz-linear-gradient(top, #454545, #262626);
1382- background-image: -ms-linear-gradient(top, #454545, #262626);
1383- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626));
1384- background-image: -webkit-linear-gradient(top, #454545, #262626);
1385- background-image: -o-linear-gradient(top, #454545, #262626);
1386- background-image: linear-gradient(top, #454545, #262626);
1387+ background-color: #383838;
1388+ background-image: -moz-linear-gradient(top,#454545,#262626);
1389+ background-image: -ms-linear-gradient(top,#454545,#262626);
1390+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#454545),to(#262626));
1391+ background-image: -webkit-linear-gradient(top,#454545,#262626);
1392+ background-image: -o-linear-gradient(top,#454545,#262626);
1393+ background-image: linear-gradient(top,#454545,#262626);
1394 background-repeat: repeat-x;
1395 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
1396 border-color: #262626 #262626 #000000;
1397- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1398+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1399 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1400 }
1401 .btn-inverse:hover,
1402@@ -2110,27 +1955,22 @@
1403 .btn-inverse[disabled] {
1404 background-color: #262626;
1405 }
1406-.btn-inverse:active,
1407-.btn-inverse.active {
1408+.btn-inverse:active, .btn-inverse.active {
1409 background-color: #0c0c0c \9;
1410 }
1411-button.btn,
1412-input[type="submit"].btn {
1413+button.btn, input[type="submit"].btn {
1414 *padding-top: 2px;
1415 *padding-bottom: 2px;
1416 }
1417-button.btn::-moz-focus-inner,
1418-input[type="submit"].btn::-moz-focus-inner {
1419+button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner {
1420 padding: 0;
1421 border: 0;
1422 }
1423-button.btn.large,
1424-input[type="submit"].btn.large {
1425+button.btn.large, input[type="submit"].btn.large {
1426 *padding-top: 7px;
1427 *padding-bottom: 7px;
1428 }
1429-button.btn.small,
1430-input[type="submit"].btn.small {
1431+button.btn.small, input[type="submit"].btn.small {
1432 *padding-top: 3px;
1433 *padding-bottom: 3px;
1434 }
1435@@ -2139,8 +1979,7 @@
1436 *zoom: 1;
1437 *margin-left: .3em;
1438 }
1439-.btn-group:before,
1440-.btn-group:after {
1441+.btn-group:before, .btn-group:after {
1442 display: table;
1443 content: "";
1444 }
1445@@ -2160,8 +1999,6 @@
1446 .btn-toolbar .btn-group {
1447 display: inline-block;
1448 *display: inline;
1449- /* IE7 inline-block hack */
1450-
1451 *zoom: 1;
1452 }
1453 .btn-group .btn {
1454@@ -2181,8 +2018,7 @@
1455 -moz-border-radius-bottomleft: 4px;
1456 border-bottom-left-radius: 4px;
1457 }
1458-.btn-group .btn:last-child,
1459-.btn-group .dropdown-toggle {
1460+.btn-group .btn:last-child, .btn-group .dropdown-toggle {
1461 -webkit-border-top-right-radius: 4px;
1462 -moz-border-radius-topright: 4px;
1463 border-top-right-radius: 4px;
1464@@ -2199,8 +2035,7 @@
1465 -moz-border-radius-bottomleft: 6px;
1466 border-bottom-left-radius: 6px;
1467 }
1468-.btn-group .btn.large:last-child,
1469-.btn-group .large.dropdown-toggle {
1470+.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
1471 -webkit-border-top-right-radius: 6px;
1472 -moz-border-radius-topright: 6px;
1473 border-top-right-radius: 6px;
1474@@ -2214,16 +2049,15 @@
1475 .btn-group .btn.active {
1476 z-index: 2;
1477 }
1478-.btn-group .dropdown-toggle:active,
1479-.btn-group.open .dropdown-toggle {
1480+.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
1481 outline: 0;
1482 }
1483 .btn-group .dropdown-toggle {
1484 padding-left: 8px;
1485 padding-right: 8px;
1486- -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1487- -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1488- box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
1489+ -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
1490+ -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
1491+ box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
1492 *padding-top: 5px;
1493 *padding-bottom: 5px;
1494 }
1495@@ -2239,16 +2073,15 @@
1496 }
1497 .btn-group.open .dropdown-toggle {
1498 background-image: none;
1499- -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
1500- -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
1501- box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
1502+ -webkit-box-shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
1503+ -moz-box-shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
1504+ box-shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
1505 }
1506 .btn .caret {
1507 margin-top: 7px;
1508 margin-left: 0;
1509 }
1510-.btn:hover .caret,
1511-.open.btn-group .caret {
1512+.btn:hover .caret, .open.btn-group .caret {
1513 opacity: 1;
1514 filter: alpha(opacity=100);
1515 }
1516@@ -2267,15 +2100,14 @@
1517 .alert {
1518 padding: 8px 35px 8px 14px;
1519 margin-bottom: 18px;
1520- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
1521+ text-shadow: 0 1px 0 rgba(255,255,255,.5);
1522 background-color: #fcf8e3;
1523- border: 1px solid #fbeed5;
1524+ border: 1px solid #fbefd5;
1525 -webkit-border-radius: 4px;
1526 -moz-border-radius: 4px;
1527 border-radius: 4px;
1528 }
1529-.alert,
1530-.alert-heading {
1531+.alert, .alert-heading {
1532 color: #c09853;
1533 }
1534 .alert .close {
1535@@ -2288,12 +2120,10 @@
1536 background-color: #dff0d8;
1537 border-color: #d6e9c6;
1538 }
1539-.alert-success,
1540-.alert-success .alert-heading {
1541+.alert-success, .alert-success .alert-heading {
1542 color: #468847;
1543 }
1544-.alert-danger,
1545-.alert-error {
1546+.alert-danger, .alert-error {
1547 background-color: #f2dede;
1548 border-color: #eed3d7;
1549 }
1550@@ -2307,16 +2137,14 @@
1551 background-color: #d9edf7;
1552 border-color: #bce8f1;
1553 }
1554-.alert-info,
1555-.alert-info .alert-heading {
1556+.alert-info, .alert-info .alert-heading {
1557 color: #3a87ad;
1558 }
1559 .alert-block {
1560 padding-top: 14px;
1561 padding-bottom: 14px;
1562 }
1563-.alert-block > p,
1564-.alert-block > ul {
1565+.alert-block > p, .alert-block > ul {
1566 margin-bottom: 0;
1567 }
1568 .alert-block p + p {
1569@@ -2341,7 +2169,7 @@
1570 font-weight: bold;
1571 line-height: 18px;
1572 color: #999999;
1573- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
1574+ text-shadow: 0 1px 0 rgba(255,255,255,.5);
1575 text-transform: uppercase;
1576 }
1577 .nav li + .nav-header {
1578@@ -2352,52 +2180,43 @@
1579 padding-right: 14px;
1580 margin-bottom: 0;
1581 }
1582-.nav-list > li > a,
1583-.nav-list .nav-header {
1584+.nav-list > li > a, .nav-list .nav-header {
1585 margin-left: -15px;
1586 margin-right: -15px;
1587- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
1588+ text-shadow: 0 1px 0 rgba(255,255,255,.5);
1589 }
1590 .nav-list > li > a {
1591 padding: 3px 15px;
1592 }
1593-.nav-list .active > a,
1594-.nav-list .active > a:hover {
1595+.nav-list .active > a, .nav-list .active > a:hover {
1596 color: #ffffff;
1597- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
1598- background-color: #0088cc;
1599+ text-shadow: 0 -1px 0 rgba(0,0,0,.2);
1600+ background-color: #dd4814;
1601 }
1602 .nav-list [class^="icon-"] {
1603 margin-right: 2px;
1604 }
1605-.nav-tabs,
1606-.nav-pills {
1607+.nav-tabs, .nav-pills {
1608 *zoom: 1;
1609 }
1610-.nav-tabs:before,
1611-.nav-pills:before,
1612-.nav-tabs:after,
1613-.nav-pills:after {
1614+.nav-tabs:before, .nav-tabs:after, .nav-pills:before, .nav-pills:after {
1615 display: table;
1616 content: "";
1617 }
1618-.nav-tabs:after,
1619-.nav-pills:after {
1620+.nav-tabs:after, .nav-pills:after {
1621 clear: both;
1622 }
1623-.nav-tabs > li,
1624-.nav-pills > li {
1625+.nav-tabs > li, .nav-pills > li {
1626 float: left;
1627 }
1628-.nav-tabs > li > a,
1629-.nav-pills > li > a {
1630+.nav-tabs > li > a, .nav-pills > li > a {
1631 padding-right: 12px;
1632 padding-left: 12px;
1633 margin-right: 2px;
1634 line-height: 14px;
1635 }
1636 .nav-tabs {
1637- border-bottom: 1px solid #ddd;
1638+ border-bottom: 1px solid #dddddd;
1639 }
1640 .nav-tabs > li {
1641 margin-bottom: -1px;
1642@@ -2413,11 +2232,10 @@
1643 .nav-tabs > li > a:hover {
1644 border-color: #eeeeee #eeeeee #dddddd;
1645 }
1646-.nav-tabs > .active > a,
1647-.nav-tabs > .active > a:hover {
1648+.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
1649 color: #555555;
1650 background-color: #ffffff;
1651- border: 1px solid #ddd;
1652+ border: 1px solid #dddddd;
1653 border-bottom-color: transparent;
1654 cursor: default;
1655 }
1656@@ -2430,10 +2248,9 @@
1657 -moz-border-radius: 5px;
1658 border-radius: 5px;
1659 }
1660-.nav-pills .active > a,
1661-.nav-pills .active > a:hover {
1662+.nav-pills .active > a, .nav-pills .active > a:hover {
1663 color: #ffffff;
1664- background-color: #0088cc;
1665+ background-color: #dd4814;
1666 }
1667 .nav-stacked > li {
1668 float: none;
1669@@ -2445,7 +2262,7 @@
1670 border-bottom: 0;
1671 }
1672 .nav-tabs.nav-stacked > li > a {
1673- border: 1px solid #ddd;
1674+ border: 1px solid #dddddd;
1675 -webkit-border-radius: 0;
1676 -moz-border-radius: 0;
1677 border-radius: 0;
1678@@ -2461,7 +2278,7 @@
1679 border-radius: 0 0 4px 4px;
1680 }
1681 .nav-tabs.nav-stacked > li > a:hover {
1682- border-color: #ddd;
1683+ border-color: #dddddd;
1684 z-index: 2;
1685 }
1686 .nav-pills.nav-stacked > li > a {
1687@@ -2470,8 +2287,7 @@
1688 .nav-pills.nav-stacked > li:last-child > a {
1689 margin-bottom: 1px;
1690 }
1691-.nav-tabs .dropdown-menu,
1692-.nav-pills .dropdown-menu {
1693+.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu {
1694 margin-top: 1px;
1695 border-width: 1px;
1696 }
1697@@ -2480,14 +2296,12 @@
1698 -moz-border-radius: 4px;
1699 border-radius: 4px;
1700 }
1701-.nav-tabs .dropdown-toggle .caret,
1702-.nav-pills .dropdown-toggle .caret {
1703- border-top-color: #0088cc;
1704+.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
1705+ border-top-color: #dd4814;
1706 margin-top: 6px;
1707 }
1708-.nav-tabs .dropdown-toggle:hover .caret,
1709-.nav-pills .dropdown-toggle:hover .caret {
1710- border-top-color: #005580;
1711+.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
1712+ border-top-color: #dd4814;
1713 }
1714 .nav-tabs .active .dropdown-toggle .caret,
1715 .nav-pills .active .dropdown-toggle .caret {
1716@@ -2504,9 +2318,7 @@
1717 background-color: #999999;
1718 border-color: #999999;
1719 }
1720-.nav .open .caret,
1721-.nav .open.active .caret,
1722-.nav .open a:hover .caret {
1723+.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
1724 border-top-color: #ffffff;
1725 opacity: 1;
1726 filter: alpha(opacity=100);
1727@@ -2517,8 +2329,7 @@
1728 .tabbable {
1729 *zoom: 1;
1730 }
1731-.tabbable:before,
1732-.tabbable:after {
1733+.tabbable:before, .tabbable:after {
1734 display: table;
1735 content: "";
1736 }
1737@@ -2528,21 +2339,17 @@
1738 .tab-content {
1739 overflow: hidden;
1740 }
1741-.tabs-below .nav-tabs,
1742-.tabs-right .nav-tabs,
1743-.tabs-left .nav-tabs {
1744+.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
1745 border-bottom: 0;
1746 }
1747-.tab-content > .tab-pane,
1748-.pill-content > .pill-pane {
1749+.tab-content > .tab-pane, .pill-content > .pill-pane {
1750 display: none;
1751 }
1752-.tab-content > .active,
1753-.pill-content > .active {
1754+.tab-content > .active, .pill-content > .active {
1755 display: block;
1756 }
1757 .tabs-below .nav-tabs {
1758- border-top: 1px solid #ddd;
1759+ border-top: 1px solid #dddddd;
1760 }
1761 .tabs-below .nav-tabs > li {
1762 margin-top: -1px;
1763@@ -2555,18 +2362,15 @@
1764 }
1765 .tabs-below .nav-tabs > li > a:hover {
1766 border-bottom-color: transparent;
1767- border-top-color: #ddd;
1768-}
1769-.tabs-below .nav-tabs .active > a,
1770-.tabs-below .nav-tabs .active > a:hover {
1771- border-color: transparent #ddd #ddd #ddd;
1772-}
1773-.tabs-left .nav-tabs > li,
1774-.tabs-right .nav-tabs > li {
1775+ border-top-color: #dddddd;
1776+}
1777+.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover {
1778+ border-color: transparent #dddddd #dddddd #dddddd;
1779+}
1780+.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li {
1781 float: none;
1782 }
1783-.tabs-left .nav-tabs > li > a,
1784-.tabs-right .nav-tabs > li > a {
1785+.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a {
1786 min-width: 74px;
1787 margin-right: 0;
1788 margin-bottom: 3px;
1789@@ -2574,7 +2378,7 @@
1790 .tabs-left .nav-tabs {
1791 float: left;
1792 margin-right: 19px;
1793- border-right: 1px solid #ddd;
1794+ border-right: 1px solid #dddddd;
1795 }
1796 .tabs-left .nav-tabs > li > a {
1797 margin-right: -1px;
1798@@ -2585,15 +2389,14 @@
1799 .tabs-left .nav-tabs > li > a:hover {
1800 border-color: #eeeeee #dddddd #eeeeee #eeeeee;
1801 }
1802-.tabs-left .nav-tabs .active > a,
1803-.tabs-left .nav-tabs .active > a:hover {
1804- border-color: #ddd transparent #ddd #ddd;
1805+.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover {
1806+ border-color: #dddddd transparent #dddddd #dddddd;
1807 *border-right-color: #ffffff;
1808 }
1809 .tabs-right .nav-tabs {
1810 float: right;
1811 margin-left: 19px;
1812- border-left: 1px solid #ddd;
1813+ border-left: 1px solid #dddddd;
1814 }
1815 .tabs-right .nav-tabs > li > a {
1816 margin-left: -1px;
1817@@ -2604,9 +2407,8 @@
1818 .tabs-right .nav-tabs > li > a:hover {
1819 border-color: #eeeeee #eeeeee #eeeeee #dddddd;
1820 }
1821-.tabs-right .nav-tabs .active > a,
1822-.tabs-right .nav-tabs .active > a:hover {
1823- border-color: #ddd #ddd #ddd transparent;
1824+.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
1825+ border-color: #dddddd #dddddd #dddddd transparent;
1826 *border-left-color: #ffffff;
1827 }
1828 .navbar {
1829@@ -2617,20 +2419,20 @@
1830 padding-left: 20px;
1831 padding-right: 20px;
1832 background-color: #2c2c2c;
1833- background-image: -moz-linear-gradient(top, #333333, #222222);
1834- background-image: -ms-linear-gradient(top, #333333, #222222);
1835- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
1836- background-image: -webkit-linear-gradient(top, #333333, #222222);
1837- background-image: -o-linear-gradient(top, #333333, #222222);
1838- background-image: linear-gradient(top, #333333, #222222);
1839+ background-image: -moz-linear-gradient(top,#333333,#222222);
1840+ background-image: -ms-linear-gradient(top,#333333,#222222);
1841+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#333333),to(#222222));
1842+ background-image: -webkit-linear-gradient(top,#333333,#222222);
1843+ background-image: -o-linear-gradient(top,#333333,#222222);
1844+ background-image: linear-gradient(top,#333333,#222222);
1845 background-repeat: repeat-x;
1846 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
1847 -webkit-border-radius: 4px;
1848 -moz-border-radius: 4px;
1849 border-radius: 4px;
1850- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
1851- -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
1852- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
1853+ -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
1854+ -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
1855+ box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
1856 }
1857 .btn-navbar {
1858 display: none;
1859@@ -2639,20 +2441,20 @@
1860 margin-left: 5px;
1861 margin-right: 5px;
1862 background-color: #2c2c2c;
1863- background-image: -moz-linear-gradient(top, #333333, #222222);
1864- background-image: -ms-linear-gradient(top, #333333, #222222);
1865- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
1866- background-image: -webkit-linear-gradient(top, #333333, #222222);
1867- background-image: -o-linear-gradient(top, #333333, #222222);
1868- background-image: linear-gradient(top, #333333, #222222);
1869+ background-image: -moz-linear-gradient(top,#333333,#222222);
1870+ background-image: -ms-linear-gradient(top,#333333,#222222);
1871+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#333333),to(#222222));
1872+ background-image: -webkit-linear-gradient(top,#333333,#222222);
1873+ background-image: -o-linear-gradient(top,#333333,#222222);
1874+ background-image: linear-gradient(top,#333333,#222222);
1875 background-repeat: repeat-x;
1876 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
1877 border-color: #222222 #222222 #000000;
1878- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
1879+ border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
1880 filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
1881- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
1882- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
1883- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
1884+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
1885+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
1886+ box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
1887 }
1888 .btn-navbar:hover,
1889 .btn-navbar:active,
1890@@ -2661,8 +2463,7 @@
1891 .btn-navbar[disabled] {
1892 background-color: #222222;
1893 }
1894-.btn-navbar:active,
1895-.btn-navbar.active {
1896+.btn-navbar:active, .btn-navbar.active {
1897 background-color: #080808 \9;
1898 }
1899 .btn-navbar .icon-bar {
1900@@ -2673,9 +2474,9 @@
1901 -webkit-border-radius: 1px;
1902 -moz-border-radius: 1px;
1903 border-radius: 1px;
1904- -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
1905- -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
1906- box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
1907+ -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.25);
1908+ -moz-box-shadow: 0 1px 0 rgba(0,0,0,.25);
1909+ box-shadow: 0 1px 0 rgba(0,0,0,.25);
1910 }
1911 .btn-navbar .icon-bar + .icon-bar {
1912 margin-top: 3px;
1913@@ -2705,8 +2506,7 @@
1914 color: #ffffff;
1915 background-color: transparent;
1916 }
1917-.navbar .btn,
1918-.navbar .btn-group {
1919+.navbar .btn, .navbar .btn-group {
1920 margin-top: 5px;
1921 }
1922 .navbar .btn-group .btn {
1923@@ -2716,22 +2516,19 @@
1924 margin-bottom: 0;
1925 *zoom: 1;
1926 }
1927-.navbar-form:before,
1928-.navbar-form:after {
1929+.navbar-form:before, .navbar-form:after {
1930 display: table;
1931 content: "";
1932 }
1933 .navbar-form:after {
1934 clear: both;
1935 }
1936-.navbar-form input,
1937-.navbar-form select {
1938+.navbar-form input, .navbar-form select {
1939 display: inline-block;
1940 margin-top: 5px;
1941 margin-bottom: 0;
1942 }
1943-.navbar-form .radio,
1944-.navbar-form .checkbox {
1945+.navbar-form .radio, .navbar-form .checkbox {
1946 margin-top: 5px;
1947 }
1948 .navbar-form input[type="image"],
1949@@ -2739,13 +2536,11 @@
1950 .navbar-form input[type="radio"] {
1951 margin-top: 3px;
1952 }
1953-.navbar-form .input-append,
1954-.navbar-form .input-prepend {
1955+.navbar-form .input-append, .navbar-form .input-prepend {
1956 margin-top: 6px;
1957 white-space: nowrap;
1958 }
1959-.navbar-form .input-append input,
1960-.navbar-form .input-prepend input {
1961+.navbar-form .input-append input, .navbar-form .input-prepend input {
1962 margin-top: 0;
1963 }
1964 .navbar-search {
1965@@ -2761,13 +2556,13 @@
1966 font-weight: normal;
1967 line-height: 1;
1968 color: #ffffff;
1969- color: rgba(255, 255, 255, 0.75);
1970- background: #666;
1971- background: rgba(255, 255, 255, 0.3);
1972- border: 1px solid #111;
1973- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
1974- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
1975- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
1976+ color: rgba(255,255,255,.75);
1977+ background: #666666;
1978+ background: rgba(255,255,255,.3);
1979+ border: 1px solid #111111;
1980+ -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
1981+ -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
1982+ box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
1983 -webkit-transition: none;
1984 -moz-transition: none;
1985 -ms-transition: none;
1986@@ -2783,18 +2578,17 @@
1987 .navbar-search .search-query:hover {
1988 color: #ffffff;
1989 background-color: #999999;
1990- background-color: rgba(255, 255, 255, 0.5);
1991+ background-color: rgba(255,255,255,.5);
1992 }
1993-.navbar-search .search-query:focus,
1994-.navbar-search .search-query.focused {
1995+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
1996 padding: 5px 10px;
1997 color: #333333;
1998 text-shadow: 0 1px 0 #ffffff;
1999 background-color: #ffffff;
2000 border: 0;
2001- -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
2002- -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
2003- box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
2004+ -webkit-box-shadow: 0 0 3px rgba(0,0,0,.15);
2005+ -moz-box-shadow: 0 0 3px rgba(0,0,0,.15);
2006+ box-shadow: 0 0 3px rgba(0,0,0,.15);
2007 outline: 0;
2008 }
2009 .navbar-fixed-top {
2010@@ -2831,15 +2625,14 @@
2011 line-height: 19px;
2012 color: #999999;
2013 text-decoration: none;
2014- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2015+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
2016 }
2017 .navbar .nav > li > a:hover {
2018 background-color: transparent;
2019 color: #ffffff;
2020 text-decoration: none;
2021 }
2022-.navbar .nav .active > a,
2023-.navbar .nav .active > a:hover {
2024+.navbar .nav .active > a, .navbar .nav .active > a:hover {
2025 color: #ffffff;
2026 text-decoration: none;
2027 background-color: #222222;
2028@@ -2867,8 +2660,8 @@
2029 display: inline-block;
2030 border-left: 7px solid transparent;
2031 border-right: 7px solid transparent;
2032- border-bottom: 7px solid #ccc;
2033- border-bottom-color: rgba(0, 0, 0, 0.2);
2034+ border-bottom: 7px solid #cccccc;
2035+ border-bottom-color: rgba(0,0,0,.2);
2036 position: absolute;
2037 top: -7px;
2038 left: 9px;
2039@@ -2883,8 +2676,7 @@
2040 top: -6px;
2041 left: 10px;
2042 }
2043-.navbar .nav .dropdown-toggle .caret,
2044-.navbar .nav .open.dropdown .caret {
2045+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
2046 border-top-color: #ffffff;
2047 }
2048 .navbar .nav .active .caret {
2049@@ -2915,15 +2707,15 @@
2050 padding: 7px 14px;
2051 margin: 0 0 18px;
2052 background-color: #fbfbfb;
2053- background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
2054- background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
2055- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
2056- background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
2057- background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
2058- background-image: linear-gradient(top, #ffffff, #f5f5f5);
2059+ background-image: -moz-linear-gradient(top,#ffffff,#f5f5f5);
2060+ background-image: -ms-linear-gradient(top,#ffffff,#f5f5f5);
2061+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#f5f5f5));
2062+ background-image: -webkit-linear-gradient(top,#ffffff,#f5f5f5);
2063+ background-image: -o-linear-gradient(top,#ffffff,#f5f5f5);
2064+ background-image: linear-gradient(top,#ffffff,#f5f5f5);
2065 background-repeat: repeat-x;
2066 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
2067- border: 1px solid #ddd;
2068+ border: 1px solid #dddddd;
2069 -webkit-border-radius: 3px;
2070 -moz-border-radius: 3px;
2071 border-radius: 3px;
2072@@ -2949,17 +2741,15 @@
2073 .pagination ul {
2074 display: inline-block;
2075 *display: inline;
2076- /* IE7 inline-block hack */
2077-
2078 *zoom: 1;
2079 margin-left: 0;
2080 margin-bottom: 0;
2081 -webkit-border-radius: 3px;
2082 -moz-border-radius: 3px;
2083 border-radius: 3px;
2084- -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
2085- -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
2086- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
2087+ -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
2088+ -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
2089+ box-shadow: 0 1px 2px rgba(0,0,0,.05);
2090 }
2091 .pagination li {
2092 display: inline;
2093@@ -2969,19 +2759,17 @@
2094 padding: 0 14px;
2095 line-height: 34px;
2096 text-decoration: none;
2097- border: 1px solid #ddd;
2098+ border: 1px solid #dddddd;
2099 border-left-width: 0;
2100 }
2101-.pagination a:hover,
2102-.pagination .active a {
2103+.pagination a:hover, .pagination .active a {
2104 background-color: #f5f5f5;
2105 }
2106 .pagination .active a {
2107 color: #999999;
2108 cursor: default;
2109 }
2110-.pagination .disabled a,
2111-.pagination .disabled a:hover {
2112+.pagination .disabled a, .pagination .disabled a:hover {
2113 color: #999999;
2114 background-color: transparent;
2115 cursor: default;
2116@@ -3010,8 +2798,7 @@
2117 text-align: center;
2118 *zoom: 1;
2119 }
2120-.pager:before,
2121-.pager:after {
2122+.pager:before, .pager:after {
2123 display: table;
2124 content: "";
2125 }
2126@@ -3024,8 +2811,8 @@
2127 .pager a {
2128 display: inline-block;
2129 padding: 5px 14px;
2130- background-color: #fff;
2131- border: 1px solid #ddd;
2132+ background-color: #ffffff;
2133+ border: 1px solid #dddddd;
2134 -webkit-border-radius: 15px;
2135 -moz-border-radius: 15px;
2136 border-radius: 15px;
2137@@ -3064,8 +2851,7 @@
2138 .modal-backdrop.fade {
2139 opacity: 0;
2140 }
2141-.modal-backdrop,
2142-.modal-backdrop.fade.in {
2143+.modal-backdrop, .modal-backdrop.fade.in {
2144 opacity: 0.8;
2145 filter: alpha(opacity=80);
2146 }
2147@@ -3079,17 +2865,15 @@
2148 width: 560px;
2149 margin: -250px 0 0 -280px;
2150 background-color: #ffffff;
2151- border: 1px solid #999;
2152- border: 1px solid rgba(0, 0, 0, 0.3);
2153- *border: 1px solid #999;
2154- /* IE6-7 */
2155-
2156+ border: 1px solid #999999;
2157+ border: 1px solid rgba(0,0,0,.3);
2158+ *border: 1px solid #999999;
2159 -webkit-border-radius: 6px;
2160 -moz-border-radius: 6px;
2161 border-radius: 6px;
2162- -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2163- -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2164- box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2165+ -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2166+ -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2167+ box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2168 -webkit-background-clip: padding-box;
2169 -moz-background-clip: padding-box;
2170 background-clip: padding-box;
2171@@ -3107,7 +2891,7 @@
2172 }
2173 .modal-header {
2174 padding: 9px 15px;
2175- border-bottom: 1px solid #eee;
2176+ border-bottom: 1px solid #eeeeee;
2177 }
2178 .modal-header .close {
2179 margin-top: 2px;
2180@@ -3122,7 +2906,7 @@
2181 padding: 14px 15px 15px;
2182 margin-bottom: 0;
2183 background-color: #f5f5f5;
2184- border-top: 1px solid #ddd;
2185+ border-top: 1px solid #dddddd;
2186 -webkit-border-radius: 0 0 6px 6px;
2187 -moz-border-radius: 0 0 6px 6px;
2188 border-radius: 0 0 6px 6px;
2189@@ -3131,8 +2915,7 @@
2190 box-shadow: inset 0 1px 0 #ffffff;
2191 *zoom: 1;
2192 }
2193-.modal-footer:before,
2194-.modal-footer:after {
2195+.modal-footer:before, .modal-footer:after {
2196 display: table;
2197 content: "";
2198 }
2199@@ -3280,19 +3063,19 @@
2200 width: 280px;
2201 overflow: hidden;
2202 background: #000000;
2203- background: rgba(0, 0, 0, 0.8);
2204+ background: rgba(0,0,0,.8);
2205 -webkit-border-radius: 6px;
2206 -moz-border-radius: 6px;
2207 border-radius: 6px;
2208- -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2209- -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2210- box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2211+ -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2212+ -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2213+ box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2214 }
2215 .popover-title {
2216 padding: 9px 15px;
2217 line-height: 1;
2218 background-color: #f5f5f5;
2219- border-bottom: 1px solid #eee;
2220+ border-bottom: 1px solid #eeeeee;
2221 -webkit-border-radius: 3px 3px 0 0;
2222 -moz-border-radius: 3px 3px 0 0;
2223 border-radius: 3px 3px 0 0;
2224@@ -3307,9 +3090,7 @@
2225 -moz-background-clip: padding-box;
2226 background-clip: padding-box;
2227 }
2228-.popover-content p,
2229-.popover-content ul,
2230-.popover-content ol {
2231+.popover-content p, .popover-content ul, .popover-content ol {
2232 margin-bottom: 0;
2233 }
2234 .thumbnails {
2235@@ -3317,8 +3098,7 @@
2236 list-style: none;
2237 *zoom: 1;
2238 }
2239-.thumbnails:before,
2240-.thumbnails:after {
2241+.thumbnails:before, .thumbnails:after {
2242 display: table;
2243 content: "";
2244 }
2245@@ -3333,19 +3113,19 @@
2246 display: block;
2247 padding: 4px;
2248 line-height: 1;
2249- border: 1px solid #ddd;
2250+ border: 1px solid #dddddd;
2251 -webkit-border-radius: 4px;
2252 -moz-border-radius: 4px;
2253 border-radius: 4px;
2254- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
2255- -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
2256- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
2257+ -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.075);
2258+ -moz-box-shadow: 0 1px 1px rgba(0,0,0,.075);
2259+ box-shadow: 0 1px 1px rgba(0,0,0,.075);
2260 }
2261 a.thumbnail:hover {
2262- border-color: #0088cc;
2263- -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
2264- -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
2265- box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
2266+ border-color: #dd4814;
2267+ -webkit-box-shadow: 0 1px 4px rgba(0,105,214,.25);
2268+ -moz-box-shadow: 0 1px 4px rgba(0,105,214,.25);
2269+ box-shadow: 0 1px 4px rgba(0,105,214,.25);
2270 }
2271 .thumbnail > img {
2272 display: block;
2273@@ -3358,10 +3138,10 @@
2274 }
2275 .label {
2276 padding: 2px 4px 3px;
2277- font-size: 11.049999999999999px;
2278+ font-size: 11.05px;
2279 font-weight: bold;
2280 color: #ffffff;
2281- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2282+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
2283 background-color: #999999;
2284 -webkit-border-radius: 3px;
2285 -moz-border-radius: 3px;
2286@@ -3423,18 +3203,18 @@
2287 overflow: hidden;
2288 height: 18px;
2289 margin-bottom: 18px;
2290- background-color: #f7f7f7;
2291- background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
2292- background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
2293- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
2294- background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
2295- background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
2296- background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
2297+ background-color: #f6f6f6;
2298+ background-image: -moz-linear-gradient(top,#f5f5f5,#f9f9f9);
2299+ background-image: -ms-linear-gradient(top,#f5f5f5,#f9f9f9);
2300+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));
2301+ background-image: -webkit-linear-gradient(top,#f5f5f5,#f9f9f9);
2302+ background-image: -o-linear-gradient(top,#f5f5f5,#f9f9f9);
2303+ background-image: linear-gradient(top,#f5f5f5,#f9f9f9);
2304 background-repeat: repeat-x;
2305 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
2306- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
2307- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
2308- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
2309+ -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
2310+ -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
2311+ box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
2312 -webkit-border-radius: 4px;
2313 -moz-border-radius: 4px;
2314 border-radius: 4px;
2315@@ -3445,36 +3225,36 @@
2316 color: #ffffff;
2317 font-size: 12px;
2318 text-align: center;
2319- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2320- background-color: #0e90d2;
2321- background-image: -moz-linear-gradient(top, #149bdf, #0480be);
2322- background-image: -ms-linear-gradient(top, #149bdf, #0480be);
2323- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
2324- background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
2325- background-image: -o-linear-gradient(top, #149bdf, #0480be);
2326- background-image: linear-gradient(top, #149bdf, #0480be);
2327+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
2328+ background-color: #0d90d1;
2329+ background-image: -moz-linear-gradient(top,#149bdf,#0480be);
2330+ background-image: -ms-linear-gradient(top,#149bdf,#0480be);
2331+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));
2332+ background-image: -webkit-linear-gradient(top,#149bdf,#0480be);
2333+ background-image: -o-linear-gradient(top,#149bdf,#0480be);
2334+ background-image: linear-gradient(top,#149bdf,#0480be);
2335 background-repeat: repeat-x;
2336 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
2337- -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
2338- -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
2339- box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
2340+ -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
2341+ -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
2342+ box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
2343 -webkit-box-sizing: border-box;
2344 -moz-box-sizing: border-box;
2345 box-sizing: border-box;
2346- -webkit-transition: width 0.6s ease;
2347- -moz-transition: width 0.6s ease;
2348- -ms-transition: width 0.6s ease;
2349- -o-transition: width 0.6s ease;
2350- transition: width 0.6s ease;
2351+ -webkit-transition: width .6s ease;
2352+ -moz-transition: width .6s ease;
2353+ -ms-transition: width .6s ease;
2354+ -o-transition: width .6s ease;
2355+ transition: width .6s ease;
2356 }
2357 .progress-striped .bar {
2358 background-color: #62c462;
2359- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
2360- background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2361- background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2362- background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2363- background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2364- background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2365+ background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
2366+ background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2367+ background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2368+ background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2369+ background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2370+ background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2371 -webkit-background-size: 40px 40px;
2372 -moz-background-size: 40px 40px;
2373 -o-background-size: 40px 40px;
2374@@ -3486,64 +3266,64 @@
2375 animation: progress-bar-stripes 2s linear infinite;
2376 }
2377 .progress-danger .bar {
2378- background-color: #dd514c;
2379- background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
2380- background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
2381- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
2382- background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
2383- background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
2384- background-image: linear-gradient(top, #ee5f5b, #c43c35);
2385+ background-color: #dd514b;
2386+ background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
2387+ background-image: -ms-linear-gradient(top,#ee5f5b,#c43c35);
2388+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
2389+ background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
2390+ background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
2391+ background-image: linear-gradient(top,#ee5f5b,#c43c35);
2392 background-repeat: repeat-x;
2393 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
2394 }
2395 .progress-danger.progress-striped .bar {
2396 background-color: #ee5f5b;
2397- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
2398- background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2399- background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2400- background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2401- background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2402- background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2403+ background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
2404+ background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2405+ background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2406+ background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2407+ background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2408+ background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2409 }
2410 .progress-success .bar {
2411- background-color: #5eb95e;
2412- background-image: -moz-linear-gradient(top, #62c462, #57a957);
2413- background-image: -ms-linear-gradient(top, #62c462, #57a957);
2414- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
2415- background-image: -webkit-linear-gradient(top, #62c462, #57a957);
2416- background-image: -o-linear-gradient(top, #62c462, #57a957);
2417- background-image: linear-gradient(top, #62c462, #57a957);
2418+ background-color: #5db95d;
2419+ background-image: -moz-linear-gradient(top,#62c462,#57a957);
2420+ background-image: -ms-linear-gradient(top,#62c462,#57a957);
2421+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
2422+ background-image: -webkit-linear-gradient(top,#62c462,#57a957);
2423+ background-image: -o-linear-gradient(top,#62c462,#57a957);
2424+ background-image: linear-gradient(top,#62c462,#57a957);
2425 background-repeat: repeat-x;
2426 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
2427 }
2428 .progress-success.progress-striped .bar {
2429 background-color: #62c462;
2430- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
2431- background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2432- background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2433- background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2434- background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2435- background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2436+ background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
2437+ background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2438+ background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2439+ background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2440+ background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2441+ background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2442 }
2443 .progress-info .bar {
2444 background-color: #4bb1cf;
2445- background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
2446- background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
2447- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
2448- background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
2449- background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
2450- background-image: linear-gradient(top, #5bc0de, #339bb9);
2451+ background-image: -moz-linear-gradient(top,#5bc0de,#339bb9);
2452+ background-image: -ms-linear-gradient(top,#5bc0de,#339bb9);
2453+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));
2454+ background-image: -webkit-linear-gradient(top,#5bc0de,#339bb9);
2455+ background-image: -o-linear-gradient(top,#5bc0de,#339bb9);
2456+ background-image: linear-gradient(top,#5bc0de,#339bb9);
2457 background-repeat: repeat-x;
2458 filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
2459 }
2460 .progress-info.progress-striped .bar {
2461 background-color: #5bc0de;
2462- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
2463- background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2464- background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2465- background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2466- background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2467- background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
2468+ background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
2469+ background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2470+ background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2471+ background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2472+ background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2473+ background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
2474 }
2475 .accordion {
2476 margin-bottom: 18px;
2477@@ -3579,26 +3359,23 @@
2478 .carousel .item {
2479 display: none;
2480 position: relative;
2481- -webkit-transition: 0.6s ease-in-out left;
2482- -moz-transition: 0.6s ease-in-out left;
2483- -ms-transition: 0.6s ease-in-out left;
2484- -o-transition: 0.6s ease-in-out left;
2485- transition: 0.6s ease-in-out left;
2486+ -webkit-transition: .6s ease-in-out left;
2487+ -moz-transition: .6s ease-in-out left;
2488+ -ms-transition: .6s ease-in-out left;
2489+ -o-transition: .6s ease-in-out left;
2490+ transition: .6s ease-in-out left;
2491 }
2492 .carousel .item > img {
2493 display: block;
2494 line-height: 1;
2495 }
2496-.carousel .active,
2497-.carousel .next,
2498-.carousel .prev {
2499+.carousel .active, .carousel .next, .carousel .prev {
2500 display: block;
2501 }
2502 .carousel .active {
2503 left: 0;
2504 }
2505-.carousel .next,
2506-.carousel .prev {
2507+.carousel .next, .carousel .prev {
2508 position: absolute;
2509 top: 0;
2510 width: 100%;
2511@@ -3609,8 +3386,7 @@
2512 .carousel .prev {
2513 left: -100%;
2514 }
2515-.carousel .next.left,
2516-.carousel .prev.right {
2517+.carousel .next.left, .carousel .prev.right {
2518 left: 0;
2519 }
2520 .carousel .active.left {
2521@@ -3656,10 +3432,9 @@
2522 bottom: 0;
2523 padding: 10px 15px 5px;
2524 background: #333333;
2525- background: rgba(0, 0, 0, 0.75);
2526+ background: rgba(0,0,0,.75);
2527 }
2528-.carousel-caption h4,
2529-.carousel-caption p {
2530+.carousel-caption h4, .carousel-caption p {
2531 color: #ffffff;
2532 }
2533 .hero-unit {
2534@@ -3696,7 +3471,166 @@
2535 .invisible {
2536 visibility: hidden;
2537 }
2538-/* new clearfix */
2539+.datepicker {
2540+ top: 0;
2541+ left: 0;
2542+ padding: 4px;
2543+ margin-top: 1px;
2544+ -webkit-border-radius: 4px;
2545+ -moz-border-radius: 4px;
2546+ border-radius: 4px;
2547+}
2548+.datepicker:before {
2549+ content: '';
2550+ display: inline-block;
2551+ border-left: 7px solid transparent;
2552+ border-right: 7px solid transparent;
2553+ border-bottom: 7px solid #cccccc;
2554+ border-bottom-color: rgba(0,0,0,0.2);
2555+ position: absolute;
2556+ top: -7px;
2557+ left: 6px;
2558+}
2559+.datepicker:after {
2560+ content: '';
2561+ display: inline-block;
2562+ border-left: 6px solid transparent;
2563+ border-right: 6px solid transparent;
2564+ border-bottom: 6px solid #ffffff;
2565+ position: absolute;
2566+ top: -6px;
2567+ left: 7px;
2568+}
2569+.datepicker > div {
2570+ display: none;
2571+}
2572+.datepicker table {
2573+ width: 100%;
2574+ margin: 0;
2575+}
2576+.datepicker td, .datepicker th {
2577+ text-align: center;
2578+ width: 20px;
2579+ height: 20px;
2580+ -webkit-border-radius: 4px;
2581+ -moz-border-radius: 4px;
2582+ border-radius: 4px;
2583+}
2584+.datepicker td.day:hover {
2585+ background: #eeeeee;
2586+ cursor: pointer;
2587+}
2588+.datepicker td.day.disabled {
2589+ color: #eeeeee;
2590+}
2591+.datepicker td.old, .datepicker td.new {
2592+ color: #999999;
2593+}
2594+.datepicker td.active, .datepicker td.active:hover {
2595+ color: #ffffff;
2596+ background-color: #006dcc;
2597+ background-image: -moz-linear-gradient(top,#dd4814,#dd4a14);
2598+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4814),to(#dd4a14));
2599+ background-image: -webkit-linear-gradient(top,#dd4814,#dd4a14);
2600+ background-image: -o-linear-gradient(top,#dd4814,#dd4a14);
2601+ background-image: linear-gradient(to bottom,#dd4814,#dd4a14);
2602+ background-repeat: repeat-x;
2603+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdd4814', endColorstr='#ffdd4a14', GradientType=0);
2604+ border-color: #dd4a14 #dd4a14 #002a80;
2605+ border-color: rgba(0,0,0,0.1)rgba(0,0,0,0.1)rgba(0,0,0,0.25);
2606+ *background-color: #dd4a14;
2607+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
2608+ color: #ffffff;
2609+ text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
2610+}
2611+.datepicker td.active:hover,
2612+.datepicker td.active:hover:hover,
2613+.datepicker td.active:focus,
2614+.datepicker td.active:hover:focus,
2615+.datepicker td.active:active,
2616+.datepicker td.active:hover:active,
2617+.datepicker td.active.active,
2618+.datepicker td.active:hover.active,
2619+.datepicker td.active.disabled,
2620+.datepicker td.active:hover.disabled,
2621+.datepicker td.active[disabled],
2622+.datepicker td.active:hover[disabled] {
2623+ color: #ffffff;
2624+ background-color: #dd4a14;
2625+ *background-color: #003bb3;
2626+}
2627+.datepicker td.active:active,
2628+.datepicker td.active:hover:active,
2629+.datepicker td.active.active,
2630+.datepicker td.active:hover.active {
2631+ background-color: #003399 \9;
2632+}
2633+.datepicker td span {
2634+ display: block;
2635+ width: 47px;
2636+ height: 54px;
2637+ line-height: 54px;
2638+ float: left;
2639+ margin: 2px;
2640+ cursor: pointer;
2641+ -webkit-border-radius: 4px;
2642+ -moz-border-radius: 4px;
2643+ border-radius: 4px;
2644+}
2645+.datepicker td span:hover {
2646+ background: #eeeeee;
2647+}
2648+.datepicker td span.active {
2649+ color: #ffffff;
2650+ background-color: #006dcc;
2651+ background-image: -moz-linear-gradient(top,#dd4814,#dd4a14);
2652+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4814),to(#dd4a14));
2653+ background-image: -webkit-linear-gradient(top,#dd4814,#dd4a14);
2654+ background-image: -o-linear-gradient(top,#dd4814,#dd4a14);
2655+ background-image: linear-gradient(to bottom,#dd4814,#dd4a14);
2656+ background-repeat: repeat-x;
2657+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdd4814', endColorstr='#ffdd4a14', GradientType=0);
2658+ border-color: #dd4a14 #dd4a14 #002a80;
2659+ border-color: rgba(0,0,0,0.1)rgba(0,0,0,0.1)rgba(0,0,0,0.25);
2660+ *background-color: #dd4a14;
2661+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
2662+ color: #ffffff;
2663+ text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
2664+}
2665+.datepicker td span.active:hover,
2666+.datepicker td span.active:focus,
2667+.datepicker td span.active:active,
2668+.datepicker td span.active.active,
2669+.datepicker td span.active.disabled,
2670+.datepicker td span.active[disabled] {
2671+ color: #ffffff;
2672+ background-color: #dd4a14;
2673+ *background-color: #003bb3;
2674+}
2675+.datepicker td span.active:active, .datepicker td span.active.active {
2676+ background-color: #003399 \9;
2677+}
2678+.datepicker td span.old {
2679+ color: #999999;
2680+}
2681+.datepicker th.switch {
2682+ width: 145px;
2683+}
2684+.datepicker th.next, .datepicker th.prev {
2685+ font-size: 21px;
2686+}
2687+.datepicker thead tr:first-child th {
2688+ cursor: pointer;
2689+}
2690+.datepicker thead tr:first-child th:hover {
2691+ background: #eeeeee;
2692+}
2693+.input-append.date .add-on i, .input-prepend.date .add-on i {
2694+ display: block;
2695+ cursor: pointer;
2696+ width: 16px;
2697+ height: 16px;
2698+}
2699 .clearfix:after {
2700 visibility: hidden;
2701 display: block;
2702@@ -3708,18 +3642,10 @@
2703 * html .clearfix {
2704 zoom: 1;
2705 }
2706-/* IE6 */
2707-*:first-child + html .clearfix {
2708+* :first-child + html .clearfix {
2709 zoom: 1;
2710 }
2711-/* IE7 */
2712-@font-face {
2713- font-family: 'anivers';
2714- src: url('/static/dashboard/fonts/Anivers_Regular-webfont.eot?5f61443eb372');
2715- src: url('/static/dashboard/fonts/Anivers_Regular-webfont.eot?iefix') format('eot'), url('/static/dashboard/fonts/Anivers_Regular-webfont.woff?2c3db88030ec') format('woff'), url('/static/dashboard/fonts/Anivers_Regular-webfont.ttf?6a7822aa21cf') format('truetype'), url('/static/dashboard/fonts/Anivers_Regular-webfont.svg#webfont3JLVF59W') format('svg');
2716- font-weight: normal;
2717- font-style: normal;
2718-}
2719+
2720 a {
2721 color: #dd4814;
2722 }
2723@@ -3753,9 +3679,9 @@
2724 font-size: 11px;
2725 margin-left: 20px;
2726 padding: 0;
2727- background-image: url('../../dashboard/img/drop_arrow.png?2ec1100baed3');
2728- border: 1px solid #c0d9e4;
2729- background-color: #e9f5fa;
2730+ background-image: url('/static/dashboard/img/drop_arrow.png');
2731+ border: 1px solid #77216f;
2732+ background-color: #eddbea;
2733 background-repeat: no-repeat;
2734 }
2735 .topbar .switcher_bar a {
2736@@ -3767,18 +3693,18 @@
2737 width: 130px;
2738 }
2739 #user_info {
2740- color: #888;
2741+ color: #ffffff;
2742 margin: auto 0;
2743 }
2744 #user_info > a {
2745 margin-left: 25px;
2746- font-size: 11px;
2747+ font-size: 11px !important;
2748+ color: #ffffff;
2749 }
2750 .page-header {
2751 margin: 0;
2752 padding: 0;
2753 border: 0;
2754- font-family: anivers;
2755 }
2756 h2 {
2757 color: #6a6a6a;
2758@@ -3786,15 +3712,14 @@
2759 font-weight: normal;
2760 }
2761 body {
2762- background-color: #fff;
2763+ background-color: #ffffff;
2764 min-width: 890px;
2765 }
2766-
2767-
2768-
2769-/* Login Splash Page */
2770+#splash {
2771+ background: #fafafa url(../img/dots.png) repeat center top;
2772+}
2773 #splash .login {
2774- background: #DD4814 url(../img/ubuntu.png) no-repeat center 35px;
2775+ background: #dd4814 url('../img/ubuntu.png') no-repeat center 35px;
2776 position: absolute;
2777 top: 80px;
2778 left: 50%;
2779@@ -3806,9 +3731,9 @@
2780 -webkit-border-radius: 6px;
2781 -moz-border-radius: 6px;
2782 border-radius: 6px;
2783- -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2784- -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2785- box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
2786+ -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2787+ -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2788+ box-shadow: 0 3px 7px rgba(0,0,0,0.3);
2789 -webkit-background-clip: padding-box;
2790 -moz-background-clip: padding-box;
2791 background-clip: padding-box;
2792@@ -3816,13 +3741,20 @@
2793
2794 #splash .login form,
2795 #splash .login .modal-header {
2796- background-color: #fff;
2797-}
2798-
2799-#splash .login input {
2800+ background-color: #ffffff;
2801+}
2802+
2803+#splash .login .modal-header {
2804+ border-top: 1px solid #c44012;
2805+}
2806+
2807+#splash .login form .error {
2808+ width: 100%;
2809+}
2810+#splash .login form input {
2811 width: 350px;
2812 }
2813-#splash .login select {
2814+#splash .login form select {
2815 width: 360px;
2816 }
2817 #splash .help-block {
2818@@ -3832,27 +3764,27 @@
2819 margin-top: 190px;
2820 }
2821 .nav li a {
2822- color: #8EACB7;
2823+ color: #8eacb7;
2824 text-shadow: none;
2825 }
2826 .container-fluid {
2827 padding-left: 0;
2828 }
2829 .sidebar {
2830- background: #edf9ff;
2831+ background: #f2f2f2;
2832 border-right: 5px solid #e5e5e5;
2833 border-bottom: 5px solid #e5e5e5;
2834 float: left;
2835 }
2836 .sidebar h4 {
2837 margin-left: 14px;
2838- color: #999;
2839+ color: #999999;
2840 }
2841 .sidebar .nav-tabs {
2842- margin-top: -34px;
2843+ margin-top: 10px;
2844 }
2845 .sidebar .nav-tabs li.active a {
2846- background-color: #edf9ff;
2847+ background-color: #f2f2f2;
2848 }
2849 h1.brand {
2850 width: 100%;
2851@@ -3861,7 +3793,7 @@
2852 padding-bottom: 40px;
2853 }
2854 h1.brand a {
2855- background: url(../img/ubuntu.png) top left no-repeat;
2856+ background: url('../img/logo.png') top left no-repeat;
2857 display: block;
2858 float: left;
2859 width: 116px;
2860@@ -3871,7 +3803,6 @@
2861 margin-top: 15px;
2862 margin-bottom: 25px;
2863 }
2864-/* Tenant Dropdown */
2865 a.current_item {
2866 width: 163px;
2867 float: left;
2868@@ -3879,11 +3810,12 @@
2869 a.current_item:hover {
2870 text-decoration: none;
2871 }
2872-a.current_item:hover h3,
2873-a.current_item:hover h4 {
2874+a.current_item:hover h3, a.current_item:hover h4 {
2875 color: #39738c;
2876 }
2877 .sidebar .switcher_bar {
2878+ background-color: #eddbea;
2879+ border: 1px solid #77216f;
2880 width: 190px;
2881 height: 38px;
2882 padding: 5px 0;
2883@@ -3893,39 +3825,49 @@
2884 .sidebar .switcher_bar a.dropdown-toggle {
2885 display: block;
2886 padding: 5px 0;
2887- background-image: url('../../dashboard/img/drop_arrow.png');
2888- border: 1px solid #c0d9e4;
2889- background-color: #e9f5fa;
2890+ background-image: url('/static/dashboard/img/drop_arrow.png');
2891+ border: 1px solid #77216f;
2892+ background-color: #eddbea;
2893 background-repeat: no-repeat;
2894 background-position: 167px 23px;
2895 }
2896 .sidebar .switcher_bar a.dropdown-toggle:hover {
2897 text-decoration: none;
2898- background-color: #cde8f4;
2899+ background-color: #dbb6d4;
2900 }
2901 .sidebar .switcher_bar:focus {
2902 outline: none;
2903 }
2904 .sidebar .switcher_bar h3 {
2905- color: #4790ae;
2906+ color: #2c001e;
2907 font-size: 16px;
2908 margin: -6px 0 0 14px;
2909 padding: 0;
2910+ overflow: hidden;
2911+ text-overflow: ellipsis;
2912+ white-space: nowrap;
2913+}
2914+.sidebar .switcher_bar h3:hover {
2915+ white-space: normal;
2916+ overflow: visible;
2917+ text-overflow: none;
2918+ padding-right: 1em;
2919+ word-wrap: break-word;
2920 }
2921 .sidebar .switcher_bar h4 {
2922- color: #6fabc4;
2923+ color: #5e2750;
2924 font-size: 10px;
2925 text-transform: uppercase;
2926 font-weight: normal;
2927 padding: 0;
2928 }
2929 .sidebar .switcher_bar ul {
2930- border: 1px solid #c0d9e4;
2931+ border: 1px solid #77216f;
2932 margin-left: -1px;
2933 width: 190px;
2934 }
2935 .sidebar .switcher_bar li a:hover {
2936- background: #92d6f1;
2937+ background: #77216f;
2938 }
2939 #usage {
2940 margin-bottom: 25px;
2941@@ -3986,43 +3928,40 @@
2942 border: none;
2943 }
2944 .table-bordered tr.table_caption + tr th {
2945- border-top: 1px solid #ddd;
2946+ border-top: 1px solid #dddddd;
2947 }
2948 .table-bordered tr.table_caption + tr th:first-child,
2949 .table-bordered tr.table_caption + tr th.hide + th {
2950 -moz-border-radius-topleft: 4px;
2951 -webkit-border-top-left-radius: 4px;
2952 border-top-left-radius: 4px;
2953- border-left: 1px solid #ddd;
2954+ border-left: 1px solid #dddddd;
2955 }
2956 .table-bordered tr.table_caption + tr th:last-child {
2957 -moz-border-radius-topright: 4px;
2958 -webkit-border-top-right-radius: 4px;
2959 border-top-right-radius: 4px;
2960- border-right: 1px solid #ddd;
2961-}
2962-.table-bordered tbody tr td:first-child,
2963-.table-bordered tfoot tr td:first-child {
2964- border-left: 1px solid #ddd;
2965-}
2966-.table-bordered tbody tr td:last-child,
2967-.table-bordered tfoot tr td:last-child {
2968- border-right: 1px solid #ddd;
2969-}
2970-.table-bordered tfoot tr td:first-child {
2971- border-bottom: 1px solid #ddd;
2972+ border-right: 1px solid #dddddd;
2973+}
2974+.table-bordered tbody tr td:first-child, .table-bordered tfoot tr td:first-child {
2975+ border-left: 1px solid #dddddd;
2976+}
2977+.table-bordered tbody tr td:last-child, .table-bordered tfoot tr td:last-child {
2978+ border-right: 1px solid #dddddd;
2979+}
2980+.table-bordered tfoot tr td:first-child {
2981+ border-bottom: 1px solid #dddddd;
2982 -moz-border-radius-bottomleft: 4px;
2983 -webkit-border-bottom-left-radius: 4px;
2984 border-bottom-left-radius: 4px;
2985 }
2986 .table-bordered tfoot tr td:last-child {
2987- border-bottom: 1px solid #ddd;
2988+ border-bottom: 1px solid #dddddd;
2989 -moz-border-radius-bottomright: 4px;
2990 -webkit-border-bottom-right-radius: 4px;
2991 border-bottom-right-radius: 4px;
2992 }
2993-.table_title h3,
2994-.table_header h3 {
2995+.table_title h3, .table_header h3 {
2996 font-family: anivers;
2997 font-weight: normal;
2998 font-size: 24px;
2999@@ -4034,6 +3973,7 @@
3000 }
3001 .table th.header:hover {
3002 background-color: #e8e8e8;
3003+ text-decoration: underline;
3004 }
3005 .table tbody td.anchor a {
3006 display: block;
3007@@ -4043,29 +3983,26 @@
3008 background-color: transparent;
3009 cursor: default;
3010 }
3011-.table th.headerSortUp:hover,
3012-.table th.headerSortDown:hover {
3013+.table th.headerSortUp:hover, .table th.headerSortDown:hover {
3014 background-color: #dfdfdf;
3015 }
3016-.table th.headerSortUp,
3017-.table th.headerSortDown {
3018+.table th.headerSortUp, .table th.headerSortDown {
3019 background-color: #dfdfdf;
3020 background-repeat: no-repeat;
3021 background-position: 98% center;
3022 }
3023 .table th.headerSortDown {
3024- background-image: url('../../dashboard/img/drop_arrow.png?2ec1100baed3');
3025+ background-image: url('/static/dashboard/img/drop_arrow.png');
3026 }
3027 .table th.headerSortUp {
3028- background-image: url('../../dashboard/img/up_arrow.png?4293b62aa222');
3029+ background-image: url('/static/dashboard/img/up_arrow.png');
3030 }
3031-.table tr.summation td:first-child,
3032-.table tr.summation td:last-child {
3033+.table tr.summation td:first-child, .table tr.summation td:last-child {
3034 border-radius: 0;
3035 border-bottom: 0 none;
3036 }
3037 th {
3038- background: #F7F2F6;
3039+ background: #f7f2f6;
3040 }
3041 td.anchor {
3042 padding: 0;
3043@@ -4080,17 +4017,18 @@
3044 margin: 10px 0 20px 0;
3045 }
3046 .main_nav a {
3047- color: #999;
3048+ color: #999999;
3049 width: 185px;
3050 padding: 10px;
3051 display: block;
3052 margin-left: 20px;
3053 }
3054 .main_nav a.active {
3055- background: #fff;
3056+ background: #ffffff;
3057 border: 2px solid #d8d8d8;
3058 border-right: 0;
3059- border-bottom-color: #ccc;
3060+ border-bottom-color: #cccccc;
3061+ color: #5e2750;
3062 }
3063 table form {
3064 margin-bottom: 0;
3065@@ -4104,9 +4042,9 @@
3066 width: 300px;
3067 }
3068 .messages .alert-block {
3069- -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
3070- -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
3071- box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
3072+ -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
3073+ -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
3074+ box-shadow: 0 3px 7px rgba(0,0,0,0.3);
3075 }
3076 .messages .alert-block.alert-error {
3077 border: 1px solid #9d261d;
3078@@ -4118,9 +4056,7 @@
3079 margin-top: -23px;
3080 margin-right: -23px;
3081 }
3082-.modal > form,
3083-.login > form,
3084-.alert-actions > form {
3085+.modal > form, .login > form, .alert-actions > form {
3086 margin-bottom: 0;
3087 }
3088 .alert-block p {
3089@@ -4155,8 +4091,8 @@
3090 text-align: center;
3091 }
3092 .table tfoot tr td {
3093- border-top: 1px solid #DDD;
3094- background-color: #F1F1F1;
3095+ border-top: 1px solid #dddddd;
3096+ background-color: #f1f1f1;
3097 font-size: 11px;
3098 line-height: 14px;
3099 }
3100@@ -4164,30 +4100,113 @@
3101 float: right;
3102 min-width: 400px;
3103 }
3104-.table_actions .table_search {
3105+.table_actions .table_search, .table_actions .table_filter {
3106 display: inline-block;
3107 }
3108 .table_search input {
3109- background: url('../../dashboard/img/search.png?781fb162b111') no-repeat 195px 5px;
3110+ background: url('/static/dashboard/img/search.png') no-repeat 195px 5px;
3111 display: inline-block;
3112 margin-bottom: 0;
3113 }
3114-.table_actions a,
3115-.table_actions button {
3116+.table_actions a, .table_actions button {
3117 float: right;
3118 margin-left: 10px;
3119 }
3120 .table_actions button.filter {
3121 margin-left: 0;
3122 }
3123+.table_actions a.btn-create, .table_actions a.btn-launch {
3124+ padding-left: 23px;
3125+ position: relative;
3126+}
3127+.table_actions a.btn-create:before, .table_actions a.btn-launch:before {
3128+ display: inline-block;
3129+ content: "";
3130+ width: 18px;
3131+ height: 20px;
3132+ margin-top: 1px;
3133+ *margin-right: .3em;
3134+ line-height: 14px;
3135+ background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
3136+ background-position: -403px -92px;
3137+ background-repeat: no-repeat;
3138+ position: absolute;
3139+ top: 0px;
3140+ left: 0px;
3141+}
3142+.table_actions a.btn-download {
3143+ padding-left: 23px;
3144+ position: relative;
3145+}
3146+.table_actions a.btn-download:before {
3147+ display: inline-block;
3148+ content: "";
3149+ width: 18px;
3150+ height: 20px;
3151+ margin-top: 1px;
3152+ *margin-right: .3em;
3153+ line-height: 14px;
3154+ background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
3155+ background-position: -91px -19px;
3156+ background-repeat: no-repeat;
3157+ position: absolute;
3158+ top: 0px;
3159+ left: 0px;
3160+}
3161+.table_actions a.btn-upload {
3162+ padding-left: 23px;
3163+ position: relative;
3164+}
3165+.table_actions a.btn-upload:before {
3166+ display: inline-block;
3167+ content: "";
3168+ width: 18px;
3169+ height: 20px;
3170+ margin-top: 1px;
3171+ *margin-right: .3em;
3172+ line-height: 14px;
3173+ background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
3174+ background-position: -283px -92px;
3175+ background-repeat: no-repeat;
3176+ position: absolute;
3177+ top: 0px;
3178+ left: 0px;
3179+}
3180+.table_actions button.btn-delete, .table_actions button.btn-terminate {
3181+ padding-left: 23px;
3182+ position: relative;
3183+}
3184+.table_actions button.btn-delete:before, .table_actions button.btn-terminate:before {
3185+ display: inline-block;
3186+ content: "";
3187+ width: 18px;
3188+ height: 20px;
3189+ margin-top: 1px;
3190+ *margin-right: .3em;
3191+ line-height: 14px;
3192+ background-image: url('/static/bootstrap/img/glyphicons-halflings-white.png');
3193+ background-position: -451px 5px;
3194+ background-repeat: no-repeat;
3195+ position: absolute;
3196+ top: 0px;
3197+ left: 0px;
3198+}
3199 .table_header .table_actions {
3200 min-width: 0;
3201 }
3202 .table_header .table_actions a,
3203-.table_header .table_actions button {
3204+.table_header .table_actions > button,
3205+.table_header .table_actions .table_search button {
3206 display: inline-block;
3207 float: none;
3208 }
3209+.table_header .table_filter {
3210+ vertical-align: bottom;
3211+ margin-right: 20px;
3212+}
3213+.table_header .table_filter i {
3214+ vertical-align: middle;
3215+}
3216 .table_actions form {
3217 float: right;
3218 margin-left: 10px;
3219@@ -4195,10 +4214,21 @@
3220 .hidden {
3221 display: none;
3222 }
3223-.table-striped tbody tr.status_unknown:nth-child(odd) td {
3224+.table-striped.datatable tbody tr.odd td {
3225+ background-color: #f9f9f9;
3226+}
3227+.table-striped.datatable tbody tr.even td {
3228+ background-color: inherit;
3229+}
3230+.table-striped.datatable tbody tr.odd:hover td,
3231+.table-striped.datatable tbody tr.even:hover td,
3232+.table-striped.datatable tbody tr:hover th {
3233+ background-color: #f5f5f5;
3234+}
3235+.table-striped tbody tr.status_unknown:nth-child(odd)td {
3236 background-color: #ffffb5;
3237 }
3238-.table-striped tbody tr.status_unknown:nth-child(even) td {
3239+.table-striped tbody tr.status_unknown:nth-child(even)td {
3240 background-color: #ffffc6;
3241 }
3242 .nowrap-col {
3243@@ -4222,24 +4252,20 @@
3244 float: left;
3245 line-height: 18px;
3246 }
3247-#external_links,
3248-#external_links li {
3249+#external_links, #external_links li {
3250 float: left;
3251 }
3252 #external_links li {
3253 margin: 0 0 0 15px;
3254 }
3255-/* Forms */
3256 form label {
3257 text-align: left;
3258- color: #555;
3259+ color: #555555;
3260 font-weight: bold;
3261 }
3262 .modal {
3263 width: 700px;
3264 max-height: none;
3265- /* Prevents large modals from scrolling unnecessarily */
3266-
3267 top: 80px;
3268 margin-top: 0;
3269 position: absolute;
3270@@ -4256,23 +4282,27 @@
3271 bottom: 0;
3272 width: 150px;
3273 }
3274+.datepicker {
3275+ margin-top: 10px;
3276+}
3277+.datepicker input {
3278+ width: 65px;
3279+ margin-right: 10px;
3280+}
3281+.datepicker .btn {
3282+ margin-right: 10px;
3283+}
3284 form.horizontal .form-field {
3285 float: left;
3286 }
3287 form.horizontal.split_half .form-field {
3288 width: 334px;
3289- /* Fits 2 fields to a row */
3290-
3291 }
3292 form.horizontal.split_quarter .form-field {
3293 width: 167px;
3294- /* Fits 4 fields to a row */
3295-
3296 }
3297 form.horizontal.split_five .form-field {
3298 width: 133px;
3299- /* Fits 5 fields to a row */
3300-
3301 }
3302 form.horizontal fieldset {
3303 width: 100%;
3304@@ -4290,8 +4320,8 @@
3305 .static_page {
3306 float: left;
3307 width: 700px;
3308- background-color: #FFF;
3309- border: 1px solid #DDD;
3310+ background-color: #ffffff;
3311+ border: 1px solid #dddddd;
3312 }
3313 .static_page > form {
3314 margin-bottom: 0;
3315@@ -4320,7 +4350,7 @@
3316 vertical-align: top;
3317 width: 340px;
3318 padding-left: 10px;
3319- border-left: 1px solid #DDD;
3320+ border-left: 1px solid #dddddd;
3321 }
3322 .workflow fieldset > table {
3323 margin-bottom: 0;
3324@@ -4339,8 +4369,7 @@
3325 .modal-body fieldset ul {
3326 width: 90%;
3327 }
3328-.modal-body fieldset .form-field input,
3329-.modal-body fieldset .form-field textarea {
3330+.modal-body fieldset .form-field input, .modal-body fieldset .form-field textarea {
3331 width: 298px;
3332 }
3333 .modal-body fieldset .form-field select {
3334@@ -4361,7 +4390,7 @@
3335 margin-top: 0;
3336 margin-right: 5px;
3337 font-size: 12px;
3338- color: #666;
3339+ color: #666666;
3340 font-weight: normal;
3341 filter: alpha(opacity=100);
3342 -khtml-opacity: 1;
3343@@ -4369,7 +4398,7 @@
3344 opacity: 1;
3345 }
3346 .modal-footer a.close:hover {
3347- color: #333;
3348+ color: #333333;
3349 text-decoration: underline;
3350 }
3351 .modal-body .help-block {
3352@@ -4396,28 +4425,26 @@
3353 #images #actions {
3354 width: 100px;
3355 }
3356-/*New List Patches*/
3357 .details-modal .modal-body {
3358 padding-bottom: 20px;
3359 }
3360 .form-inline {
3361 display: inline;
3362 }
3363-.form-inline input,
3364-.form-inline button,
3365-.form-inline a.btn {
3366+.form-inline input, .form-inline button, .form-inline a.btn {
3367 margin-left: 5px;
3368 }
3369 td.select {
3370 width: 10px;
3371 }
3372-/* Actions dropdown */
3373 td.actions_column {
3374- width: 150px;
3375+ white-space: nowrap;
3376 padding: 10px;
3377 position: relative;
3378- min-width: 140px;
3379- min-height: 20px;
3380+ width: 200px;
3381+}
3382+td.actions_column .btn-group {
3383+ display: inline-block;
3384 }
3385 td.actions_column .row_actions a,
3386 td.actions_column .row_actions input,
3387@@ -4437,9 +4464,13 @@
3388 td.actions_column .row_actions .hide {
3389 display: none;
3390 }
3391-/* Makes size consistent across browsers when mixing "btn-group" and "small" */
3392-.btn.hide,
3393-.btn-group .hide {
3394+td.actions_column .btn-action-required {
3395+ font-weight: bold;
3396+}
3397+.tab-content {
3398+ overflow: visible;
3399+}
3400+.btn.hide, .btn-group .hide {
3401 display: none;
3402 }
3403 .btn-group .dropdown-toggle:focus {
3404@@ -4447,8 +4478,6 @@
3405 }
3406 .dropdown-menu button {
3407 line-height: 18px;
3408- /* Matches rule for ".dropdown-menu a" in bootstrap */
3409-
3410 width: 100%;
3411 }
3412 .btn-group .dropdown-menu .btn {
3413@@ -4461,26 +4490,23 @@
3414 .dropdown-menu .btn.btn-info,
3415 .dropdown-menu .btn.btn-info:hover {
3416 text-shadow: none;
3417- /* remove default bootstrap shadowing from button text. */
3418-
3419 }
3420 .dropdown-menu li:hover {
3421 background: none;
3422 }
3423 .dropdown-menu li.divider:hover {
3424- background-color: #E5E5E5;
3425+ background-color: #e5e5e5;
3426 }
3427 td.actions_column .dropdown-menu a:hover,
3428 td.actions_column .dropdown-menu button:hover {
3429- background-color: #CDCDCD;
3430+ background-color: #cdcdcd;
3431 }
3432 .dropdown-menu .btn.btn-danger {
3433- color: #C43C35;
3434+ color: #c43c35;
3435 }
3436 .dropdown-menu .btn.btn-danger:hover {
3437 background-color: #f6e0df;
3438 }
3439-/* Overrides for single-action rows (no dropdown) */
3440 tr td.actions_column ul.row_actions.single,
3441 tr:hover td.actions_column ul.row_actions.single,
3442 td.actions_column ul.row_actions.single,
3443@@ -4503,12 +4529,10 @@
3444 td.actions_column ul.row_actions.single button:hover {
3445 color: black;
3446 }
3447-th.multi_select_column,
3448-td.multi_select_column {
3449+th.multi_select_column, td.multi_select_column {
3450 width: 25px;
3451 }
3452-th.multi_select_column,
3453-td.multi_select_column {
3454+th.multi_select_column, td.multi_select_column {
3455 text-align: center;
3456 }
3457 .table-fixed {
3458@@ -4546,7 +4570,7 @@
3459 border-bottom: none;
3460 }
3461 #instance_tabs li.active a {
3462- background: #fff;
3463+ background: #ffffff;
3464 padding-bottom: 8px;
3465 margin-bottom: -5px;
3466 }
3467@@ -4554,7 +4578,7 @@
3468 margin-bottom: 0;
3469 }
3470 #main_content .tab-content {
3471- border: 1px solid #ddd;
3472+ border: 1px solid #dddddd;
3473 border-top: 0 none;
3474 padding: 10px;
3475 }
3476@@ -4570,23 +4594,22 @@
3477 .tab_wrapper {
3478 padding-top: 50px;
3479 }
3480-/* Fix tooltip z-index to show above modals. Bootstrap bug 582*/
3481 .tooltip {
3482 z-index: 12000;
3483 }
3484 .volume_boot_disclosure {
3485 font-weight: bold;
3486- color: #555;
3487+ color: #555555;
3488 cursor: pointer;
3489- background-image: url('../../dashboard/img/right_droparrow.png?b14134630332');
3490+ background-image: url('/static/dashboard/img/right_droparrow.png');
3491 background-repeat: no-repeat;
3492 background-position: 130px center;
3493 }
3494 .volume_boot_disclosure.on {
3495 width: 334px;
3496 margin-bottom: 10px;
3497- border-bottom: solid 1px #E1E1E1;
3498- background-image: url('../../dashboard/img/drop_arrow.png?2ec1100baed3');
3499+ border-bottom: solid 1px #e1e1e1;
3500+ background-image: url('/static/dashboard/img/drop_arrow.png');
3501 }
3502 form div.clearfix.error {
3503 width: 308px;
3504@@ -4595,12 +4618,18 @@
3505 cursor: pointer;
3506 }
3507 .nav-tabs li.error a {
3508- color: #B94A48;
3509+ color: #b94a48;
3510 }
3511 .nav-tabs li.error a:after {
3512 content: "*";
3513 }
3514-/* Region selector in header */
3515+.nav-tabs li.required a:after, form .form-field.required > label:after {
3516+ content: "*";
3517+ font-weight: bold;
3518+ line-height: 0;
3519+ padding-left: 4px;
3520+ color: #3290c0;
3521+}
3522 #region_selector {
3523 position: absolute;
3524 z-index: 9999;
3525@@ -4622,11 +4651,11 @@
3526 #region_selector li a {
3527 padding: 3px 3px 3px 5px;
3528 display: none;
3529- background: #E1E1E1;
3530+ background: #e1e1e1;
3531 margin-top: -10px;
3532 }
3533 #region_selector li:first-child p {
3534- background: #ededed url('../../dashboard/img/drop_arrow.png?2ec1100baed3') no-repeat 106px 9px !important;
3535+ background: #ededed url('/static/dashboard/img/drop_arrow.png') no-repeat 106px 9px !important;
3536 display: block;
3537 border: 1px solid #e1e1e1;
3538 padding: 5px;
3539@@ -4635,7 +4664,7 @@
3540 border: none;
3541 }
3542 .item_detail ul li label {
3543- color: #000;
3544+ color: #000000;
3545 font-weight: bold;
3546 display: block;
3547 margin-top: 5px;
3548@@ -4643,31 +4672,41 @@
3549 .progress_bar {
3550 height: 100%;
3551 width: 100%;
3552- border: 1px solid #CCC;
3553- background-color: #CCC;
3554+ border: 1px solid #cccccc;
3555+ background-color: #cccccc;
3556 }
3557-.progress_bar_fill,
3558-.progress_bar_selected {
3559+.progress_bar_fill, .progress_bar_selected {
3560 height: 100%;
3561 float: left;
3562 }
3563 .progress_bar_fill {
3564- background-color: #666;
3565+ background-color: #666666;
3566 }
3567 .progress_bar_selected {
3568- background-color: #4790AE;
3569+ background-color: #2c001e;
3570 width: 0;
3571 }
3572 .progress_bar_over {
3573 background-color: red;
3574 }
3575+.d3_quota_bar {
3576+ width: 20%;
3577+ margin-bottom: 8px;
3578+ margin-top: 10px;
3579+ float: left;
3580+ text-align: center;
3581+}
3582+.quota-dynamic {
3583+ overflow: hidden;
3584+ margin-bottom: 8px;
3585+}
3586 .quota_title {
3587- color: #999;
3588+ color: #999999;
3589 padding-bottom: 0;
3590 margin-bottom: 8px;
3591 }
3592 .quota_title strong {
3593- color: #000;
3594+ color: #000000;
3595 }
3596 .quota_title strong span {
3597 font-weight: normal;
3598@@ -4681,7 +4720,7 @@
3599 margin: -8px 0 8px;
3600 }
3601 div .flavor_table {
3602- border: 1px solid #AAA;
3603+ border: 1px solid #aaaaaa;
3604 width: 100%;
3605 margin-bottom: 14px;
3606 }
3607@@ -4706,48 +4745,52 @@
3608 float: left;
3609 margin-right: 50px;
3610 }
3611-.error .help-inline {
3612+.error .help-inline, .dynamic-error {
3613 background: #efdfdf;
3614 border: 1px solid #ead5d8;
3615 padding: 10px;
3616 display: block;
3617 }
3618+.dynamic-error {
3619+ color: #b94a48;
3620+ margin-bottom: 0.5em;
3621+}
3622 label.log-length {
3623 line-height: 28px;
3624 margin-right: 10px;
3625 }
3626 .progress-success.bar {
3627 background-color: #5eb95e;
3628- background-image: -moz-linear-gradient(top, #62c462, #57a957);
3629- background-image: -ms-linear-gradient(top, #62c462, #57a957);
3630- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
3631- background-image: -webkit-linear-gradient(top, #62c462, #57a957);
3632- background-image: -o-linear-gradient(top, #62c462, #57a957);
3633- background-image: linear-gradient(top, #62c462, #57a957);
3634+ background-image: -moz-linear-gradient(top,#62c462,#57a957);
3635+ background-image: -ms-linear-gradient(top,#62c462,#57a957);
3636+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
3637+ background-image: -webkit-linear-gradient(top,#62c462,#57a957);
3638+ background-image: -o-linear-gradient(top,#62c462,#57a957);
3639+ background-image: linear-gradient(top,#62c462,#57a957);
3640 background-repeat: repeat-x;
3641- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
3642+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
3643 }
3644 .progress_bar_fill.progress-warning.bar {
3645 background-color: #898989;
3646- background-image: -moz-linear-gradient(top, #999999, #333333);
3647- background-image: -ms-linear-gradient(top, #999999, #333333);
3648- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#999999), to(#333333));
3649- background-image: -webkit-linear-gradient(top, #999999, #333333);
3650- background-image: -o-linear-gradient(top, #999999, #333333);
3651- background-image: linear-gradient(top, #999999, #333333);
3652+ background-image: -moz-linear-gradient(top,#999999,#333333);
3653+ background-image: -ms-linear-gradient(top,#999999,#333333);
3654+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#999999),to(#333333));
3655+ background-image: -webkit-linear-gradient(top,#999999,#333333);
3656+ background-image: -o-linear-gradient(top,#999999,#333333);
3657+ background-image: linear-gradient(top,#999999,#333333);
3658 background-repeat: repeat-x;
3659- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#999999', endColorstr='#333333', GradientType=0);
3660+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#999999', endColorstr='#333333', GradientType=0);
3661 }
3662 .progress_bar_over.bar {
3663 background-color: #dd514c;
3664- background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
3665- background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
3666- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
3667- background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
3668- background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
3669- background-image: linear-gradient(top, #ee5f5b, #c43c35);
3670+ background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
3671+ background-image: -ms-linear-gradient(top,#ee5f5b,#c43c35);
3672+ background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
3673+ background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
3674+ background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
3675+ background-image: linear-gradient(top,#ee5f5b,#c43c35);
3676 background-repeat: repeat-x;
3677- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
3678+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
3679 }
3680 .split_five div.control-group input[type="text"],
3681 .split_five div.control-group select {
3682@@ -4761,8 +4804,7 @@
3683 .warning .warning-text {
3684 text-align: center;
3685 }
3686-.warning .warning-text h3,
3687-.warning .warning-text a {
3688+.warning .warning-text h3, .warning .warning-text a {
3689 display: inline-block;
3690 }
3691 .warning .warning-text h3 {
3692@@ -4776,107 +4818,93 @@
3693 .no_split {
3694 margin-top: -60px;
3695 }
3696-/* Project Membership UI */
3697-.project_membership {
3698+.membership {
3699 min-height: 200px;
3700- /* Buttons */
3701-
3702- /* Header */
3703-
3704- /* 'Fake table' body */
3705-
3706- /* User lists */
3707-
3708- /* List filtering */
3709-
3710- /* Role dropdown menus */
3711-
3712 }
3713-.project_membership .btn-group {
3714+.membership .btn-group {
3715 margin-left: 0px;
3716 padding: 2px 10px 0 0;
3717 margin-bottom: 0px;
3718- border: 1px solid #DDD;
3719+ border: 1px solid #dddddd;
3720 border-bottom: none;
3721 }
3722-.project_membership .btn-group .active {
3723+.membership .btn-group .active {
3724 float: right;
3725 }
3726-.project_membership a.btn-primary:hover {
3727- background-color: #04C;
3728+.membership a.btn-primary:hover {
3729+ background-color: #dd4a14;
3730 }
3731-.project_membership .help_text {
3732+.membership .help_text {
3733 margin-left: 15px;
3734 margin-bottom: 15px;
3735 }
3736-.project_membership .users_title {
3737- color: #555;
3738+.membership .members_title {
3739+ color: #555555;
3740 font-weight: bold;
3741 padding-left: 10px;
3742 float: left;
3743 }
3744-.project_membership input {
3745- background: url('../../dashboard/img/search.png?781fb162b111') no-repeat 105px 5px whiteSmoke;
3746+.membership input {
3747+ background: url('/static/dashboard/img/search.png') no-repeat 105px 5px whiteSmoke;
3748 }
3749-.project_membership .fake_table_header {
3750- background-color: #F1F1F1;
3751+.membership .fake_table_header {
3752+ background-color: #f1f1f1;
3753 width: 306px;
3754 height: 38px;
3755 padding-top: 15px;
3756- border: 1px solid #DDD;
3757+ border: 1px solid #dddddd;
3758 border-bottom: none;
3759 }
3760-.project_membership .fake_table {
3761+.membership .fake_table {
3762 margin-left: 5px;
3763 width: 315px;
3764 }
3765-.project_membership .fake_table ul.no_results {
3766+.membership .fake_table ul.no_results {
3767 width: 298px;
3768 }
3769-.project_membership .fake_table ul.btn-group:hover {
3770- background-color: #DDD;
3771+.membership .fake_table ul.btn-group:hover {
3772+ background-color: #dddddd;
3773 }
3774-.project_membership .left .fake_table_header {
3775+.membership .left .fake_table_header {
3776 width: 318px;
3777 }
3778-.project_membership .right .fake_table_header {
3779+.membership .right .fake_table_header {
3780 width: 318px;
3781 margin-left: -15px;
3782 }
3783-.project_membership .right .fake_table ul.no_results {
3784+.membership .right .fake_table ul.no_results {
3785 margin-left: -20px;
3786 }
3787-.project_membership .member {
3788+.membership .member {
3789 padding: 10px;
3790 text-align: left;
3791 }
3792-.project_membership .project_members {
3793+.membership .members {
3794 margin-left: -20px;
3795 }
3796-.project_membership .project_members ul.btn-group,
3797-.project_membership .available_users ul.btn-group {
3798+.membership .members ul.btn-group, .membership .available_members ul.btn-group {
3799 width: 308px;
3800 }
3801-.project_membership .dark_stripe {
3802- background-color: #F9F9F9;
3803+.membership .dark_stripe {
3804+ background-color: #f9f9f9;
3805 }
3806-.project_membership .light_stripe {
3807+.membership .light_stripe {
3808 background-color: white;
3809 }
3810-.project_membership .last_stripe {
3811- border-bottom: 1px solid #DDD;
3812+.membership .last_stripe {
3813+ border-bottom: 1px solid #dddddd;
3814 }
3815-.project_membership .filter {
3816+.membership .filter {
3817 width: 120px;
3818 margin: -5px 13px 15px 0px;
3819 float: right;
3820 }
3821-.project_membership .no_results {
3822- border: 1px solid #DDD;
3823+.membership .no_results {
3824+ border: 1px solid #dddddd;
3825 padding: 10px;
3826- color: #08C;
3827+ opacity: 0.5;
3828 }
3829-.project_membership .role_dropdown li {
3830+.membership .role_dropdown li {
3831 cursor: pointer;
3832 background: none;
3833 float: none;
3834@@ -4891,30 +4919,37 @@
3835 box-shadow: none;
3836 z-index: 99999;
3837 }
3838-.project_membership .role_dropdown li:hover {
3839- background-color: #CDCDCD;
3840-}
3841-.project_membership .nav .role_options {
3842+.membership .role_dropdown li i {
3843+ opacity: 0;
3844+}
3845+.membership .role_dropdown li:hover {
3846+ background-color: #cdcdcd;
3847+}
3848+.membership .role_dropdown li.selected i {
3849+ opacity: 1;
3850+}
3851+.membership .dropdown-menu.role_dropdown {
3852+ right: 0;
3853+ left: auto;
3854+}
3855+.membership .nav .role_options {
3856 float: right;
3857 padding-right: 5px;
3858 }
3859-/* Inline user creation */
3860-.add_user_btn {
3861+.add_member_btn {
3862 display: inline;
3863 }
3864-#add_user {
3865+#add_member {
3866 clear: both;
3867 }
3868-.add_user {
3869+.add_member {
3870 float: right;
3871 margin-top: 10px;
3872 margin-right: 15px;
3873 }
3874-/* Fixes overflow on dropdowns in modal */
3875 .dropdown_fix {
3876 overflow: visible;
3877 }
3878-/* Replaces CPU hungry spin.js with animated gif */
3879 .loading_gif {
3880 width: 35px;
3881 height: 13px;
3882@@ -4922,7 +4957,13 @@
3883 padding-right: 5px;
3884 float: left;
3885 }
3886-/* ResourceBrowser style */
3887+.action_required_img {
3888+ width: 35px;
3889+ height: 13px;
3890+ padding-top: 2px;
3891+ padding-right: 5px;
3892+ float: left;
3893+}
3894 #browser_wrapper {
3895 width: 100%;
3896 min-width: 1000px;
3897@@ -4936,7 +4977,7 @@
3898 clear: both;
3899 padding: 8px;
3900 border-top: 1px solid #dddddd;
3901- background-color: #F1F1F1;
3902+ background-color: #f1f1f1;
3903 font-size: 11px;
3904 line-height: 14px;
3905 }
3906@@ -4946,12 +4987,10 @@
3907 #browser_wrapper .tfoot span.navigation_table_count {
3908 width: 30%;
3909 }
3910-#browser_wrapper form,
3911-#browser_wrapper table {
3912+#browser_wrapper form, #browser_wrapper table {
3913 margin-bottom: 0;
3914 }
3915-#browser_wrapper .navigation_wrapper,
3916-#browser_wrapper .content_wrapper {
3917+#browser_wrapper .navigation_wrapper, #browser_wrapper .content_wrapper {
3918 position: relative;
3919 float: left;
3920 }
3921@@ -4972,7 +5011,7 @@
3922 max-width: 200px;
3923 }
3924 #browser_wrapper div.navigation_wrapper tr.current_selected td {
3925- background-color: #E9F5FA;
3926+ background-color: #eddbea;
3927 }
3928 #browser_wrapper div.navigation_wrapper tfoot td {
3929 border-right: 0 none;
3930@@ -4991,12 +5030,6 @@
3931 }
3932 #browser_wrapper div.content_wrapper {
3933 width: 70%;
3934- /* FIXME(Ke Wu): for now there are two breadcrumb tr in both table
3935- * and this one in the content table is hidden. This hack is made to
3936- * fix the alignment of two table, needs a better solution in the
3937- * future.
3938- */
3939-
3940 }
3941 #browser_wrapper div.content_wrapper div.table_wrapper,
3942 #browser_wrapper div.content_wrapper thead th.table_header {
3943@@ -5033,7 +5066,7 @@
3944 background-color: #eeeeee;
3945 }
3946 #browser_wrapper table tbody tr:last-child td {
3947- border-bottom: 1px solid #ddd;
3948+ border-bottom: 1px solid #dddddd;
3949 border-radius: 0;
3950 }
3951 #browser_wrapper table tbody tr.empty td {
3952@@ -5047,7 +5080,6 @@
3953 padding: 6px;
3954 margin: 0 0 1px 0;
3955 }
3956-/* Styling for inline object creation buttons */
3957 .btn-inline {
3958 margin-bottom: 9px;
3959 }
3960@@ -5055,15 +5087,13 @@
3961 width: 275px;
3962 margin-right: 2px;
3963 }
3964-
3965-/* Styling for draged network object */
3966 #networkListSortContainer {
3967 display: none;
3968 }
3969 .networklist {
3970 padding: 6px;
3971- background: #eee;
3972- border: 1px solid #ccc;
3973+ background: #eeeeee;
3974+ border: 1px solid #cccccc;
3975 min-height: 2em;
3976 width: auto !important;
3977 -webkit-box-sizing: border-box;
3978@@ -5075,18 +5105,18 @@
3979 list-style-type: none;
3980 margin: 6px auto;
3981 padding: 3px;
3982- background: #fff;
3983- border: 1px solid #aaa;
3984+ background: #ffffff;
3985+ border: 1px solid #aaaaaa;
3986 line-height: 18px;
3987 border-radius: 3px;
3988 cursor: move;
3989 padding-left: 23px;
3990- background: #ffffff url(/static/dashboard/img/drag.png) no-repeat 11px 50%;
3991+ background: white url('/static/dashboard/img/drag.png') no-repeat 11px 50%;
3992 }
3993 .networklist li em {
3994 font-size: 0.5em;
3995 line-height: 1em;
3996- color: #999;
3997+ color: #999999;
3998 font-style: normal;
3999 margin-left: 0.8em;
4000 }
4001@@ -5112,10 +5142,10 @@
4002 content: "+";
4003 }
4004 .networklist li.ui-sortable-helper {
4005- background-color: #def;
4006+ background-color: #ddeeff;
4007 }
4008 .networklist li.ui-state-highlight {
4009- border: 1px dotted #ccc;
4010+ border: 1px dotted #cccccc;
4011 background: #efefef;
4012 height: 0.5em;
4013 }
4014@@ -5131,7 +5161,7 @@
4015 margin-bottom: 1.5em;
4016 counter-reset: v1 0;
4017 background: #edf9ff;
4018- border: 1px solid #c0d9e4;
4019+ border: 1px solid #77216f;
4020 }
4021 #selected_network li {
4022 position: relative;
4023@@ -5140,12 +5170,12 @@
4024 content: "-";
4025 }
4026 #selected_network li:before {
4027- content: "nic:" counter(v1);
4028+ content: "nic:"counter(v1);
4029 counter-increment: v1;
4030 display: inline-block;
4031 margin-right: 5px;
4032- background: #666;
4033- color: #fff;
4034+ background: #666666;
4035+ color: #ffffff;
4036 font-size: 90%;
4037 padding: 0px 4px;
4038 vertical-align: middle;
4039@@ -5155,353 +5185,822 @@
4040 }
4041 #selected_network.dragging li:before {
4042 content: "nic:";
4043- background-color: rgba(102, 102, 102, 0.5);
4044+ background-color: rgba(102,102,102,0.5);
4045 padding-right: 10px;
4046 }
4047 #selected_network.dragging li.ui-state-highlight:before {
4048 content: "";
4049 background: transparent;
4050 }
4051-/* Styling for network topology */
4052-@-webkit-keyframes progress-bar-stripes {
4053- from {
4054- background-position: 20px 0;
4055- }
4056- to {
4057- background-position: 0 0;
4058- }
4059-}
4060-@-moz-keyframes progress-bar-stripes {
4061- from {
4062- background-position: 20px 0;
4063- }
4064- to {
4065- background-position: 0 0;
4066- }
4067-}
4068-@-ms-keyframes progress-bar-stripes {
4069- from {
4070- background-position: 20px 0;
4071- }
4072- to {
4073- background-position: 0 0;
4074- }
4075-}
4076-@-o-keyframes progress-bar-stripes {
4077- from {
4078- background-position: 0 0;
4079- }
4080- to {
4081- background-position: 20px 0;
4082- }
4083-}
4084-@keyframes progress-bar-stripes {
4085- from {
4086- background-position: 20px 0;
4087- }
4088- to {
4089- background-position: 0 0;
4090- }
4091-}
4092-#topologyCanvas {
4093+#topologyCanvasContainer {
4094 -webkit-box-sizing: border-box;
4095 -moz-box-sizing: border-box;
4096- -ms-box-sizing: border-box;
4097- -o-box-sizing: border-box;
4098 box-sizing: border-box;
4099 width: 100%;
4100- height: 500px;
4101+ height: auto;
4102 padding: 25px;
4103 padding-left: 50px;
4104 background: #efefef;
4105+ min-height: 400px;
4106 }
4107-#topologyCanvas div.nodata {
4108+#topologyCanvasContainer div.nodata {
4109 font-size: 150%;
4110- font-weight: bold;
4111 text-align: center;
4112- padding-top: 200px;
4113- display: none;
4114-}
4115-div.networks {
4116- height: 100%;
4117-}
4118-div.network {
4119- -webkit-box-sizing: border-box;
4120- -moz-box-sizing: border-box;
4121- -ms-box-sizing: border-box;
4122- -o-box-sizing: border-box;
4123- box-sizing: border-box;
4124+ padding-top: 150px;
4125+ display: none;
4126+}
4127+#topologyCanvasContainer.noinfo div.nodata {
4128+ display: block;
4129+}
4130+#topologyCanvasContainer.noinfo #topology_canvas {
4131+ display: none;
4132+}
4133+.topologyNavi {
4134+ overflow: hidden;
4135+ margin: 10px 0 20px;
4136+}
4137+.topologyNavi i {
4138+ margin-right: 3px;
4139+}
4140+.topologyNavi .toggleView {
4141 float: left;
4142- width: 270px;
4143- height: 100%;
4144- position: relative;
4145-}
4146-div.network .nicname {
4147- -webkit-box-sizing: border-box;
4148- -moz-box-sizing: border-box;
4149- -ms-box-sizing: border-box;
4150- -o-box-sizing: border-box;
4151- box-sizing: border-box;
4152- height: 100%;
4153- width: 17px;
4154- border-radius: 17px;
4155- z-index: 200;
4156- color: #fff;
4157- position: absolute;
4158+}
4159+.topologyNavi .launchButtons {
4160+ float: right;
4161+ text-align: right;
4162+}
4163+.topologyNavi .launchButtons a.btn {
4164+ margin-left: 10px;
4165+}
4166+.topologyBalloon {
4167+ display: none;
4168+ background: #ffffff;
4169+ position: absolute;
4170+ left: 100px;
4171+ top: 20px;
4172+ z-index: 600;
4173+ border-radius: 5px;
4174+ color: #333333;
4175+ min-width: 200px;
4176+ line-height: 1.2;
4177+ font-size: 11px;
4178+ -webkit-box-shadow: 0px 1px 6px #777777;
4179+ -moz-box-shadow: 0px 1px 6px #777777;
4180+ box-shadow: 0px 1px 6px #777777;
4181+}
4182+.topologyBalloon.on {
4183+ display: block;
4184+}
4185+.topologyBalloon .vnc_window {
4186+ margin-left: 10px;
4187+}
4188+.topologyBalloon .closeTopologyBalloon {
4189+ font-size: 16px;
4190+ line-height: 1;
4191+ display: block;
4192+ position: absolute;
4193+ font-weight: bold;
4194+ right: 6px;
4195+ top: 0px;
4196+ cursor: pointer;
4197+ padding: 3px;
4198+ color: #aaaaaa;
4199+}
4200+.topologyBalloon .closeTopologyBalloon:hover {
4201+ color: #777777;
4202+ text-decoration: none;
4203+}
4204+.topologyBalloon .contentBody {
4205+ padding: 8px 8px 0;
4206+}
4207+.topologyBalloon span.active:before, .topologyBalloon span.down:before {
4208+ content: "";
4209+ width: 9px;
4210+ height: 9px;
4211+ display: inline-block;
4212+ background: #0d925b;
4213+ margin-right: 3px;
4214+ border-radius: 10px;
4215+ vertical-align: middle;
4216+}
4217+.topologyBalloon span.down:before {
4218+ background: #e64b41;
4219+}
4220+.topologyBalloon .footer {
4221+ background: #efefef;
4222+ border-top: 1px solid #d9d9d9;
4223+ padding: 8px;
4224+ border-radius: 0px 0px 7px 7px;
4225+}
4226+.topologyBalloon .footer .footerInner {
4227+ display: table;
4228+ width: 100%;
4229+}
4230+.topologyBalloon .footer .cell {
4231+ display: table-cell;
4232+ padding-right: 10px;
4233+}
4234+.topologyBalloon .footer .link {
4235+ font-size: 12px;
4236+}
4237+.topologyBalloon .footer .delete {
4238+ padding-right: 0;
4239+ text-align: right;
4240+}
4241+.topologyBalloon .footer .delete .btn:before {
4242+ content: "Delete ";
4243+}
4244+.topologyBalloon .footer .delete .btn.deleting:before {
4245+ content: "Deleting ";
4246+}
4247+.topologyBalloon .footer .delete .btn.instance:before {
4248+ content: "Terminate ";
4249+}
4250+.topologyBalloon .footer .delete .btn.instance.deleting:before {
4251+ content: "Terminating ";
4252+}
4253+.topologyBalloon table.detaiInfoTable {
4254+ margin-bottom: 5px;
4255+}
4256+.topologyBalloon table.detaiInfoTable caption {
4257+ text-align: left;
4258+ font-size: 12px;
4259+ font-weight: bold;
4260+ margin-bottom: 0px;
4261+}
4262+.topologyBalloon table.detaiInfoTable th, .topologyBalloon table.detaiInfoTable td {
4263+ text-align: left;
4264+ vertical-align: middle;
4265+ padding-bottom: 3px;
4266+ background: transparent;
4267+}
4268+.topologyBalloon table.detaiInfoTable th {
4269+ color: #999999;
4270+ padding-right: 8px;
4271+ width: 80px;
4272+}
4273+.topologyBalloon table.detaiInfoTable th span {
4274+ vertical-align: middle;
4275+ width: 80px;
4276+ white-space: nowrap;
4277+ overflow: hidden;
4278+ text-overflow: ellipsis;
4279+ display: inline-block;
4280+}
4281+.topologyBalloon table.detaiInfoTable th.device {
4282+ text-align: right;
4283+}
4284+.topologyBalloon table.detaiInfoTable td {
4285+ padding-right: 5px;
4286+ white-space: nowrap;
4287+}
4288+.topologyBalloon table.detaiInfoTable td.delete {
4289+ padding-right: 0;
4290+ text-align: right;
4291+}
4292+.topologyBalloon table.detaiInfoTable .btn {
4293+ line-height: 1.4;
4294+}
4295+.topologyBalloon table.detaiInfoTable .btn:before {
4296+ content: "Delete ";
4297+}
4298+.topologyBalloon table.detaiInfoTable .btn.deleting:before {
4299+ content: "Deleting ";
4300+}
4301+.topologyBalloon:before {
4302+ border-top: 7px solid transparent;
4303+ border-bottom: 7px solid transparent;
4304+ border-right: 9px solid #bbbbbb;
4305+ display: block;
4306+ position: absolute;
4307+ top: 30px;
4308+ left: -9px;
4309+ width: 0;
4310+ height: 0;
4311+ content: "";
4312+}
4313+.topologyBalloon:after {
4314+ border-top: 6px solid transparent;
4315+ border-bottom: 6px solid transparent;
4316+ border-right: 8px solid #ffffff;
4317+ display: block;
4318+ position: absolute;
4319+ top: 31px;
4320 left: -8px;
4321- top: 0px;
4322- cursor: pointer;
4323-}
4324-div.network .nicname:hover {
4325- background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
4326- background-image: -moz-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
4327- background-image: -ms-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
4328- background-image: -o-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
4329- background-image: linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
4330- background-size: 10px 10px;
4331-}
4332-div.network .nicname.nourl {
4333- cursor: auto;
4334-}
4335-div.network .nicname.nourl:hover {
4336- background-image: none;
4337-}
4338-div.network .nicname h3 {
4339- font-size: 12px;
4340- line-height: 1;
4341- position: relative;
4342- font-weight: normal;
4343- top: 55%;
4344- color: #fff;
4345- left: -1px;
4346- letter-spacing: 0.2em;
4347- -webkit-transform: rotate(-90deg);
4348- -moz-transform: rotate(-90deg);
4349- -ms-transform: rotate(-90deg);
4350- -o-transform: rotate(-90deg);
4351- transform: rotate(-90deg);
4352- white-space: nowrap;
4353- text-shadow: 0px 0px 5px #000;
4354-}
4355-div.network .nicname span.ip {
4356- position: absolute;
4357- bottom: -10px;
4358- left: 20px;
4359- color: #000;
4360- display: block;
4361- font-weight: normal;
4362- font-size: 90%;
4363- letter-spacing: 0.2em;
4364- -webkit-transform: rotate(-90deg);
4365- -moz-transform: rotate(-90deg);
4366- -ms-transform: rotate(-90deg);
4367- -o-transform: rotate(-90deg);
4368- transform: rotate(-90deg);
4369- -webkit-transform-origin: 0% 0%;
4370- -moz-transform-origin: 0% 0%;
4371- -ms-transform-origin: 0% 0%;
4372- -o-transform-origin: 0% 0%;
4373- transform-origin: 0% 0%;
4374- white-space: nowrap;
4375- text-shadow: 0px 0px 2px #fff,0px 0px 2px #fff;
4376-}
4377-div.network .router,
4378-div.network .server,
4379-div.network .device {
4380- -webkit-box-sizing: border-box;
4381- -moz-box-sizing: border-box;
4382- -ms-box-sizing: border-box;
4383- -o-box-sizing: border-box;
4384- box-sizing: border-box;
4385- cursor: pointer;
4386- width: 90px;
4387- border: 3px solid #444;
4388- position: absolute;
4389+ width: 0;
4390+ height: 0;
4391+ content: "";
4392+}
4393+.topologyBalloon.leftPosition:before {
4394+ border-right: none;
4395+ border-left: 9px solid #bbbbbb;
4396+ right: -9px;
4397 top: 30px;
4398- left: 90px;
4399- color: #fff;
4400- padding: 0 3px;
4401- background: #666;
4402- margin-bottom: 20px;
4403- border-radius: 8px;
4404-}
4405-div.network .router:before,
4406-div.network .server:before,
4407-div.network .device:before {
4408- content: "";
4409- width: 20px;
4410- height: 20px;
4411- border: 2px solid #444;
4412- line-height: 1.2;
4413- position: absolute;
4414- border-radius: 20px;
4415- top: -10px;
4416- left: -10px;
4417- background: #ffffff url(/static/dashboard/img/router.png) no-repeat center center;
4418- background-size: 16px 16px;
4419-}
4420-div.network .router:after,
4421-div.network .server:after,
4422-div.network .device:after {
4423- content: "";
4424- width: 100%;
4425- line-height: 1.2;
4426- position: absolute;
4427- text-align: center;
4428- border-radius: 0;
4429- background: #444;
4430- color: #fff;
4431+ left: auto;
4432+}
4433+.topologyBalloon.leftPosition:after {
4434+ border-right: none;
4435+ border-left: 8px solid #ffffff;
4436+ right: -8px;
4437+ top: 31px;
4438+ left: auto;
4439+}
4440+#topologyMessages {
4441+ width: 1px;
4442+ height: 1px;
4443+ visibility: hidden;
4444+ position: absolute;
4445+ top: -100px;
4446+}
4447+.link {
4448+ stroke: #999999;
4449+ stroke-width: 1.5px;
4450+}
4451+.node {
4452+ cursor: pointer;
4453+}
4454+.node text {
4455+ font: 12px sans-serif;
4456+}
4457+#resource_container {
4458+ position: relative;
4459+}
4460+#stack_box {
4461+ position: absolute;
4462+ width: 300px;
4463+ top: 10px;
4464+ left: 10px;
4465+}
4466+#stack_box h3 {
4467+ font-size: 11pt;
4468+ line-height: 20px;
4469+}
4470+#stack_box p {
4471+ margin: 0;
4472+ font-size: 9pt;
4473+ line-height: 14px;
4474+}
4475+#stack_box a {
4476+ margin: 0;
4477+ font-size: 9pt;
4478+ line-height: 14px;
4479+}
4480+#stack_box img {
4481+ float: left;
4482+}
4483+#stack_box #stack_info {
4484+ float: left;
4485+ white-space: normal;
4486+ width: 200px;
4487+}
4488+#info_box {
4489+ position: absolute;
4490+ width: 300px;
4491+ top: 100px;
4492+ left: 10px;
4493+}
4494+#info_box h3 {
4495+ font-size: 9pt;
4496+ line-height: 20px;
4497+}
4498+#info_box p {
4499+ margin: 0;
4500+ font-size: 9pt;
4501+ line-height: 14px;
4502+}
4503+#info_box a {
4504+ margin: 0;
4505+ font-size: 9pt;
4506+ line-height: 14px;
4507+}
4508+#info_box .error {
4509+ color: darkred;
4510+}
4511+#ceilometer-stats .form-horizontal .control-label {
4512+ width: auto;
4513+}
4514+#ceilometer-stats .form-horizontal .controls {
4515+ float: left;
4516+ margin-left: 0;
4517+}
4518+#ceilometer-stats .form-horizontal .control-group {
4519+ float: left;
4520+ margin-right: 20px;
4521+}
4522+#ceilometer-stats .form-horizontal .btn {
4523+ float: left;
4524+ margin-right: 20px;
4525+ margin-bottom: 18px;
4526+}
4527+#ruleListSortContainer {
4528+ display: none;
4529+}
4530+.rulelist {
4531+ padding: 6px;
4532+ background: #eeeeee;
4533+ border: 1px solid #cccccc;
4534+ min-height: 2em;
4535+ width: auto !important;
4536+ -webkit-box-sizing: border-box;
4537+ -moz-box-sizing: border-box;
4538+ box-sizing: border-box;
4539+}
4540+.rulelist li {
4541+ width: 226px;
4542+ list-style-type: none;
4543+ margin: 6px auto;
4544+ padding: 3px;
4545+ background: #ffffff;
4546+ border: 1px solid #aaaaaa;
4547+ line-height: 18px;
4548+ border-radius: 3px;
4549+ cursor: move;
4550+ padding-left: 23px;
4551+ background: white url('/static/dashboard/img/drag.png') no-repeat 11px 50%;
4552+}
4553+.rulelist li em {
4554+ font-size: 0.5em;
4555+ line-height: 1em;
4556+ color: #999999;
4557+ font-style: normal;
4558+ margin-left: 0.8em;
4559+}
4560+.rulelist li i {
4561+ margin-right: 5px;
4562+ vertical-align: middle;
4563+}
4564+.rulelist li a.btn {
4565+ -webkit-box-sizing: border-box;
4566+ -moz-box-sizing: border-box;
4567+ box-sizing: border-box;
4568 font-size: 11px;
4569- height: 1.5em;
4570- bottom: 0px;
4571- left: 0px;
4572-}
4573-div.network .router span.devicename,
4574-div.network .server span.devicename,
4575-div.network .device span.devicename {
4576- position: absolute;
4577- color: #fff;
4578- bottom: 0px;
4579- font-size: 12px;
4580- line-height: 14px;
4581- width: 100%;
4582+ line-height: 12px;
4583+ padding: 2px 5px 3px;
4584+ margin-right: 1px;
4585+ width: 18px;
4586 text-align: center;
4587- z-index: 300;
4588- left: -2px;
4589-}
4590-div.network .router span.name,
4591-div.network .server span.name,
4592-div.network .device span.name {
4593- overflow: hidden;
4594- white-space: nowrap;
4595- text-overflow: ellipsis;
4596+ right: 5px;
4597+ vertical-align: middle;
4598+ float: right;
4599+}
4600+.rulelist li a.btn:before {
4601+ content: "+";
4602+}
4603+.rulelist li.ui-sortable-helper {
4604+ background-color: #ddeeff;
4605+}
4606+.rulelist li.ui-state-highlight {
4607+ border: 1px dotted #cccccc;
4608+ background: #efefef;
4609+ height: 0.5em;
4610+}
4611+.rulelist li:after {
4612+ visibility: hidden;
4613 display: block;
4614- font-size: 12px;
4615- position: relative;
4616- z-index: 10;
4617- text-align: center;
4618- top: 4px;
4619- padding: 0 3px;
4620-}
4621-div.network .router div.port,
4622-div.network .server div.port,
4623-div.network .device div.port {
4624- text-align: right;
4625- min-width: 90px;
4626- height: 10px;
4627- font: 0px/0px sans-serif;
4628- position: absolute;
4629- left: -91px;
4630- top: 8px;
4631- background-color: #37a9e3;
4632- background-image: none;
4633- -webkit-background-size: 20px 20px;
4634- -moz-background-size: 20px 20px;
4635- -o-background-size: 20px 20px;
4636- background-size: 20px 20px;
4637- z-index: 100;
4638-}
4639-div.network .router div.port span.ip,
4640-div.network .server div.port span.ip,
4641-div.network .device div.port span.ip {
4642- -webkit-box-sizing: border-box;
4643- -moz-box-sizing: border-box;
4644- -ms-box-sizing: border-box;
4645- -o-box-sizing: border-box;
4646- box-sizing: border-box;
4647- color: #333;
4648- font-size: 9px;
4649- line-height: 1;
4650- text-shadow: 0px -1px #ffffff;
4651- position: relative;
4652- top: -1em;
4653- width: 90px;
4654+ font-size: 0;
4655+ content: " ";
4656+ clear: both;
4657+ height: 0;
4658+}
4659+#selected_rule {
4660+ margin-bottom: 1.5em;
4661+ counter-reset: v1 0;
4662+ background: #edf9ff;
4663+ border: 1px solid #77216f;
4664+}
4665+#selected_rule li {
4666+ position: relative;
4667+}
4668+#selected_rule li a.btn:before {
4669+ content: "-";
4670+}
4671+#selected_rule li:before {
4672+ content: "rule:"counter(v1);
4673+ counter-increment: v1;
4674 display: inline-block;
4675- padding-right: 8px;
4676- padding-left: 8px;
4677- word-wrap: break-word;
4678- word-break: break-all;
4679-}
4680-div.network .router div.port.right,
4681-div.network .server div.port.right,
4682-div.network .device div.port.right {
4683- left: auto;
4684- right: -92px;
4685- width: 92px;
4686- text-align: left;
4687-}
4688-div.network .router:hover,
4689-div.network .server:hover,
4690-div.network .device:hover {
4691- border-color: #222;
4692-}
4693-div.network .router:hover div.port,
4694-div.network .server:hover div.port,
4695-div.network .device:hover div.port {
4696- cursor: pointer;
4697- background-color: #2688c0;
4698- -webkit-animation: progress-bar-stripes 1s linear infinite;
4699- -moz-animation: progress-bar-stripes 1s linear infinite;
4700- -ms-animation: progress-bar-stripes 1s linear infinite;
4701- -o-animation: progress-bar-stripes 1s linear infinite;
4702- animation: progress-bar-stripes 1s linear infinite;
4703-}
4704-div.network .router:hover div.port:hover,
4705-div.network .server:hover div.port:hover,
4706-div.network .device:hover div.port:hover {
4707- -webkit-animation: progress-bar-stripes 0.3s linear infinite;
4708- -moz-animation: progress-bar-stripes 0.3s linear infinite;
4709- -ms-animation: progress-bar-stripes 0.3s linear infinite;
4710- -o-animation: progress-bar-stripes 0.3s linear infinite;
4711- animation: progress-bar-stripes 0.3s linear infinite;
4712-}
4713-div.network .router:hover div.port.nourl,
4714-div.network .server:hover div.port.nourl,
4715-div.network .device:hover div.port.nourl {
4716- cursor: auto;
4717- background-image: none;
4718-}
4719-div.network .router:hover div.port.nourl:hover,
4720-div.network .server:hover div.port.nourl:hover,
4721-div.network .device:hover div.port.nourl:hover {
4722- background-image: none;
4723-}
4724-div.network .router:hover:after,
4725-div.network .server:hover:after,
4726-div.network .device:hover:after {
4727- background-color: #222;
4728- border-color: #222;
4729-}
4730-div.network .device {
4731- border: none;
4732+ margin-right: 5px;
4733+ background: #666666;
4734+ color: #ffffff;
4735+ font-size: 90%;
4736+ padding: 0px 4px;
4737+ vertical-align: middle;
4738+ border-radius: 2px;
4739+ position: absolute;
4740+ left: -2em;
4741+}
4742+#selected_rule.dragging li:before {
4743+ content: "rule:";
4744+ background-color: rgba(102,102,102,0.5);
4745+ padding-right: 10px;
4746+}
4747+#selected_rule.dragging li.ui-state-highlight:before {
4748+ content: "";
4749 background: transparent;
4750 }
4751-div.network .server {
4752- background: #fff;
4753- color: #333;
4754-}
4755-div.network .server:before {
4756- background: #ffffff url(/static/dashboard/img/server.png) no-repeat center center;
4757- background-size: 14px 14px;
4758-}
4759-.launchButtons {
4760- text-align: right;
4761- margin: 10px 0px 15px 10px;
4762-}
4763-.launchButtons a.btn {
4764- margin-left: 10px;
4765-}
4766-
4767+
4768+.rickshaw_graph .detail {
4769+ pointer-events: none;
4770+ position: absolute;
4771+ top: 0;
4772+ z-index: 2;
4773+ background: rgba(0, 0, 0, 0.1);
4774+ bottom: 0;
4775+ width: 1px;
4776+ transition: opacity 0.25s linear;
4777+ -moz-transition: opacity 0.25s linear;
4778+ -o-transition: opacity 0.25s linear;
4779+ -webkit-transition: opacity 0.25s linear;
4780+}
4781+.rickshaw_graph .detail.inactive {
4782+ opacity: 0;
4783+}
4784+.rickshaw_graph .detail .item.active {
4785+ opacity: 1;
4786+}
4787+.rickshaw_graph .detail .x_label {
4788+ font-family: Arial, sans-serif;
4789+ border-radius: 3px;
4790+ padding: 6px;
4791+ opacity: 0.5;
4792+ border: 1px solid #e0e0e0;
4793+ font-size: 12px;
4794+ position: absolute;
4795+ background: white;
4796+ white-space: nowrap;
4797+}
4798+.rickshaw_graph .detail .item {
4799+ position: absolute;
4800+ z-index: 2;
4801+ border-radius: 3px;
4802+ padding: 0.25em;
4803+ font-size: 12px;
4804+ font-family: Arial, sans-serif;
4805+ opacity: 0;
4806+ background: rgba(0, 0, 0, 0.4);
4807+ color: white;
4808+ border: 1px solid rgba(0, 0, 0, 0.4);
4809+ margin-left: 1em;
4810+ margin-top: -1em;
4811+ white-space: nowrap;
4812+}
4813+.rickshaw_graph .detail .item.active {
4814+ opacity: 1;
4815+ background: rgba(0, 0, 0, 0.8);
4816+}
4817+.rickshaw_graph .detail .item:before {
4818+ content: "\25c2";
4819+ position: absolute;
4820+ left: -0.5em;
4821+ color: rgba(0, 0, 0, 0.7);
4822+ width: 0;
4823+}
4824+.rickshaw_graph .detail .dot {
4825+ width: 4px;
4826+ height: 4px;
4827+ margin-left: -4px;
4828+ margin-top: -3px;
4829+ border-radius: 5px;
4830+ position: absolute;
4831+ box-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
4832+ background: white;
4833+ border-width: 2px;
4834+ border-style: solid;
4835+ display: none;
4836+ background-clip: padding-box;
4837+}
4838+.rickshaw_graph .detail .dot.active {
4839+ display: block;
4840+}
4841+/* graph */
4842+
4843+.rickshaw_graph {
4844+ position: relative;
4845+}
4846+.rickshaw_graph svg {
4847+ display: block;
4848+ overflow: hidden;
4849+}
4850+
4851+/* ticks */
4852+
4853+.rickshaw_graph .x_tick {
4854+ position: absolute;
4855+ top: 0;
4856+ bottom: 0;
4857+ width: 0px;
4858+ border-left: 1px dotted rgba(0, 0, 0, 0.2);
4859+ pointer-events: none;
4860+}
4861+.rickshaw_graph .x_tick .title {
4862+ position: absolute;
4863+ font-size: 12px;
4864+ font-family: Arial, sans-serif;
4865+ opacity: 0.5;
4866+ white-space: nowrap;
4867+ margin-left: 3px;
4868+ bottom: 1px;
4869+}
4870+
4871+/* annotations */
4872+
4873+.rickshaw_annotation_timeline {
4874+ height: 1px;
4875+ border-top: 1px solid #e0e0e0;
4876+ margin-top: 10px;
4877+ position: relative;
4878+}
4879+.rickshaw_annotation_timeline .annotation {
4880+ position: absolute;
4881+ height: 6px;
4882+ width: 6px;
4883+ margin-left: -2px;
4884+ top: -3px;
4885+ border-radius: 5px;
4886+ background-color: rgba(0, 0, 0, 0.25);
4887+}
4888+.rickshaw_graph .annotation_line {
4889+ position: absolute;
4890+ top: 0;
4891+ bottom: -6px;
4892+ width: 0px;
4893+ border-left: 2px solid rgba(0, 0, 0, 0.3);
4894+ display: none;
4895+}
4896+.rickshaw_graph .annotation_line.active {
4897+ display: block;
4898+}
4899+
4900+.rickshaw_graph .annotation_range {
4901+ background: rgba(0, 0, 0, 0.1);
4902+ display: none;
4903+ position: absolute;
4904+ top: 0;
4905+ bottom: -6px;
4906+}
4907+.rickshaw_graph .annotation_range.active {
4908+ display: block;
4909+}
4910+.rickshaw_graph .annotation_range.active.offscreen {
4911+ display: none;
4912+}
4913+
4914+.rickshaw_annotation_timeline .annotation .content {
4915+ background: white;
4916+ color: black;
4917+ opacity: 0.9;
4918+ padding: 5px 5px;
4919+ box-shadow: 0 0 2px rgba(0, 0, 0, 0.8);
4920+ border-radius: 3px;
4921+ position: relative;
4922+ z-index: 20;
4923+ font-size: 12px;
4924+ padding: 6px 8px 8px;
4925+ top: 18px;
4926+ left: -11px;
4927+ width: 160px;
4928+ display: none;
4929+ cursor: pointer;
4930+}
4931+.rickshaw_annotation_timeline .annotation .content:before {
4932+ content: "\25b2";
4933+ position: absolute;
4934+ top: -11px;
4935+ color: white;
4936+ text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8);
4937+}
4938+.rickshaw_annotation_timeline .annotation.active,
4939+.rickshaw_annotation_timeline .annotation:hover {
4940+ background-color: rgba(0, 0, 0, 0.8);
4941+ cursor: none;
4942+}
4943+.rickshaw_annotation_timeline .annotation .content:hover {
4944+ z-index: 50;
4945+}
4946+.rickshaw_annotation_timeline .annotation.active .content {
4947+ display: block;
4948+}
4949+.rickshaw_annotation_timeline .annotation:hover .content {
4950+ display: block;
4951+ z-index: 50;
4952+}
4953+.rickshaw_graph .y_axis,
4954+.rickshaw_graph .x_axis_d3 {
4955+ fill: none;
4956+}
4957+.rickshaw_graph .y_ticks .tick,
4958+.rickshaw_graph .x_ticks_d3 .tick {
4959+ stroke: rgba(0, 0, 0, 0.16);
4960+ stroke-width: 2px;
4961+ shape-rendering: crisp-edges;
4962+ pointer-events: none;
4963+}
4964+.rickshaw_graph .y_grid .tick,
4965+.rickshaw_graph .x_grid_d3 .tick {
4966+ z-index: -1;
4967+ stroke: rgba(0, 0, 0, 0.20);
4968+ stroke-width: 1px;
4969+ stroke-dasharray: 1 1;
4970+}
4971+.rickshaw_graph .y_grid path,
4972+.rickshaw_graph .x_grid_d3 path {
4973+ fill: none;
4974+ stroke: none;
4975+}
4976+.rickshaw_graph .y_ticks path,
4977+.rickshaw_graph .x_ticks_d3 path {
4978+ fill: none;
4979+ stroke: #808080;
4980+}
4981+.rickshaw_graph .y_ticks text,
4982+.rickshaw_graph .x_ticks_d3 text {
4983+ opacity: 0.5;
4984+ font-size: 12px;
4985+ pointer-events: none;
4986+}
4987+.rickshaw_graph .x_tick.glow .title,
4988+.rickshaw_graph .y_ticks.glow text {
4989+ fill: black;
4990+ color: black;
4991+ text-shadow:
4992+ -1px 1px 0 rgba(255, 255, 255, 0.1),
4993+ 1px -1px 0 rgba(255, 255, 255, 0.1),
4994+ 1px 1px 0 rgba(255, 255, 255, 0.1),
4995+ 0px 1px 0 rgba(255, 255, 255, 0.1),
4996+ 0px -1px 0 rgba(255, 255, 255, 0.1),
4997+ 1px 0px 0 rgba(255, 255, 255, 0.1),
4998+ -1px 0px 0 rgba(255, 255, 255, 0.1),
4999+ -1px -1px 0 rgba(255, 255, 255, 0.1);
5000+}
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches