contour 1.0.6 → 1.1.0.pre

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. data/CHANGELOG.rdoc +9 -6
  2. data/README.rdoc +1 -1
  3. data/app/assets/images/contour/ui-bg_glass_75_d0e5f5_1x400.png +0 -0
  4. data/app/assets/images/contour/ui-bg_inset-hard_100_f5f8f9_1x100.png +0 -0
  5. data/app/assets/images/contour/ui-bg_inset-hard_100_fcfdfd_1x100.png +0 -0
  6. data/app/assets/images/contour/ui-icons_217bc0_256x240.png +0 -0
  7. data/app/assets/images/contour/ui-icons_d8e7f3_256x240.png +0 -0
  8. data/app/assets/images/contour/ui-icons_f9bd01_256x240.png +0 -0
  9. data/app/assets/images/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/glyphicons-halflings-white.png +0 -0
  10. data/app/assets/images/twitter-bootstrap/v2.1.0-wip/glyphicons-halflings.png +0 -0
  11. data/app/assets/javascripts/contour.js +15 -13
  12. data/app/assets/javascripts/contour/global.js.coffee +3 -0
  13. data/app/assets/javascripts/external/jquery-ui-1.8.22.custom.min.js +93 -0
  14. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/bootstrap.js +247 -152
  15. data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-affix.js +104 -0
  16. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-alert.js +0 -0
  17. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-button.js +0 -0
  18. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-carousel.js +11 -4
  19. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-collapse.js +3 -2
  20. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-dropdown.js +64 -14
  21. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-modal.js +94 -73
  22. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-popover.js +7 -3
  23. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-scrollspy.js +8 -8
  24. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-tab.js +1 -1
  25. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-tooltip.js +10 -12
  26. data/app/assets/javascripts/twitter-bootstrap/v2.1.0-wip/plugins/bootstrap-transition.js +60 -0
  27. data/app/assets/javascripts/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/plugins/bootstrap-typeahead.js +49 -34
  28. data/app/assets/stylesheets/bootstrap-base-overrides.css +23 -2
  29. data/app/assets/stylesheets/contour.css +3 -3
  30. data/app/assets/stylesheets/{jquery-ui-1.8.10.custom.css → jquery-ui-1.8.22.custom.css} +26 -219
  31. data/app/assets/stylesheets/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/bootstrap-responsive.css +528 -272
  32. data/app/assets/stylesheets/twitter-bootstrap/{v2.0.4 → v2.1.0-wip}/bootstrap.css +1304 -720
  33. data/app/controllers/contour/registrations_controller.rb +1 -1
  34. data/app/controllers/contour/sessions_controller.rb +1 -5
  35. data/app/views/contour/layouts/_menu.html.erb +2 -1
  36. data/app/views/contour/layouts/application.html.erb +25 -39
  37. data/contour.gemspec +1 -1
  38. data/lib/contour/version.rb +3 -3
  39. data/test/dummy/app/models/user.rb +1 -1
  40. data/test/dummy/db/test.sqlite3 +0 -0
  41. data/test/dummy/log/test.log +0 -2096
  42. metadata +27 -25
  43. data/app/assets/images/twitter-bootstrap/v2.0.4/glyphicons-halflings.png +0 -0
  44. data/app/assets/javascripts/external/jquery-ui-1.8.10.custom.min.js +0 -782
@@ -67,6 +67,7 @@ sub {
67
67
  }
68
68
 
69
69
  img {
70
+ height: auto;
70
71
  max-width: 100%;
71
72
  vertical-align: middle;
72
73
  border: 0;
@@ -130,6 +131,7 @@ textarea {
130
131
  .clearfix:before,
131
132
  .clearfix:after {
132
133
  display: table;
134
+ line-height: 0;
133
135
  content: "";
134
136
  }
135
137
 
@@ -148,18 +150,17 @@ textarea {
148
150
  .input-block-level {
149
151
  display: block;
150
152
  width: 100%;
151
- min-height: 28px;
153
+ min-height: 30px;
152
154
  -webkit-box-sizing: border-box;
153
155
  -moz-box-sizing: border-box;
154
- -ms-box-sizing: border-box;
155
156
  box-sizing: border-box;
156
157
  }
157
158
 
158
159
  body {
159
160
  margin: 0;
160
161
  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
161
- font-size: 13px;
162
- line-height: 18px;
162
+ font-size: 14px;
163
+ line-height: 20px;
163
164
  color: #333333;
164
165
  background-color: #ffffff;
165
166
  }
@@ -174,6 +175,28 @@ a:hover {
174
175
  text-decoration: underline;
175
176
  }
176
177
 
178
+ .img-rounded {
179
+ -webkit-border-radius: 6px;
180
+ -moz-border-radius: 6px;
181
+ border-radius: 6px;
182
+ }
183
+
184
+ .img-polaroid {
185
+ padding: 4px;
186
+ background-color: #fff;
187
+ border: 1px solid #ccc;
188
+ border: 1px solid rgba(0, 0, 0, 0.2);
189
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
190
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
191
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
192
+ }
193
+
194
+ .img-circle {
195
+ -webkit-border-radius: 500px;
196
+ -moz-border-radius: 500px;
197
+ border-radius: 500px;
198
+ }
199
+
177
200
  .row {
178
201
  margin-left: -20px;
179
202
  *zoom: 1;
@@ -182,6 +205,7 @@ a:hover {
182
205
  .row:before,
183
206
  .row:after {
184
207
  display: table;
208
+ line-height: 0;
185
209
  content: "";
186
210
  }
187
211
 
@@ -304,6 +328,7 @@ a:hover {
304
328
  .row-fluid:before,
305
329
  .row-fluid:after {
306
330
  display: table;
331
+ line-height: 0;
307
332
  content: "";
308
333
  }
309
334
 
@@ -315,12 +340,11 @@ a:hover {
315
340
  display: block;
316
341
  float: left;
317
342
  width: 100%;
318
- min-height: 28px;
319
- margin-left: 2.127659574%;
320
- *margin-left: 2.0744680846382977%;
343
+ min-height: 30px;
344
+ margin-left: 2.127659574468085%;
345
+ *margin-left: 2.074468085106383%;
321
346
  -webkit-box-sizing: border-box;
322
347
  -moz-box-sizing: border-box;
323
- -ms-box-sizing: border-box;
324
348
  box-sizing: border-box;
325
349
  }
326
350
 
@@ -329,63 +353,193 @@ a:hover {
329
353
  }
330
354
 
331
355
  .row-fluid .span12 {
332
- width: 99.99999998999999%;
333
- *width: 99.94680850063828%;
356
+ width: 100%;
357
+ *width: 99.94680851063829%;
334
358
  }
335
359
 
336
360
  .row-fluid .span11 {
337
- width: 91.489361693%;
338
- *width: 91.4361702036383%;
361
+ width: 91.48936170212765%;
362
+ *width: 91.43617021276594%;
339
363
  }
340
364
 
341
365
  .row-fluid .span10 {
342
- width: 82.97872339599999%;
343
- *width: 82.92553190663828%;
366
+ width: 82.97872340425532%;
367
+ *width: 82.92553191489361%;
344
368
  }
345
369
 
346
370
  .row-fluid .span9 {
347
- width: 74.468085099%;
348
- *width: 74.4148936096383%;
371
+ width: 74.46808510638297%;
372
+ *width: 74.41489361702126%;
349
373
  }
350
374
 
351
375
  .row-fluid .span8 {
352
- width: 65.95744680199999%;
353
- *width: 65.90425531263828%;
376
+ width: 65.95744680851064%;
377
+ *width: 65.90425531914893%;
354
378
  }
355
379
 
356
380
  .row-fluid .span7 {
357
- width: 57.446808505%;
358
- *width: 57.3936170156383%;
381
+ width: 57.44680851063829%;
382
+ *width: 57.39361702127659%;
359
383
  }
360
384
 
361
385
  .row-fluid .span6 {
362
- width: 48.93617020799999%;
363
- *width: 48.88297871863829%;
386
+ width: 48.93617021276595%;
387
+ *width: 48.88297872340425%;
364
388
  }
365
389
 
366
390
  .row-fluid .span5 {
367
- width: 40.425531911%;
368
- *width: 40.3723404216383%;
391
+ width: 40.42553191489362%;
392
+ *width: 40.37234042553192%;
369
393
  }
370
394
 
371
395
  .row-fluid .span4 {
372
- width: 31.914893614%;
373
- *width: 31.8617021246383%;
396
+ width: 31.914893617021278%;
397
+ *width: 31.861702127659576%;
374
398
  }
375
399
 
376
400
  .row-fluid .span3 {
377
- width: 23.404255317%;
378
- *width: 23.3510638276383%;
401
+ width: 23.404255319148934%;
402
+ *width: 23.351063829787233%;
379
403
  }
380
404
 
381
405
  .row-fluid .span2 {
382
- width: 14.89361702%;
383
- *width: 14.8404255306383%;
406
+ width: 14.893617021276595%;
407
+ *width: 14.840425531914894%;
384
408
  }
385
409
 
386
410
  .row-fluid .span1 {
387
- width: 6.382978723%;
388
- *width: 6.329787233638298%;
411
+ width: 6.382978723404255%;
412
+ *width: 6.329787234042553%;
413
+ }
414
+
415
+ .row-fluid .offset12 {
416
+ margin-left: 104.25531914893617%;
417
+ *margin-left: 104.14893617021275%;
418
+ }
419
+
420
+ .row-fluid .offset12:first-child {
421
+ margin-left: 102.12765957446808%;
422
+ *margin-left: 102.02127659574467%;
423
+ }
424
+
425
+ .row-fluid .offset11 {
426
+ margin-left: 95.74468085106382%;
427
+ *margin-left: 95.6382978723404%;
428
+ }
429
+
430
+ .row-fluid .offset11:first-child {
431
+ margin-left: 93.61702127659574%;
432
+ *margin-left: 93.51063829787232%;
433
+ }
434
+
435
+ .row-fluid .offset10 {
436
+ margin-left: 87.23404255319149%;
437
+ *margin-left: 87.12765957446807%;
438
+ }
439
+
440
+ .row-fluid .offset10:first-child {
441
+ margin-left: 85.1063829787234%;
442
+ *margin-left: 84.99999999999999%;
443
+ }
444
+
445
+ .row-fluid .offset9 {
446
+ margin-left: 78.72340425531914%;
447
+ *margin-left: 78.61702127659572%;
448
+ }
449
+
450
+ .row-fluid .offset9:first-child {
451
+ margin-left: 76.59574468085106%;
452
+ *margin-left: 76.48936170212764%;
453
+ }
454
+
455
+ .row-fluid .offset8 {
456
+ margin-left: 70.2127659574468%;
457
+ *margin-left: 70.10638297872339%;
458
+ }
459
+
460
+ .row-fluid .offset8:first-child {
461
+ margin-left: 68.08510638297872%;
462
+ *margin-left: 67.9787234042553%;
463
+ }
464
+
465
+ .row-fluid .offset7 {
466
+ margin-left: 61.70212765957446%;
467
+ *margin-left: 61.59574468085106%;
468
+ }
469
+
470
+ .row-fluid .offset7:first-child {
471
+ margin-left: 59.574468085106375%;
472
+ *margin-left: 59.46808510638297%;
473
+ }
474
+
475
+ .row-fluid .offset6 {
476
+ margin-left: 53.191489361702125%;
477
+ *margin-left: 53.085106382978715%;
478
+ }
479
+
480
+ .row-fluid .offset6:first-child {
481
+ margin-left: 51.063829787234035%;
482
+ *margin-left: 50.95744680851063%;
483
+ }
484
+
485
+ .row-fluid .offset5 {
486
+ margin-left: 44.68085106382979%;
487
+ *margin-left: 44.57446808510638%;
488
+ }
489
+
490
+ .row-fluid .offset5:first-child {
491
+ margin-left: 42.5531914893617%;
492
+ *margin-left: 42.4468085106383%;
493
+ }
494
+
495
+ .row-fluid .offset4 {
496
+ margin-left: 36.170212765957444%;
497
+ *margin-left: 36.06382978723405%;
498
+ }
499
+
500
+ .row-fluid .offset4:first-child {
501
+ margin-left: 34.04255319148936%;
502
+ *margin-left: 33.93617021276596%;
503
+ }
504
+
505
+ .row-fluid .offset3 {
506
+ margin-left: 27.659574468085104%;
507
+ *margin-left: 27.5531914893617%;
508
+ }
509
+
510
+ .row-fluid .offset3:first-child {
511
+ margin-left: 25.53191489361702%;
512
+ *margin-left: 25.425531914893618%;
513
+ }
514
+
515
+ .row-fluid .offset2 {
516
+ margin-left: 19.148936170212764%;
517
+ *margin-left: 19.04255319148936%;
518
+ }
519
+
520
+ .row-fluid .offset2:first-child {
521
+ margin-left: 17.02127659574468%;
522
+ *margin-left: 16.914893617021278%;
523
+ }
524
+
525
+ .row-fluid .offset1 {
526
+ margin-left: 10.638297872340425%;
527
+ *margin-left: 10.53191489361702%;
528
+ }
529
+
530
+ .row-fluid .offset1:first-child {
531
+ margin-left: 8.51063829787234%;
532
+ *margin-left: 8.404255319148938%;
533
+ }
534
+
535
+ [class*="span"].hide,
536
+ .row-fluid [class*="span"].hide {
537
+ display: none;
538
+ }
539
+
540
+ [class*="span"].pull-right,
541
+ .row-fluid [class*="span"].pull-right {
542
+ float: right;
389
543
  }
390
544
 
391
545
  .container {
@@ -397,6 +551,7 @@ a:hover {
397
551
  .container:before,
398
552
  .container:after {
399
553
  display: table;
554
+ line-height: 0;
400
555
  content: "";
401
556
  }
402
557
 
@@ -413,6 +568,7 @@ a:hover {
413
568
  .container-fluid:before,
414
569
  .container-fluid:after {
415
570
  display: table;
571
+ line-height: 0;
416
572
  content: "";
417
573
  }
418
574
 
@@ -421,19 +577,19 @@ a:hover {
421
577
  }
422
578
 
423
579
  p {
424
- margin: 0 0 9px;
580
+ margin: 0 0 10px;
425
581
  }
426
582
 
427
583
  p small {
428
- font-size: 11px;
584
+ font-size: 12px;
429
585
  color: #999999;
430
586
  }
431
587
 
432
588
  .lead {
433
- margin-bottom: 18px;
589
+ margin-bottom: 20px;
434
590
  font-size: 20px;
435
591
  font-weight: 200;
436
- line-height: 27px;
592
+ line-height: 30px;
437
593
  }
438
594
 
439
595
  h1,
@@ -442,9 +598,10 @@ h3,
442
598
  h4,
443
599
  h5,
444
600
  h6 {
445
- margin: 0;
601
+ margin: 10px 0;
446
602
  font-family: inherit;
447
603
  font-weight: bold;
604
+ line-height: 1;
448
605
  color: inherit;
449
606
  text-rendering: optimizelegibility;
450
607
  }
@@ -456,74 +613,66 @@ h4 small,
456
613
  h5 small,
457
614
  h6 small {
458
615
  font-weight: normal;
616
+ line-height: 1;
459
617
  color: #999999;
460
618
  }
461
619
 
462
620
  h1 {
463
- font-size: 30px;
464
- line-height: 36px;
465
- }
466
-
467
- h1 small {
468
- font-size: 18px;
621
+ font-size: 36px;
622
+ line-height: 40px;
469
623
  }
470
624
 
471
625
  h2 {
472
- font-size: 24px;
473
- line-height: 36px;
626
+ font-size: 30px;
627
+ line-height: 40px;
474
628
  }
475
629
 
476
- h2 small {
477
- font-size: 18px;
630
+ h3 {
631
+ font-size: 24px;
632
+ line-height: 40px;
478
633
  }
479
634
 
480
- h3 {
635
+ h4 {
481
636
  font-size: 18px;
482
- line-height: 27px;
637
+ line-height: 20px;
483
638
  }
484
639
 
485
- h3 small {
640
+ h5 {
486
641
  font-size: 14px;
642
+ line-height: 20px;
487
643
  }
488
644
 
489
- h4,
490
- h5,
491
645
  h6 {
492
- line-height: 18px;
646
+ font-size: 12px;
647
+ line-height: 20px;
493
648
  }
494
649
 
495
- h4 {
496
- font-size: 14px;
650
+ h1 small {
651
+ font-size: 24px;
497
652
  }
498
653
 
499
- h4 small {
500
- font-size: 12px;
654
+ h2 small {
655
+ font-size: 18px;
501
656
  }
502
657
 
503
- h5 {
504
- font-size: 12px;
658
+ h3 small {
659
+ font-size: 14px;
505
660
  }
506
661
 
507
- h6 {
508
- font-size: 11px;
509
- color: #999999;
510
- text-transform: uppercase;
662
+ h4 small {
663
+ font-size: 14px;
511
664
  }
512
665
 
513
666
  .page-header {
514
- padding-bottom: 17px;
515
- margin: 18px 0;
667
+ padding-bottom: 9px;
668
+ margin: 20px 0 30px;
516
669
  border-bottom: 1px solid #eeeeee;
517
670
  }
518
671
 
519
- .page-header h1 {
520
- line-height: 1;
521
- }
522
-
523
672
  ul,
524
673
  ol {
525
674
  padding: 0;
526
- margin: 0 0 9px 25px;
675
+ margin: 0 0 10px 25px;
527
676
  }
528
677
 
529
678
  ul ul,
@@ -533,16 +682,8 @@ ol ul {
533
682
  margin-bottom: 0;
534
683
  }
535
684
 
536
- ul {
537
- list-style: disc;
538
- }
539
-
540
- ol {
541
- list-style: decimal;
542
- }
543
-
544
685
  li {
545
- line-height: 18px;
686
+ line-height: 20px;
546
687
  }
547
688
 
548
689
  ul.unstyled,
@@ -552,21 +693,20 @@ ol.unstyled {
552
693
  }
553
694
 
554
695
  dl {
555
- margin-bottom: 18px;
696
+ margin-bottom: 20px;
556
697
  }
557
698
 
558
699
  dt,
559
700
  dd {
560
- line-height: 18px;
701
+ line-height: 20px;
561
702
  }
562
703
 
563
704
  dt {
564
705
  font-weight: bold;
565
- line-height: 17px;
566
706
  }
567
707
 
568
708
  dd {
569
- margin-left: 9px;
709
+ margin-left: 10px;
570
710
  }
571
711
 
572
712
  .dl-horizontal dt {
@@ -584,7 +724,7 @@ dd {
584
724
  }
585
725
 
586
726
  hr {
587
- margin: 18px 0;
727
+ margin: 20px 0;
588
728
  border: 0;
589
729
  border-top: 1px solid #eeeeee;
590
730
  border-bottom: 1px solid #ffffff;
@@ -614,7 +754,7 @@ abbr.initialism {
614
754
 
615
755
  blockquote {
616
756
  padding: 0 0 0 15px;
617
- margin: 0 0 18px;
757
+ margin: 0 0 20px;
618
758
  border-left: 5px solid #eeeeee;
619
759
  }
620
760
 
@@ -622,12 +762,12 @@ blockquote p {
622
762
  margin-bottom: 0;
623
763
  font-size: 16px;
624
764
  font-weight: 300;
625
- line-height: 22.5px;
765
+ line-height: 25px;
626
766
  }
627
767
 
628
768
  blockquote small {
629
769
  display: block;
630
- line-height: 18px;
770
+ line-height: 20px;
631
771
  color: #999999;
632
772
  }
633
773
 
@@ -648,6 +788,14 @@ blockquote.pull-right small {
648
788
  text-align: right;
649
789
  }
650
790
 
791
+ blockquote.pull-right small:before {
792
+ content: '';
793
+ }
794
+
795
+ blockquote.pull-right small:after {
796
+ content: '\00A0 \2014';
797
+ }
798
+
651
799
  q:before,
652
800
  q:after,
653
801
  blockquote:before,
@@ -657,9 +805,9 @@ blockquote:after {
657
805
 
658
806
  address {
659
807
  display: block;
660
- margin-bottom: 18px;
808
+ margin-bottom: 20px;
661
809
  font-style: normal;
662
- line-height: 18px;
810
+ line-height: 20px;
663
811
  }
664
812
 
665
813
  small {
@@ -673,7 +821,7 @@ cite {
673
821
  code,
674
822
  pre {
675
823
  padding: 0 3px 2px;
676
- font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
824
+ font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
677
825
  font-size: 12px;
678
826
  color: #333333;
679
827
  -webkit-border-radius: 3px;
@@ -690,10 +838,10 @@ code {
690
838
 
691
839
  pre {
692
840
  display: block;
693
- padding: 8.5px;
694
- margin: 0 0 9px;
695
- font-size: 12.025px;
696
- line-height: 18px;
841
+ padding: 9.5px;
842
+ margin: 0 0 10px;
843
+ font-size: 12px;
844
+ line-height: 20px;
697
845
  word-break: break-all;
698
846
  word-wrap: break-word;
699
847
  white-space: pre;
@@ -707,7 +855,7 @@ pre {
707
855
  }
708
856
 
709
857
  pre.prettyprint {
710
- margin-bottom: 18px;
858
+ margin-bottom: 20px;
711
859
  }
712
860
 
713
861
  pre code {
@@ -723,7 +871,7 @@ pre code {
723
871
  }
724
872
 
725
873
  form {
726
- margin: 0 0 18px;
874
+ margin: 0 0 20px;
727
875
  }
728
876
 
729
877
  fieldset {
@@ -736,16 +884,16 @@ legend {
736
884
  display: block;
737
885
  width: 100%;
738
886
  padding: 0;
739
- margin-bottom: 27px;
740
- font-size: 19.5px;
741
- line-height: 36px;
887
+ margin-bottom: 20px;
888
+ font-size: 21px;
889
+ line-height: 40px;
742
890
  color: #333333;
743
891
  border: 0;
744
892
  border-bottom: 1px solid #e5e5e5;
745
893
  }
746
894
 
747
895
  legend small {
748
- font-size: 13.5px;
896
+ font-size: 15px;
749
897
  color: #999999;
750
898
  }
751
899
 
@@ -754,9 +902,9 @@ input,
754
902
  button,
755
903
  select,
756
904
  textarea {
757
- font-size: 13px;
905
+ font-size: 14px;
758
906
  font-weight: normal;
759
- line-height: 18px;
907
+ line-height: 20px;
760
908
  }
761
909
 
762
910
  input,
@@ -789,12 +937,15 @@ input[type="tel"],
789
937
  input[type="color"],
790
938
  .uneditable-input {
791
939
  display: inline-block;
792
- height: 18px;
793
- padding: 4px;
940
+ height: 20px;
941
+ padding: 4px 6px;
794
942
  margin-bottom: 9px;
795
- font-size: 13px;
796
- line-height: 18px;
943
+ font-size: 14px;
944
+ line-height: 20px;
797
945
  color: #555555;
946
+ -webkit-border-radius: 3px;
947
+ -moz-border-radius: 3px;
948
+ border-radius: 3px;
798
949
  }
799
950
 
800
951
  input,
@@ -824,15 +975,11 @@ input[type="color"],
824
975
  .uneditable-input {
825
976
  background-color: #ffffff;
826
977
  border: 1px solid #cccccc;
827
- -webkit-border-radius: 3px;
828
- -moz-border-radius: 3px;
829
- border-radius: 3px;
830
978
  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
831
979
  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
832
980
  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
833
981
  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
834
982
  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
835
- -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
836
983
  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
837
984
  transition: border linear 0.2s, box-shadow linear 0.2s;
838
985
  }
@@ -865,14 +1012,14 @@ input[type="color"]:focus,
865
1012
 
866
1013
  input[type="radio"],
867
1014
  input[type="checkbox"] {
868
- margin: 3px 0;
1015
+ margin: 4px 0 0;
1016
+ margin-top: 1px \9;
869
1017
  *margin-top: 0;
870
- /* IE7 */
871
-
872
1018
  line-height: normal;
873
1019
  cursor: pointer;
874
1020
  }
875
1021
 
1022
+ input[type="image"],
876
1023
  input[type="submit"],
877
1024
  input[type="reset"],
878
1025
  input[type="button"],
@@ -881,24 +1028,20 @@ input[type="checkbox"] {
881
1028
  width: auto;
882
1029
  }
883
1030
 
884
- .uneditable-textarea {
885
- width: auto;
886
- height: auto;
887
- }
888
-
889
1031
  select,
890
1032
  input[type="file"] {
891
- height: 28px;
1033
+ height: 30px;
892
1034
  /* In IE7, the height of the select element cannot be changed by height, only font-size */
893
1035
 
894
1036
  *margin-top: 4px;
895
1037
  /* For IE7, add top margin to align select with labels */
896
1038
 
897
- line-height: 28px;
1039
+ line-height: 30px;
898
1040
  }
899
1041
 
900
1042
  select {
901
1043
  width: 220px;
1044
+ background-color: #ffffff;
902
1045
  border: 1px solid #bbb;
903
1046
  }
904
1047
 
@@ -916,6 +1059,42 @@ input[type="checkbox"]:focus {
916
1059
  outline-offset: -2px;
917
1060
  }
918
1061
 
1062
+ .uneditable-input,
1063
+ .uneditable-textarea {
1064
+ color: #999999;
1065
+ cursor: not-allowed;
1066
+ background-color: #fcfcfc;
1067
+ border-color: #cccccc;
1068
+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
1069
+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
1070
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
1071
+ }
1072
+
1073
+ .uneditable-input {
1074
+ overflow: hidden;
1075
+ white-space: nowrap;
1076
+ }
1077
+
1078
+ .uneditable-textarea {
1079
+ width: auto;
1080
+ height: auto;
1081
+ }
1082
+
1083
+ input:-moz-placeholder,
1084
+ textarea:-moz-placeholder {
1085
+ color: #999999;
1086
+ }
1087
+
1088
+ input:-ms-input-placeholder,
1089
+ textarea:-ms-input-placeholder {
1090
+ color: #999999;
1091
+ }
1092
+
1093
+ input::-webkit-input-placeholder,
1094
+ textarea::-webkit-input-placeholder {
1095
+ color: #999999;
1096
+ }
1097
+
919
1098
  .radio,
920
1099
  .checkbox {
921
1100
  min-height: 18px;
@@ -986,6 +1165,10 @@ textarea[class*="span"],
986
1165
  .input-append .uneditable-input[class*="span"],
987
1166
  .input-prepend input[class*="span"],
988
1167
  .input-prepend .uneditable-input[class*="span"],
1168
+ .row-fluid input[class*="span"],
1169
+ .row-fluid select[class*="span"],
1170
+ .row-fluid textarea[class*="span"],
1171
+ .row-fluid .uneditable-input[class*="span"],
989
1172
  .row-fluid .input-prepend [class*="span"],
990
1173
  .row-fluid .input-append [class*="span"] {
991
1174
  display: inline-block;
@@ -997,76 +1180,99 @@ textarea,
997
1180
  margin-left: 0;
998
1181
  }
999
1182
 
1183
+ .controls-row [class*="span"] + [class*="span"] {
1184
+ margin-left: 20px;
1185
+ }
1186
+
1000
1187
  input.span12,
1001
1188
  textarea.span12,
1002
1189
  .uneditable-input.span12 {
1003
- width: 930px;
1190
+ width: 926px;
1004
1191
  }
1005
1192
 
1006
1193
  input.span11,
1007
1194
  textarea.span11,
1008
1195
  .uneditable-input.span11 {
1009
- width: 850px;
1196
+ width: 846px;
1010
1197
  }
1011
1198
 
1012
1199
  input.span10,
1013
1200
  textarea.span10,
1014
1201
  .uneditable-input.span10 {
1015
- width: 770px;
1202
+ width: 766px;
1016
1203
  }
1017
1204
 
1018
1205
  input.span9,
1019
1206
  textarea.span9,
1020
1207
  .uneditable-input.span9 {
1021
- width: 690px;
1208
+ width: 686px;
1022
1209
  }
1023
1210
 
1024
1211
  input.span8,
1025
1212
  textarea.span8,
1026
1213
  .uneditable-input.span8 {
1027
- width: 610px;
1214
+ width: 606px;
1028
1215
  }
1029
1216
 
1030
1217
  input.span7,
1031
1218
  textarea.span7,
1032
1219
  .uneditable-input.span7 {
1033
- width: 530px;
1220
+ width: 526px;
1034
1221
  }
1035
1222
 
1036
1223
  input.span6,
1037
1224
  textarea.span6,
1038
1225
  .uneditable-input.span6 {
1039
- width: 450px;
1226
+ width: 446px;
1040
1227
  }
1041
1228
 
1042
1229
  input.span5,
1043
1230
  textarea.span5,
1044
1231
  .uneditable-input.span5 {
1045
- width: 370px;
1232
+ width: 366px;
1046
1233
  }
1047
1234
 
1048
1235
  input.span4,
1049
1236
  textarea.span4,
1050
1237
  .uneditable-input.span4 {
1051
- width: 290px;
1238
+ width: 286px;
1052
1239
  }
1053
1240
 
1054
1241
  input.span3,
1055
1242
  textarea.span3,
1056
1243
  .uneditable-input.span3 {
1057
- width: 210px;
1244
+ width: 206px;
1058
1245
  }
1059
1246
 
1060
1247
  input.span2,
1061
1248
  textarea.span2,
1062
1249
  .uneditable-input.span2 {
1063
- width: 130px;
1250
+ width: 126px;
1064
1251
  }
1065
1252
 
1066
1253
  input.span1,
1067
1254
  textarea.span1,
1068
1255
  .uneditable-input.span1 {
1069
- width: 50px;
1256
+ width: 46px;
1257
+ }
1258
+
1259
+ .controls-row {
1260
+ *zoom: 1;
1261
+ }
1262
+
1263
+ .controls-row:before,
1264
+ .controls-row:after {
1265
+ display: table;
1266
+ line-height: 0;
1267
+ content: "";
1268
+ }
1269
+
1270
+ .controls-row:after {
1271
+ clear: both;
1272
+ }
1273
+
1274
+ .controls-row [class*="span"] {
1275
+ float: left;
1070
1276
  }
1071
1277
 
1072
1278
  input[disabled],
@@ -1077,7 +1283,6 @@ select[readonly],
1077
1283
  textarea[readonly] {
1078
1284
  cursor: not-allowed;
1079
1285
  background-color: #eeeeee;
1080
- border-color: #ddd;
1081
1286
  }
1082
1287
 
1083
1288
  input[type="radio"][disabled],
@@ -1100,6 +1305,9 @@ input[type="checkbox"][readonly] {
1100
1305
  .control-group.warning textarea {
1101
1306
  color: #c09853;
1102
1307
  border-color: #c09853;
1308
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1309
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1310
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1103
1311
  }
1104
1312
 
1105
1313
  .control-group.warning .checkbox:focus,
@@ -1108,9 +1316,9 @@ input[type="checkbox"][readonly] {
1108
1316
  .control-group.warning select:focus,
1109
1317
  .control-group.warning textarea:focus {
1110
1318
  border-color: #a47e3c;
1111
- -webkit-box-shadow: 0 0 6px #dbc59e;
1112
- -moz-box-shadow: 0 0 6px #dbc59e;
1113
- box-shadow: 0 0 6px #dbc59e;
1319
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
1320
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
1321
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
1114
1322
  }
1115
1323
 
1116
1324
  .control-group.warning .input-prepend .add-on,
@@ -1133,6 +1341,9 @@ input[type="checkbox"][readonly] {
1133
1341
  .control-group.error textarea {
1134
1342
  color: #b94a48;
1135
1343
  border-color: #b94a48;
1344
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1345
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1346
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1136
1347
  }
1137
1348
 
1138
1349
  .control-group.error .checkbox:focus,
@@ -1141,9 +1352,9 @@ input[type="checkbox"][readonly] {
1141
1352
  .control-group.error select:focus,
1142
1353
  .control-group.error textarea:focus {
1143
1354
  border-color: #953b39;
1144
- -webkit-box-shadow: 0 0 6px #d59392;
1145
- -moz-box-shadow: 0 0 6px #d59392;
1146
- box-shadow: 0 0 6px #d59392;
1355
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
1356
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
1357
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
1147
1358
  }
1148
1359
 
1149
1360
  .control-group.error .input-prepend .add-on,
@@ -1166,6 +1377,9 @@ input[type="checkbox"][readonly] {
1166
1377
  .control-group.success textarea {
1167
1378
  color: #468847;
1168
1379
  border-color: #468847;
1380
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1381
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1382
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
1169
1383
  }
1170
1384
 
1171
1385
  .control-group.success .checkbox:focus,
@@ -1174,9 +1388,9 @@ input[type="checkbox"][readonly] {
1174
1388
  .control-group.success select:focus,
1175
1389
  .control-group.success textarea:focus {
1176
1390
  border-color: #356635;
1177
- -webkit-box-shadow: 0 0 6px #7aba7b;
1178
- -moz-box-shadow: 0 0 6px #7aba7b;
1179
- box-shadow: 0 0 6px #7aba7b;
1391
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
1392
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
1393
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
1180
1394
  }
1181
1395
 
1182
1396
  .control-group.success .input-prepend .add-on,
@@ -1203,9 +1417,9 @@ select:focus:required:invalid:focus {
1203
1417
  }
1204
1418
 
1205
1419
  .form-actions {
1206
- padding: 17px 20px 18px;
1207
- margin-top: 18px;
1208
- margin-bottom: 18px;
1420
+ padding: 19px 20px 20px;
1421
+ margin-top: 20px;
1422
+ margin-bottom: 20px;
1209
1423
  background-color: #f5f5f5;
1210
1424
  border-top: 1px solid #e5e5e5;
1211
1425
  *zoom: 1;
@@ -1214,6 +1428,7 @@ select:focus:required:invalid:focus {
1214
1428
  .form-actions:before,
1215
1429
  .form-actions:after {
1216
1430
  display: table;
1431
+ line-height: 0;
1217
1432
  content: "";
1218
1433
  }
1219
1434
 
@@ -1221,37 +1436,14 @@ select:focus:required:invalid:focus {
1221
1436
  clear: both;
1222
1437
  }
1223
1438
 
1224
- .uneditable-input {
1225
- overflow: hidden;
1226
- white-space: nowrap;
1227
- cursor: not-allowed;
1228
- background-color: #ffffff;
1229
- border-color: #eee;
1230
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
1231
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
1232
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
1233
- }
1234
-
1235
- :-moz-placeholder {
1236
- color: #999999;
1439
+ .help-block,
1440
+ .help-inline {
1441
+ color: #595959;
1237
1442
  }
1238
1443
 
1239
- :-ms-input-placeholder {
1240
- color: #999999;
1241
- }
1242
-
1243
- ::-webkit-input-placeholder {
1244
- color: #999999;
1245
- }
1246
-
1247
- .help-block,
1248
- .help-inline {
1249
- color: #555555;
1250
- }
1251
-
1252
- .help-block {
1253
- display: block;
1254
- margin-bottom: 9px;
1444
+ .help-block {
1445
+ display: block;
1446
+ margin-bottom: 10px;
1255
1447
  }
1256
1448
 
1257
1449
  .help-inline {
@@ -1262,49 +1454,48 @@ select:focus:required:invalid:focus {
1262
1454
  *zoom: 1;
1263
1455
  }
1264
1456
 
1265
- .input-prepend,
1266
- .input-append {
1457
+ .input-append,
1458
+ .input-prepend {
1267
1459
  margin-bottom: 5px;
1460
+ font-size: 0;
1461
+ white-space: nowrap;
1268
1462
  }
1269
1463
 
1270
- .input-prepend input,
1271
1464
  .input-append input,
1272
- .input-prepend select,
1465
+ .input-prepend input,
1273
1466
  .input-append select,
1274
- .input-prepend .uneditable-input,
1275
- .input-append .uneditable-input {
1467
+ .input-prepend select,
1468
+ .input-append .uneditable-input,
1469
+ .input-prepend .uneditable-input {
1276
1470
  position: relative;
1277
1471
  margin-bottom: 0;
1278
1472
  *margin-left: 0;
1473
+ font-size: 14px;
1279
1474
  vertical-align: middle;
1280
1475
  -webkit-border-radius: 0 3px 3px 0;
1281
1476
  -moz-border-radius: 0 3px 3px 0;
1282
1477
  border-radius: 0 3px 3px 0;
1283
1478
  }
1284
1479
 
1285
- .input-prepend input:focus,
1286
1480
  .input-append input:focus,
1287
- .input-prepend select:focus,
1481
+ .input-prepend input:focus,
1288
1482
  .input-append select:focus,
1289
- .input-prepend .uneditable-input:focus,
1290
- .input-append .uneditable-input:focus {
1483
+ .input-prepend select:focus,
1484
+ .input-append .uneditable-input:focus,
1485
+ .input-prepend .uneditable-input:focus {
1291
1486
  z-index: 2;
1292
1487
  }
1293
1488
 
1294
- .input-prepend .uneditable-input,
1295
- .input-append .uneditable-input {
1296
- border-left-color: #ccc;
1297
- }
1298
-
1299
- .input-prepend .add-on,
1300
- .input-append .add-on {
1489
+ .input-append .add-on,
1490
+ .input-prepend .add-on {
1301
1491
  display: inline-block;
1302
1492
  width: auto;
1303
- height: 18px;
1493
+ height: 20px;
1304
1494
  min-width: 16px;
1305
1495
  padding: 4px 5px;
1496
+ font-size: 14px;
1306
1497
  font-weight: normal;
1307
- line-height: 18px;
1498
+ line-height: 20px;
1308
1499
  text-align: center;
1309
1500
  text-shadow: 0 1px 0 #ffffff;
1310
1501
  vertical-align: middle;
@@ -1312,18 +1503,18 @@ select:focus:required:invalid:focus {
1312
1503
  border: 1px solid #ccc;
1313
1504
  }
1314
1505
 
1315
- .input-prepend .add-on,
1316
1506
  .input-append .add-on,
1317
- .input-prepend .btn,
1318
- .input-append .btn {
1507
+ .input-prepend .add-on,
1508
+ .input-append .btn,
1509
+ .input-prepend .btn {
1319
1510
  margin-left: -1px;
1320
1511
  -webkit-border-radius: 0;
1321
1512
  -moz-border-radius: 0;
1322
1513
  border-radius: 0;
1323
1514
  }
1324
1515
 
1325
- .input-prepend .active,
1326
- .input-append .active {
1516
+ .input-append .active,
1517
+ .input-prepend .active {
1327
1518
  background-color: #a9dba9;
1328
1519
  border-color: #46a546;
1329
1520
  }
@@ -1348,11 +1539,6 @@ select:focus:required:invalid:focus {
1348
1539
  border-radius: 3px 0 0 3px;
1349
1540
  }
1350
1541
 
1351
- .input-append .uneditable-input {
1352
- border-right-color: #ccc;
1353
- border-left-color: #eee;
1354
- }
1355
-
1356
1542
  .input-append .add-on:last-child,
1357
1543
  .input-append .btn:last-child {
1358
1544
  -webkit-border-radius: 0 3px 3px 0;
@@ -1392,9 +1578,42 @@ select:focus:required:invalid:focus {
1392
1578
  /* IE7-8 doesn't have border-radius, so don't indent the padding */
1393
1579
 
1394
1580
  margin-bottom: 0;
1395
- -webkit-border-radius: 14px;
1396
- -moz-border-radius: 14px;
1397
- border-radius: 14px;
1581
+ -webkit-border-radius: 15px;
1582
+ -moz-border-radius: 15px;
1583
+ border-radius: 15px;
1584
+ }
1585
+
1586
+ /* Allow for input prepend/append in search forms */
1587
+
1588
+ .form-search .input-append .search-query,
1589
+ .form-search .input-prepend .search-query {
1590
+ -webkit-border-radius: 0;
1591
+ -moz-border-radius: 0;
1592
+ border-radius: 0;
1593
+ }
1594
+
1595
+ .form-search .input-append .search-query {
1596
+ -webkit-border-radius: 14px 0 0 14px;
1597
+ -moz-border-radius: 14px 0 0 14px;
1598
+ border-radius: 14px 0 0 14px;
1599
+ }
1600
+
1601
+ .form-search .input-append .btn {
1602
+ -webkit-border-radius: 0 14px 14px 0;
1603
+ -moz-border-radius: 0 14px 14px 0;
1604
+ border-radius: 0 14px 14px 0;
1605
+ }
1606
+
1607
+ .form-search .input-prepend .search-query {
1608
+ -webkit-border-radius: 0 14px 14px 0;
1609
+ -moz-border-radius: 0 14px 14px 0;
1610
+ border-radius: 0 14px 14px 0;
1611
+ }
1612
+
1613
+ .form-search .input-prepend .btn {
1614
+ -webkit-border-radius: 14px 0 0 14px;
1615
+ -moz-border-radius: 14px 0 0 14px;
1616
+ border-radius: 14px 0 0 14px;
1398
1617
  }
1399
1618
 
1400
1619
  .form-search input,
@@ -1421,6 +1640,7 @@ select:focus:required:invalid:focus {
1421
1640
  display: inline-block;
1422
1641
  *display: inline;
1423
1642
  margin-bottom: 0;
1643
+ vertical-align: middle;
1424
1644
  *zoom: 1;
1425
1645
  }
1426
1646
 
@@ -1461,22 +1681,23 @@ select:focus:required:invalid:focus {
1461
1681
  }
1462
1682
 
1463
1683
  .control-group {
1464
- margin-bottom: 9px;
1684
+ margin-bottom: 10px;
1465
1685
  }
1466
1686
 
1467
1687
  legend + .control-group {
1468
- margin-top: 18px;
1688
+ margin-top: 20px;
1469
1689
  -webkit-margin-top-collapse: separate;
1470
1690
  }
1471
1691
 
1472
1692
  .form-horizontal .control-group {
1473
- margin-bottom: 18px;
1693
+ margin-bottom: 20px;
1474
1694
  *zoom: 1;
1475
1695
  }
1476
1696
 
1477
1697
  .form-horizontal .control-group:before,
1478
1698
  .form-horizontal .control-group:after {
1479
1699
  display: table;
1700
+ line-height: 0;
1480
1701
  content: "";
1481
1702
  }
1482
1703
 
@@ -1503,7 +1724,7 @@ legend + .control-group {
1503
1724
  }
1504
1725
 
1505
1726
  .form-horizontal .help-block {
1506
- margin-top: 9px;
1727
+ margin-top: 10px;
1507
1728
  margin-bottom: 0;
1508
1729
  }
1509
1730
 
@@ -1520,13 +1741,13 @@ table {
1520
1741
 
1521
1742
  .table {
1522
1743
  width: 100%;
1523
- margin-bottom: 18px;
1744
+ margin-bottom: 20px;
1524
1745
  }
1525
1746
 
1526
1747
  .table th,
1527
1748
  .table td {
1528
1749
  padding: 8px;
1529
- line-height: 18px;
1750
+ line-height: 20px;
1530
1751
  text-align: left;
1531
1752
  vertical-align: top;
1532
1753
  border-top: 1px solid #dddddd;
@@ -1561,7 +1782,7 @@ table {
1561
1782
  .table-bordered {
1562
1783
  border: 1px solid #dddddd;
1563
1784
  border-collapse: separate;
1564
- *border-collapse: collapsed;
1785
+ *border-collapse: collapse;
1565
1786
  border-left: 0;
1566
1787
  -webkit-border-radius: 4px;
1567
1788
  -moz-border-radius: 4px;
@@ -1600,7 +1821,8 @@ table {
1600
1821
  }
1601
1822
 
1602
1823
  .table-bordered thead:last-child tr:last-child th:first-child,
1603
- .table-bordered tbody:last-child tr:last-child td:first-child {
1824
+ .table-bordered tbody:last-child tr:last-child td:first-child,
1825
+ .table-bordered tfoot:last-child tr:last-child td:first-child {
1604
1826
  -webkit-border-radius: 0 0 0 4px;
1605
1827
  -moz-border-radius: 0 0 0 4px;
1606
1828
  border-radius: 0 0 0 4px;
@@ -1610,22 +1832,48 @@ table {
1610
1832
  }
1611
1833
 
1612
1834
  .table-bordered thead:last-child tr:last-child th:last-child,
1613
- .table-bordered tbody:last-child tr:last-child td:last-child {
1835
+ .table-bordered tbody:last-child tr:last-child td:last-child,
1836
+ .table-bordered tfoot:last-child tr:last-child td:last-child {
1614
1837
  -webkit-border-bottom-right-radius: 4px;
1615
1838
  border-bottom-right-radius: 4px;
1616
1839
  -moz-border-radius-bottomright: 4px;
1617
1840
  }
1618
1841
 
1842
+ .table-bordered caption + thead tr:first-child th:first-child,
1843
+ .table-bordered caption + tbody tr:first-child td:first-child,
1844
+ .table-bordered colgroup + thead tr:first-child th:first-child,
1845
+ .table-bordered colgroup + tbody tr:first-child td:first-child {
1846
+ -webkit-border-top-left-radius: 4px;
1847
+ border-top-left-radius: 4px;
1848
+ -moz-border-radius-topleft: 4px;
1849
+ }
1850
+
1851
+ .table-bordered caption + thead tr:first-child th:last-child,
1852
+ .table-bordered caption + tbody tr:first-child td:last-child,
1853
+ .table-bordered colgroup + thead tr:first-child th:last-child,
1854
+ .table-bordered colgroup + tbody tr:first-child td:last-child {
1855
+ -webkit-border-top-right-radius: 4px;
1856
+ border-top-right-radius: 4px;
1857
+ -moz-border-right-topleft: 4px;
1858
+ }
1859
+
1619
1860
  .table-striped tbody tr:nth-child(odd) td,
1620
1861
  .table-striped tbody tr:nth-child(odd) th {
1621
1862
  background-color: #f9f9f9;
1622
1863
  }
1623
1864
 
1624
- .table tbody tr:hover td,
1625
- .table tbody tr:hover th {
1865
+ .table-hover tbody tr:hover td,
1866
+ .table-hover tbody tr:hover th {
1626
1867
  background-color: #f5f5f5;
1627
1868
  }
1628
1869
 
1870
+ table [class*=span],
1871
+ .row-fluid table [class*=span] {
1872
+ display: table-cell;
1873
+ float: none;
1874
+ margin-left: 0;
1875
+ }
1876
+
1629
1877
  table .span1 {
1630
1878
  float: none;
1631
1879
  width: 44px;
@@ -1770,6 +2018,18 @@ table .span24 {
1770
2018
  margin-left: 0;
1771
2019
  }
1772
2020
 
2021
+ .table tbody tr.success td {
2022
+ background-color: #dff0d8;
2023
+ }
2024
+
2025
+ .table tbody tr.error td {
2026
+ background-color: #f2dede;
2027
+ }
2028
+
2029
+ .table tbody tr.info td {
2030
+ background-color: #d9edf7;
2031
+ }
2032
+
1773
2033
  [class^="icon-"],
1774
2034
  [class*=" icon-"] {
1775
2035
  display: inline-block;
@@ -1783,12 +2043,14 @@ table .span24 {
1783
2043
  background-repeat: no-repeat;
1784
2044
  }
1785
2045
 
1786
- [class^="icon-"]:last-child,
1787
- [class*=" icon-"]:last-child {
1788
- *margin-left: 0;
1789
- }
2046
+ /* White icons with optional class, or on hover/active states of certain elements */
1790
2047
 
1791
- .icon-white {
2048
+ .icon-white,
2049
+ .nav > .active > a > [class^="icon-"],
2050
+ .nav > .active > a > [class*=" icon-"],
2051
+ .dropdown-menu > li > a:hover > [class^="icon-"],
2052
+ .dropdown-menu > li > a:hover > [class*=" icon-"].dropdown-menu > .active > a > [class^="icon-"],
2053
+ .dropdown-menu > .active > a > [class*=" icon-"] {
1792
2054
  background-image: url("../img/glyphicons-halflings-white.png");
1793
2055
  }
1794
2056
 
@@ -2229,6 +2491,7 @@ table .span24 {
2229
2491
  }
2230
2492
 
2231
2493
  .icon-random {
2494
+ width: 16px;
2232
2495
  background-position: -216px -120px;
2233
2496
  }
2234
2497
 
@@ -2261,6 +2524,7 @@ table .span24 {
2261
2524
  }
2262
2525
 
2263
2526
  .icon-folder-open {
2527
+ width: 16px;
2264
2528
  background-position: -408px -120px;
2265
2529
  }
2266
2530
 
@@ -2375,8 +2639,6 @@ table .span24 {
2375
2639
  border-right: 4px solid transparent;
2376
2640
  border-left: 4px solid transparent;
2377
2641
  content: "";
2378
- opacity: 0.3;
2379
- filter: alpha(opacity=30);
2380
2642
  }
2381
2643
 
2382
2644
  .dropdown .caret {
@@ -2384,12 +2646,6 @@ table .span24 {
2384
2646
  margin-left: 2px;
2385
2647
  }
2386
2648
 
2387
- .dropdown:hover .caret,
2388
- .open .caret {
2389
- opacity: 1;
2390
- filter: alpha(opacity=100);
2391
- }
2392
-
2393
2649
  .dropdown-menu {
2394
2650
  position: absolute;
2395
2651
  top: 100%;
@@ -2398,17 +2654,17 @@ table .span24 {
2398
2654
  display: none;
2399
2655
  float: left;
2400
2656
  min-width: 160px;
2401
- padding: 4px 0;
2402
- margin: 1px 0 0;
2657
+ padding: 5px 0;
2658
+ margin: 2px 0 0;
2403
2659
  list-style: none;
2404
2660
  background-color: #ffffff;
2405
2661
  border: 1px solid #ccc;
2406
2662
  border: 1px solid rgba(0, 0, 0, 0.2);
2407
2663
  *border-right-width: 2px;
2408
2664
  *border-bottom-width: 2px;
2409
- -webkit-border-radius: 5px;
2410
- -moz-border-radius: 5px;
2411
- border-radius: 5px;
2665
+ -webkit-border-radius: 6px;
2666
+ -moz-border-radius: 6px;
2667
+ border-radius: 6px;
2412
2668
  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
2413
2669
  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
2414
2670
  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -2425,7 +2681,7 @@ table .span24 {
2425
2681
  .dropdown-menu .divider {
2426
2682
  *width: 100%;
2427
2683
  height: 1px;
2428
- margin: 8px 1px;
2684
+ margin: 9px 1px;
2429
2685
  *margin: -5px 0 5px;
2430
2686
  overflow: hidden;
2431
2687
  background-color: #e5e5e5;
@@ -2434,20 +2690,55 @@ table .span24 {
2434
2690
 
2435
2691
  .dropdown-menu a {
2436
2692
  display: block;
2437
- padding: 3px 15px;
2693
+ padding: 3px 20px;
2438
2694
  clear: both;
2439
2695
  font-weight: normal;
2440
- line-height: 18px;
2696
+ line-height: 20px;
2441
2697
  color: #333333;
2442
2698
  white-space: nowrap;
2443
2699
  }
2444
2700
 
2445
2701
  .dropdown-menu li > a:hover,
2702
+ .dropdown-menu li > a:focus,
2703
+ .dropdown-submenu:hover > a {
2704
+ color: #ffffff;
2705
+ text-decoration: none;
2706
+ background-color: #0088cc;
2707
+ background-color: #0081c2;
2708
+ background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
2709
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
2710
+ background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
2711
+ background-image: -o-linear-gradient(top, #0088cc, #0077b3);
2712
+ background-image: linear-gradient(to bottom, #0088cc, #0077b3);
2713
+ background-repeat: repeat-x;
2714
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
2715
+ }
2716
+
2446
2717
  .dropdown-menu .active > a,
2447
2718
  .dropdown-menu .active > a:hover {
2448
2719
  color: #ffffff;
2449
2720
  text-decoration: none;
2450
2721
  background-color: #0088cc;
2722
+ background-color: #0081c2;
2723
+ background-image: linear-gradient(to bottom, #0088cc, #0077b3);
2724
+ background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
2725
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
2726
+ background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
2727
+ background-image: -o-linear-gradient(top, #0088cc, #0077b3);
2728
+ background-repeat: repeat-x;
2729
+ outline: 0;
2730
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
2731
+ }
2732
+
2733
+ .dropdown-menu .disabled > a,
2734
+ .dropdown-menu .disabled > a:hover {
2735
+ color: #999999;
2736
+ }
2737
+
2738
+ .dropdown-menu .disabled > a:hover {
2739
+ text-decoration: none;
2740
+ cursor: default;
2741
+ background-color: transparent;
2451
2742
  }
2452
2743
 
2453
2744
  .open {
@@ -2477,6 +2768,47 @@ table .span24 {
2477
2768
  margin-bottom: 1px;
2478
2769
  }
2479
2770
 
2771
+ .dropdown-submenu {
2772
+ position: relative;
2773
+ }
2774
+
2775
+ .dropdown-submenu > .dropdown-menu {
2776
+ top: 0;
2777
+ left: 100%;
2778
+ margin-top: -6px;
2779
+ margin-left: -1px;
2780
+ -webkit-border-radius: 0 6px 6px 6px;
2781
+ -moz-border-radius: 0 6px 6px 6px;
2782
+ border-radius: 0 6px 6px 6px;
2783
+ }
2784
+
2785
+ .dropdown-submenu:hover .dropdown-menu {
2786
+ display: block;
2787
+ }
2788
+
2789
+ .dropdown-submenu > a:after {
2790
+ display: block;
2791
+ float: right;
2792
+ width: 0;
2793
+ height: 0;
2794
+ margin-top: 5px;
2795
+ margin-right: -10px;
2796
+ border-color: transparent;
2797
+ border-left-color: #cccccc;
2798
+ border-style: solid;
2799
+ border-width: 5px 0 5px 5px;
2800
+ content: " ";
2801
+ }
2802
+
2803
+ .dropdown-submenu:hover > a:after {
2804
+ border-left-color: #ffffff;
2805
+ }
2806
+
2807
+ .dropdown .dropdown-menu .nav-header {
2808
+ padding-right: 20px;
2809
+ padding-left: 20px;
2810
+ }
2811
+
2480
2812
  .typeahead {
2481
2813
  margin-top: 2px;
2482
2814
  -webkit-border-radius: 4px;
@@ -2489,8 +2821,7 @@ table .span24 {
2489
2821
  padding: 19px;
2490
2822
  margin-bottom: 20px;
2491
2823
  background-color: #f5f5f5;
2492
- border: 1px solid #eee;
2493
- border: 1px solid rgba(0, 0, 0, 0.05);
2824
+ border: 1px solid #e3e3e3;
2494
2825
  -webkit-border-radius: 4px;
2495
2826
  -moz-border-radius: 4px;
2496
2827
  border-radius: 4px;
@@ -2522,7 +2853,6 @@ table .span24 {
2522
2853
  opacity: 0;
2523
2854
  -webkit-transition: opacity 0.15s linear;
2524
2855
  -moz-transition: opacity 0.15s linear;
2525
- -ms-transition: opacity 0.15s linear;
2526
2856
  -o-transition: opacity 0.15s linear;
2527
2857
  transition: opacity 0.15s linear;
2528
2858
  }
@@ -2535,9 +2865,9 @@ table .span24 {
2535
2865
  position: relative;
2536
2866
  height: 0;
2537
2867
  overflow: hidden;
2868
+ overflow: visible \9;
2538
2869
  -webkit-transition: height 0.35s ease;
2539
2870
  -moz-transition: height 0.35s ease;
2540
- -ms-transition: height 0.35s ease;
2541
2871
  -o-transition: height 0.35s ease;
2542
2872
  transition: height 0.35s ease;
2543
2873
  }
@@ -2550,7 +2880,7 @@ table .span24 {
2550
2880
  float: right;
2551
2881
  font-size: 20px;
2552
2882
  font-weight: bold;
2553
- line-height: 18px;
2883
+ line-height: 20px;
2554
2884
  color: #000000;
2555
2885
  text-shadow: 0 1px 0 #ffffff;
2556
2886
  opacity: 0.2;
@@ -2576,11 +2906,11 @@ button.close {
2576
2906
  .btn {
2577
2907
  display: inline-block;
2578
2908
  *display: inline;
2579
- padding: 4px 10px 4px;
2909
+ padding: 4px 14px;
2580
2910
  margin-bottom: 0;
2581
2911
  *margin-left: .3em;
2582
- font-size: 13px;
2583
- line-height: 18px;
2912
+ font-size: 14px;
2913
+ line-height: 20px;
2584
2914
  *line-height: 20px;
2585
2915
  color: #333333;
2586
2916
  text-align: center;
@@ -2589,22 +2919,21 @@ button.close {
2589
2919
  cursor: pointer;
2590
2920
  background-color: #f5f5f5;
2591
2921
  *background-color: #e6e6e6;
2592
- background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
2593
2922
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
2594
2923
  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
2595
2924
  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
2596
- background-image: linear-gradient(top, #ffffff, #e6e6e6);
2925
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
2597
2926
  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
2598
2927
  background-repeat: repeat-x;
2599
- border: 1px solid #cccccc;
2928
+ border: 1px solid #bbbbbb;
2600
2929
  *border: 0;
2601
2930
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2602
2931
  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
2603
- border-bottom-color: #b3b3b3;
2932
+ border-bottom-color: #a2a2a2;
2604
2933
  -webkit-border-radius: 4px;
2605
2934
  -moz-border-radius: 4px;
2606
2935
  border-radius: 4px;
2607
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
2936
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
2608
2937
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
2609
2938
  *zoom: 1;
2610
2939
  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -2617,6 +2946,7 @@ button.close {
2617
2946
  .btn.active,
2618
2947
  .btn.disabled,
2619
2948
  .btn[disabled] {
2949
+ color: #333333;
2620
2950
  background-color: #e6e6e6;
2621
2951
  *background-color: #d9d9d9;
2622
2952
  }
@@ -2640,7 +2970,6 @@ button.close {
2640
2970
  background-position: 0 -15px;
2641
2971
  -webkit-transition: background-position 0.1s linear;
2642
2972
  -moz-transition: background-position 0.1s linear;
2643
- -ms-transition: background-position 0.1s linear;
2644
2973
  -o-transition: background-position 0.1s linear;
2645
2974
  transition: background-position 0.1s linear;
2646
2975
  }
@@ -2676,7 +3005,7 @@ button.close {
2676
3005
 
2677
3006
  .btn-large {
2678
3007
  padding: 9px 14px;
2679
- font-size: 15px;
3008
+ font-size: 16px;
2680
3009
  line-height: normal;
2681
3010
  -webkit-border-radius: 5px;
2682
3011
  -moz-border-radius: 5px;
@@ -2689,8 +3018,8 @@ button.close {
2689
3018
 
2690
3019
  .btn-small {
2691
3020
  padding: 5px 9px;
2692
- font-size: 11px;
2693
- line-height: 16px;
3021
+ font-size: 12px;
3022
+ line-height: 18px;
2694
3023
  }
2695
3024
 
2696
3025
  .btn-small [class^="icon-"] {
@@ -2700,23 +3029,21 @@ button.close {
2700
3029
  .btn-mini {
2701
3030
  padding: 2px 6px;
2702
3031
  font-size: 11px;
2703
- line-height: 14px;
3032
+ line-height: 16px;
2704
3033
  }
2705
3034
 
2706
- .btn-primary,
2707
- .btn-primary:hover,
2708
- .btn-warning,
2709
- .btn-warning:hover,
2710
- .btn-danger,
2711
- .btn-danger:hover,
2712
- .btn-success,
2713
- .btn-success:hover,
2714
- .btn-info,
2715
- .btn-info:hover,
2716
- .btn-inverse,
2717
- .btn-inverse:hover {
2718
- color: #ffffff;
2719
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
3035
+ .btn-block {
3036
+ display: block;
3037
+ width: 100%;
3038
+ padding-right: 0;
3039
+ padding-left: 0;
3040
+ -webkit-box-sizing: border-box;
3041
+ -moz-box-sizing: border-box;
3042
+ box-sizing: border-box;
3043
+ }
3044
+
3045
+ .btn-block + .btn-block {
3046
+ margin-top: 5px;
2720
3047
  }
2721
3048
 
2722
3049
  .btn-primary.active,
@@ -2729,23 +3056,24 @@ button.close {
2729
3056
  }
2730
3057
 
2731
3058
  .btn {
2732
- border-color: #ccc;
2733
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3059
+ border-color: #c5c5c5;
3060
+ border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
2734
3061
  }
2735
3062
 
2736
3063
  .btn-primary {
2737
- background-color: #0074cc;
2738
- *background-color: #0055cc;
2739
- background-image: -ms-linear-gradient(top, #0088cc, #0055cc);
2740
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));
2741
- background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);
2742
- background-image: -o-linear-gradient(top, #0088cc, #0055cc);
2743
- background-image: -moz-linear-gradient(top, #0088cc, #0055cc);
2744
- background-image: linear-gradient(top, #0088cc, #0055cc);
3064
+ color: #ffffff;
3065
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
3066
+ background-color: #006dcc;
3067
+ *background-color: #0044cc;
3068
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
3069
+ background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
3070
+ background-image: -o-linear-gradient(top, #0088cc, #0044cc);
3071
+ background-image: linear-gradient(to bottom, #0088cc, #0044cc);
3072
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
2745
3073
  background-repeat: repeat-x;
2746
- border-color: #0055cc #0055cc #003580;
3074
+ border-color: #0044cc #0044cc #002a80;
2747
3075
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2748
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
3076
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
2749
3077
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
2750
3078
  }
2751
3079
 
@@ -2754,28 +3082,30 @@ button.close {
2754
3082
  .btn-primary.active,
2755
3083
  .btn-primary.disabled,
2756
3084
  .btn-primary[disabled] {
2757
- background-color: #0055cc;
2758
- *background-color: #004ab3;
3085
+ color: #ffffff;
3086
+ background-color: #0044cc;
3087
+ *background-color: #003bb3;
2759
3088
  }
2760
3089
 
2761
3090
  .btn-primary:active,
2762
3091
  .btn-primary.active {
2763
- background-color: #004099 \9;
3092
+ background-color: #003399 \9;
2764
3093
  }
2765
3094
 
2766
3095
  .btn-warning {
3096
+ color: #ffffff;
3097
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2767
3098
  background-color: #faa732;
2768
3099
  *background-color: #f89406;
2769
- background-image: -ms-linear-gradient(top, #fbb450, #f89406);
2770
3100
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
2771
3101
  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
2772
3102
  background-image: -o-linear-gradient(top, #fbb450, #f89406);
3103
+ background-image: linear-gradient(to bottom, #fbb450, #f89406);
2773
3104
  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
2774
- background-image: linear-gradient(top, #fbb450, #f89406);
2775
3105
  background-repeat: repeat-x;
2776
3106
  border-color: #f89406 #f89406 #ad6704;
2777
3107
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2778
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
3108
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
2779
3109
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
2780
3110
  }
2781
3111
 
@@ -2784,6 +3114,7 @@ button.close {
2784
3114
  .btn-warning.active,
2785
3115
  .btn-warning.disabled,
2786
3116
  .btn-warning[disabled] {
3117
+ color: #ffffff;
2787
3118
  background-color: #f89406;
2788
3119
  *background-color: #df8505;
2789
3120
  }
@@ -2794,18 +3125,19 @@ button.close {
2794
3125
  }
2795
3126
 
2796
3127
  .btn-danger {
3128
+ color: #ffffff;
3129
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2797
3130
  background-color: #da4f49;
2798
3131
  *background-color: #bd362f;
2799
- background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
2800
3132
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
2801
3133
  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
2802
3134
  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
3135
+ background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
2803
3136
  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
2804
- background-image: linear-gradient(top, #ee5f5b, #bd362f);
2805
3137
  background-repeat: repeat-x;
2806
3138
  border-color: #bd362f #bd362f #802420;
2807
3139
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2808
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
3140
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
2809
3141
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
2810
3142
  }
2811
3143
 
@@ -2814,6 +3146,7 @@ button.close {
2814
3146
  .btn-danger.active,
2815
3147
  .btn-danger.disabled,
2816
3148
  .btn-danger[disabled] {
3149
+ color: #ffffff;
2817
3150
  background-color: #bd362f;
2818
3151
  *background-color: #a9302a;
2819
3152
  }
@@ -2824,18 +3157,19 @@ button.close {
2824
3157
  }
2825
3158
 
2826
3159
  .btn-success {
3160
+ color: #ffffff;
3161
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2827
3162
  background-color: #5bb75b;
2828
3163
  *background-color: #51a351;
2829
- background-image: -ms-linear-gradient(top, #62c462, #51a351);
2830
3164
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
2831
3165
  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
2832
3166
  background-image: -o-linear-gradient(top, #62c462, #51a351);
3167
+ background-image: linear-gradient(to bottom, #62c462, #51a351);
2833
3168
  background-image: -moz-linear-gradient(top, #62c462, #51a351);
2834
- background-image: linear-gradient(top, #62c462, #51a351);
2835
3169
  background-repeat: repeat-x;
2836
3170
  border-color: #51a351 #51a351 #387038;
2837
3171
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2838
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
3172
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
2839
3173
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
2840
3174
  }
2841
3175
 
@@ -2844,6 +3178,7 @@ button.close {
2844
3178
  .btn-success.active,
2845
3179
  .btn-success.disabled,
2846
3180
  .btn-success[disabled] {
3181
+ color: #ffffff;
2847
3182
  background-color: #51a351;
2848
3183
  *background-color: #499249;
2849
3184
  }
@@ -2854,18 +3189,19 @@ button.close {
2854
3189
  }
2855
3190
 
2856
3191
  .btn-info {
3192
+ color: #ffffff;
3193
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
2857
3194
  background-color: #49afcd;
2858
3195
  *background-color: #2f96b4;
2859
- background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
2860
3196
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
2861
3197
  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
2862
3198
  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
3199
+ background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
2863
3200
  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
2864
- background-image: linear-gradient(top, #5bc0de, #2f96b4);
2865
3201
  background-repeat: repeat-x;
2866
3202
  border-color: #2f96b4 #2f96b4 #1f6377;
2867
3203
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2868
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
3204
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
2869
3205
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
2870
3206
  }
2871
3207
 
@@ -2874,6 +3210,7 @@ button.close {
2874
3210
  .btn-info.active,
2875
3211
  .btn-info.disabled,
2876
3212
  .btn-info[disabled] {
3213
+ color: #ffffff;
2877
3214
  background-color: #2f96b4;
2878
3215
  *background-color: #2a85a0;
2879
3216
  }
@@ -2884,18 +3221,19 @@ button.close {
2884
3221
  }
2885
3222
 
2886
3223
  .btn-inverse {
2887
- background-color: #414141;
3224
+ color: #ffffff;
3225
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
3226
+ background-color: #363636;
2888
3227
  *background-color: #222222;
2889
- background-image: -ms-linear-gradient(top, #555555, #222222);
2890
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));
2891
- background-image: -webkit-linear-gradient(top, #555555, #222222);
2892
- background-image: -o-linear-gradient(top, #555555, #222222);
2893
- background-image: -moz-linear-gradient(top, #555555, #222222);
2894
- background-image: linear-gradient(top, #555555, #222222);
3228
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
3229
+ background-image: -webkit-linear-gradient(top, #444444, #222222);
3230
+ background-image: -o-linear-gradient(top, #444444, #222222);
3231
+ background-image: linear-gradient(to bottom, #444444, #222222);
3232
+ background-image: -moz-linear-gradient(top, #444444, #222222);
2895
3233
  background-repeat: repeat-x;
2896
3234
  border-color: #222222 #222222 #000000;
2897
3235
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
2898
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);
3236
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
2899
3237
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
2900
3238
  }
2901
3239
 
@@ -2904,6 +3242,7 @@ button.close {
2904
3242
  .btn-inverse.active,
2905
3243
  .btn-inverse.disabled,
2906
3244
  .btn-inverse[disabled] {
3245
+ color: #ffffff;
2907
3246
  background-color: #222222;
2908
3247
  *background-color: #151515;
2909
3248
  }
@@ -2915,8 +3254,8 @@ button.close {
2915
3254
 
2916
3255
  button.btn,
2917
3256
  input[type="submit"].btn {
2918
- *padding-top: 2px;
2919
- *padding-bottom: 2px;
3257
+ *padding-top: 3px;
3258
+ *padding-bottom: 3px;
2920
3259
  }
2921
3260
 
2922
3261
  button.btn::-moz-focus-inner,
@@ -2943,20 +3282,31 @@ input[type="submit"].btn.btn-mini {
2943
3282
  *padding-bottom: 1px;
2944
3283
  }
2945
3284
 
2946
- .btn-group {
2947
- position: relative;
2948
- *margin-left: .3em;
2949
- *zoom: 1;
3285
+ .btn-link {
3286
+ color: #0088cc;
3287
+ cursor: pointer;
3288
+ background-color: transparent;
3289
+ background-image: none;
3290
+ border-color: transparent;
3291
+ -webkit-border-radius: 0;
3292
+ -moz-border-radius: 0;
3293
+ border-radius: 0;
3294
+ -webkit-box-shadow: none;
3295
+ -moz-box-shadow: none;
3296
+ box-shadow: none;
2950
3297
  }
2951
3298
 
2952
- .btn-group:before,
2953
- .btn-group:after {
2954
- display: table;
2955
- content: "";
3299
+ .btn-link:hover {
3300
+ color: #005580;
3301
+ text-decoration: underline;
3302
+ background-color: transparent;
2956
3303
  }
2957
3304
 
2958
- .btn-group:after {
2959
- clear: both;
3305
+ .btn-group {
3306
+ position: relative;
3307
+ *margin-left: .3em;
3308
+ font-size: 0;
3309
+ white-space: nowrap;
2960
3310
  }
2961
3311
 
2962
3312
  .btn-group:first-child {
@@ -2968,8 +3318,8 @@ input[type="submit"].btn.btn-mini {
2968
3318
  }
2969
3319
 
2970
3320
  .btn-toolbar {
2971
- margin-top: 9px;
2972
- margin-bottom: 9px;
3321
+ margin-top: 10px;
3322
+ margin-bottom: 10px;
2973
3323
  }
2974
3324
 
2975
3325
  .btn-toolbar .btn-group {
@@ -2982,13 +3332,29 @@ input[type="submit"].btn.btn-mini {
2982
3332
 
2983
3333
  .btn-group > .btn {
2984
3334
  position: relative;
2985
- float: left;
2986
3335
  margin-left: -1px;
2987
3336
  -webkit-border-radius: 0;
2988
3337
  -moz-border-radius: 0;
2989
3338
  border-radius: 0;
2990
3339
  }
2991
3340
 
3341
+ .btn-group > .btn,
3342
+ .btn-group > .dropdown-menu {
3343
+ font-size: 14px;
3344
+ }
3345
+
3346
+ .btn-group > .btn-mini {
3347
+ font-size: 11px;
3348
+ }
3349
+
3350
+ .btn-group > .btn-small {
3351
+ font-size: 12px;
3352
+ }
3353
+
3354
+ .btn-group > .btn-large {
3355
+ font-size: 16px;
3356
+ }
3357
+
2992
3358
  .btn-group > .btn:first-child {
2993
3359
  margin-left: 0;
2994
3360
  -webkit-border-bottom-left-radius: 4px;
@@ -3041,7 +3407,7 @@ input[type="submit"].btn.btn-mini {
3041
3407
  outline: 0;
3042
3408
  }
3043
3409
 
3044
- .btn-group > .dropdown-toggle {
3410
+ .btn-group > .btn + .dropdown-toggle {
3045
3411
  *padding-top: 4px;
3046
3412
  padding-right: 8px;
3047
3413
  *padding-bottom: 4px;
@@ -3051,17 +3417,17 @@ input[type="submit"].btn.btn-mini {
3051
3417
  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);
3052
3418
  }
3053
3419
 
3054
- .btn-group > .btn-mini.dropdown-toggle {
3420
+ .btn-group > .btn-mini + .dropdown-toggle {
3055
3421
  padding-right: 5px;
3056
3422
  padding-left: 5px;
3057
3423
  }
3058
3424
 
3059
- .btn-group > .btn-small.dropdown-toggle {
3425
+ .btn-group > .btn-small + .dropdown-toggle {
3060
3426
  *padding-top: 4px;
3061
3427
  *padding-bottom: 4px;
3062
3428
  }
3063
3429
 
3064
- .btn-group > .btn-large.dropdown-toggle {
3430
+ .btn-group > .btn-large + .dropdown-toggle {
3065
3431
  padding-right: 12px;
3066
3432
  padding-left: 12px;
3067
3433
  }
@@ -3078,7 +3444,7 @@ input[type="submit"].btn.btn-mini {
3078
3444
  }
3079
3445
 
3080
3446
  .btn-group.open .btn-primary.dropdown-toggle {
3081
- background-color: #0055cc;
3447
+ background-color: #0044cc;
3082
3448
  }
3083
3449
 
3084
3450
  .btn-group.open .btn-warning.dropdown-toggle {
@@ -3102,26 +3468,17 @@ input[type="submit"].btn.btn-mini {
3102
3468
  }
3103
3469
 
3104
3470
  .btn .caret {
3105
- margin-top: 7px;
3471
+ margin-top: 8px;
3106
3472
  margin-left: 0;
3107
3473
  }
3108
3474
 
3109
- .btn:hover .caret,
3110
- .open.btn-group .caret {
3111
- opacity: 1;
3112
- filter: alpha(opacity=100);
3113
- }
3114
-
3115
- .btn-mini .caret {
3116
- margin-top: 5px;
3117
- }
3118
-
3119
- .btn-small .caret {
3475
+ .btn-mini .caret,
3476
+ .btn-small .caret,
3477
+ .btn-large .caret {
3120
3478
  margin-top: 6px;
3121
3479
  }
3122
3480
 
3123
3481
  .btn-large .caret {
3124
- margin-top: 6px;
3125
3482
  border-top-width: 5px;
3126
3483
  border-right-width: 5px;
3127
3484
  border-left-width: 5px;
@@ -3140,31 +3497,71 @@ input[type="submit"].btn.btn-mini {
3140
3497
  .btn-inverse .caret {
3141
3498
  border-top-color: #ffffff;
3142
3499
  border-bottom-color: #ffffff;
3143
- opacity: 0.75;
3144
- filter: alpha(opacity=75);
3145
3500
  }
3146
3501
 
3147
- .alert {
3148
- padding: 8px 35px 8px 14px;
3149
- margin-bottom: 18px;
3150
- color: #c09853;
3151
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
3152
- background-color: #fcf8e3;
3153
- border: 1px solid #fbeed5;
3154
- -webkit-border-radius: 4px;
3155
- -moz-border-radius: 4px;
3156
- border-radius: 4px;
3157
- }
3158
-
3159
- .alert-heading {
3160
- color: inherit;
3502
+ .btn-group-vertical {
3503
+ display: inline-block;
3161
3504
  }
3162
3505
 
3163
- .alert .close {
3164
- position: relative;
3506
+ .btn-group-vertical .btn {
3507
+ display: block;
3508
+ float: none;
3509
+ width: 100%;
3510
+ margin-left: 0;
3511
+ -webkit-border-radius: 0;
3512
+ -moz-border-radius: 0;
3513
+ border-radius: 0;
3514
+ }
3515
+
3516
+ .btn-group-vertical .btn + .btn {
3517
+ margin-top: -1px;
3518
+ }
3519
+
3520
+ .btn-group-vertical .btn:first-child {
3521
+ -webkit-border-radius: 4px 4px 0 0;
3522
+ -moz-border-radius: 4px 4px 0 0;
3523
+ border-radius: 4px 4px 0 0;
3524
+ }
3525
+
3526
+ .btn-group-vertical .btn:last-child {
3527
+ -webkit-border-radius: 0 0 4px 4px;
3528
+ -moz-border-radius: 0 0 4px 4px;
3529
+ border-radius: 0 0 4px 4px;
3530
+ }
3531
+
3532
+ .btn-group-vertical .btn-large:first-child {
3533
+ -webkit-border-radius: 6px 6px 0 0;
3534
+ -moz-border-radius: 6px 6px 0 0;
3535
+ border-radius: 6px 6px 0 0;
3536
+ }
3537
+
3538
+ .btn-group-vertical .btn-large:last-child {
3539
+ -webkit-border-radius: 0 0 6px 6px;
3540
+ -moz-border-radius: 0 0 6px 6px;
3541
+ border-radius: 0 0 6px 6px;
3542
+ }
3543
+
3544
+ .alert {
3545
+ padding: 8px 35px 8px 14px;
3546
+ margin-bottom: 20px;
3547
+ color: #c09853;
3548
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
3549
+ background-color: #fcf8e3;
3550
+ border: 1px solid #fbeed5;
3551
+ -webkit-border-radius: 4px;
3552
+ -moz-border-radius: 4px;
3553
+ border-radius: 4px;
3554
+ }
3555
+
3556
+ .alert h4 {
3557
+ margin: 0;
3558
+ }
3559
+
3560
+ .alert .close {
3561
+ position: relative;
3165
3562
  top: -2px;
3166
3563
  right: -21px;
3167
- line-height: 18px;
3564
+ line-height: 20px;
3168
3565
  }
3169
3566
 
3170
3567
  .alert-success {
@@ -3201,7 +3598,7 @@ input[type="submit"].btn.btn-mini {
3201
3598
  }
3202
3599
 
3203
3600
  .nav {
3204
- margin-bottom: 18px;
3601
+ margin-bottom: 20px;
3205
3602
  margin-left: 0;
3206
3603
  list-style: none;
3207
3604
  }
@@ -3219,12 +3616,12 @@ input[type="submit"].btn.btn-mini {
3219
3616
  float: right;
3220
3617
  }
3221
3618
 
3222
- .nav .nav-header {
3619
+ .nav-header {
3223
3620
  display: block;
3224
3621
  padding: 3px 15px;
3225
3622
  font-size: 11px;
3226
3623
  font-weight: bold;
3227
- line-height: 18px;
3624
+ line-height: 20px;
3228
3625
  color: #999999;
3229
3626
  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
3230
3627
  text-transform: uppercase;
@@ -3265,7 +3662,7 @@ input[type="submit"].btn.btn-mini {
3265
3662
  .nav-list .divider {
3266
3663
  *width: 100%;
3267
3664
  height: 1px;
3268
- margin: 8px 1px;
3665
+ margin: 9px 1px;
3269
3666
  *margin: -5px 0 5px;
3270
3667
  overflow: hidden;
3271
3668
  background-color: #e5e5e5;
@@ -3282,6 +3679,7 @@ input[type="submit"].btn.btn-mini {
3282
3679
  .nav-tabs:after,
3283
3680
  .nav-pills:after {
3284
3681
  display: table;
3682
+ line-height: 0;
3285
3683
  content: "";
3286
3684
  }
3287
3685
 
@@ -3314,7 +3712,7 @@ input[type="submit"].btn.btn-mini {
3314
3712
  .nav-tabs > li > a {
3315
3713
  padding-top: 8px;
3316
3714
  padding-bottom: 8px;
3317
- line-height: 18px;
3715
+ line-height: 20px;
3318
3716
  border: 1px solid transparent;
3319
3717
  -webkit-border-radius: 4px 4px 0 0;
3320
3718
  -moz-border-radius: 4px 4px 0 0;
@@ -3370,15 +3768,21 @@ input[type="submit"].btn.btn-mini {
3370
3768
  }
3371
3769
 
3372
3770
  .nav-tabs.nav-stacked > li:first-child > a {
3373
- -webkit-border-radius: 4px 4px 0 0;
3374
- -moz-border-radius: 4px 4px 0 0;
3375
- border-radius: 4px 4px 0 0;
3771
+ -webkit-border-top-right-radius: 4px;
3772
+ border-top-right-radius: 4px;
3773
+ -webkit-border-top-left-radius: 4px;
3774
+ border-top-left-radius: 4px;
3775
+ -moz-border-radius-topright: 4px;
3776
+ -moz-border-radius-topleft: 4px;
3376
3777
  }
3377
3778
 
3378
3779
  .nav-tabs.nav-stacked > li:last-child > a {
3379
- -webkit-border-radius: 0 0 4px 4px;
3380
- -moz-border-radius: 0 0 4px 4px;
3381
- border-radius: 0 0 4px 4px;
3780
+ -webkit-border-bottom-right-radius: 4px;
3781
+ border-bottom-right-radius: 4px;
3782
+ -webkit-border-bottom-left-radius: 4px;
3783
+ border-bottom-left-radius: 4px;
3784
+ -moz-border-radius-bottomright: 4px;
3785
+ -moz-border-radius-bottomleft: 4px;
3382
3786
  }
3383
3787
 
3384
3788
  .nav-tabs.nav-stacked > li > a:hover {
@@ -3395,38 +3799,45 @@ input[type="submit"].btn.btn-mini {
3395
3799
  }
3396
3800
 
3397
3801
  .nav-tabs .dropdown-menu {
3398
- -webkit-border-radius: 0 0 5px 5px;
3399
- -moz-border-radius: 0 0 5px 5px;
3400
- border-radius: 0 0 5px 5px;
3802
+ -webkit-border-radius: 0 0 6px 6px;
3803
+ -moz-border-radius: 0 0 6px 6px;
3804
+ border-radius: 0 0 6px 6px;
3401
3805
  }
3402
3806
 
3403
3807
  .nav-pills .dropdown-menu {
3404
- -webkit-border-radius: 4px;
3405
- -moz-border-radius: 4px;
3406
- border-radius: 4px;
3808
+ -webkit-border-radius: 6px;
3809
+ -moz-border-radius: 6px;
3810
+ border-radius: 6px;
3407
3811
  }
3408
3812
 
3409
- .nav-tabs .dropdown-toggle .caret,
3410
- .nav-pills .dropdown-toggle .caret {
3813
+ .nav .dropdown-toggle .caret {
3411
3814
  margin-top: 6px;
3412
3815
  border-top-color: #0088cc;
3413
3816
  border-bottom-color: #0088cc;
3414
3817
  }
3415
3818
 
3416
- .nav-tabs .dropdown-toggle:hover .caret,
3417
- .nav-pills .dropdown-toggle:hover .caret {
3819
+ .nav .dropdown-toggle:hover .caret {
3418
3820
  border-top-color: #005580;
3419
3821
  border-bottom-color: #005580;
3420
3822
  }
3421
3823
 
3422
- .nav-tabs .active .dropdown-toggle .caret,
3423
- .nav-pills .active .dropdown-toggle .caret {
3424
- border-top-color: #333333;
3425
- border-bottom-color: #333333;
3824
+ /* move down carets for tabs */
3825
+
3826
+ .nav-tabs .dropdown-toggle .caret {
3827
+ margin-top: 8px;
3828
+ }
3829
+
3830
+ .nav .active .dropdown-toggle .caret {
3831
+ border-top-color: #fff;
3832
+ border-bottom-color: #fff;
3833
+ }
3834
+
3835
+ .nav-tabs .active .dropdown-toggle .caret {
3836
+ border-top-color: #555555;
3837
+ border-bottom-color: #555555;
3426
3838
  }
3427
3839
 
3428
3840
  .nav > .dropdown.active > a:hover {
3429
- color: #000000;
3430
3841
  cursor: pointer;
3431
3842
  }
3432
3843
 
@@ -3458,6 +3869,7 @@ input[type="submit"].btn.btn-mini {
3458
3869
  .tabbable:before,
3459
3870
  .tabbable:after {
3460
3871
  display: table;
3872
+ line-height: 0;
3461
3873
  content: "";
3462
3874
  }
3463
3875
 
@@ -3568,32 +3980,43 @@ input[type="submit"].btn.btn-mini {
3568
3980
  *border-left-color: #ffffff;
3569
3981
  }
3570
3982
 
3983
+ .nav > .disabled > a {
3984
+ color: #999999;
3985
+ }
3986
+
3987
+ .nav > .disabled > a:hover {
3988
+ text-decoration: none;
3989
+ cursor: default;
3990
+ background-color: transparent;
3991
+ }
3992
+
3571
3993
  .navbar {
3572
3994
  *position: relative;
3573
3995
  *z-index: 2;
3574
- margin-bottom: 18px;
3996
+ margin-bottom: 20px;
3575
3997
  overflow: visible;
3998
+ color: #555555;
3576
3999
  }
3577
4000
 
3578
4001
  .navbar-inner {
3579
4002
  min-height: 40px;
3580
4003
  padding-right: 20px;
3581
4004
  padding-left: 20px;
3582
- background-color: #2c2c2c;
3583
- background-image: -moz-linear-gradient(top, #333333, #222222);
3584
- background-image: -ms-linear-gradient(top, #333333, #222222);
3585
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
3586
- background-image: -webkit-linear-gradient(top, #333333, #222222);
3587
- background-image: -o-linear-gradient(top, #333333, #222222);
3588
- background-image: linear-gradient(top, #333333, #222222);
4005
+ background-color: #fafafa;
4006
+ background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
4007
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
4008
+ background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
4009
+ background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
4010
+ background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
3589
4011
  background-repeat: repeat-x;
4012
+ border: 1px solid #d4d4d4;
3590
4013
  -webkit-border-radius: 4px;
3591
4014
  -moz-border-radius: 4px;
3592
4015
  border-radius: 4px;
3593
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
3594
- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
3595
- -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
3596
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
4016
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
4017
+ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
4018
+ -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
4019
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
3597
4020
  }
3598
4021
 
3599
4022
  .navbar .container {
@@ -3604,41 +4027,44 @@ input[type="submit"].btn.btn-mini {
3604
4027
  height: auto;
3605
4028
  }
3606
4029
 
3607
- .navbar {
3608
- color: #999999;
3609
- }
3610
-
3611
- .navbar .brand:hover {
3612
- text-decoration: none;
3613
- }
3614
-
3615
4030
  .navbar .brand {
3616
4031
  display: block;
3617
4032
  float: left;
3618
- padding: 8px 20px 12px;
4033
+ padding: 10px 20px 10px;
3619
4034
  margin-left: -20px;
3620
4035
  font-size: 20px;
3621
4036
  font-weight: 200;
3622
- line-height: 1;
3623
- color: #999999;
4037
+ color: #555555;
4038
+ text-shadow: 0 1px 0 #ffffff;
3624
4039
  }
3625
4040
 
3626
- .navbar .navbar-text {
4041
+ .navbar .brand:hover {
4042
+ text-decoration: none;
4043
+ }
4044
+
4045
+ .navbar-text {
3627
4046
  margin-bottom: 0;
3628
4047
  line-height: 40px;
3629
4048
  }
3630
4049
 
3631
- .navbar .navbar-link {
3632
- color: #999999;
4050
+ .navbar-link {
4051
+ color: #555555;
3633
4052
  }
3634
4053
 
3635
- .navbar .navbar-link:hover {
3636
- color: #ffffff;
4054
+ .navbar-link:hover {
4055
+ color: #333333;
4056
+ }
4057
+
4058
+ .navbar .divider-vertical {
4059
+ height: 40px;
4060
+ margin: 0 9px;
4061
+ border-right: 1px solid #ffffff;
4062
+ border-left: 1px solid #f2f2f2;
3637
4063
  }
3638
4064
 
3639
4065
  .navbar .btn,
3640
4066
  .navbar .btn-group {
3641
- margin-top: 5px;
4067
+ margin-top: 6px;
3642
4068
  }
3643
4069
 
3644
4070
  .navbar .btn-group .btn {
@@ -3653,6 +4079,7 @@ input[type="submit"].btn.btn-mini {
3653
4079
  .navbar-form:before,
3654
4080
  .navbar-form:after {
3655
4081
  display: table;
4082
+ line-height: 0;
3656
4083
  content: "";
3657
4084
  }
3658
4085
 
@@ -3668,7 +4095,8 @@ input[type="submit"].btn.btn-mini {
3668
4095
  }
3669
4096
 
3670
4097
  .navbar-form input,
3671
- .navbar-form select {
4098
+ .navbar-form select,
4099
+ .navbar-form .btn {
3672
4100
  display: inline-block;
3673
4101
  margin-bottom: 0;
3674
4102
  }
@@ -3693,52 +4121,20 @@ input[type="submit"].btn.btn-mini {
3693
4121
  .navbar-search {
3694
4122
  position: relative;
3695
4123
  float: left;
3696
- margin-top: 6px;
4124
+ margin-top: 5px;
3697
4125
  margin-bottom: 0;
3698
4126
  }
3699
4127
 
3700
4128
  .navbar-search .search-query {
3701
- padding: 4px 9px;
4129
+ padding: 4px 14px;
4130
+ margin-bottom: 0;
3702
4131
  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
3703
4132
  font-size: 13px;
3704
4133
  font-weight: normal;
3705
4134
  line-height: 1;
3706
- color: #ffffff;
3707
- background-color: #626262;
3708
- border: 1px solid #151515;
3709
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
3710
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
3711
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
3712
- -webkit-transition: none;
3713
- -moz-transition: none;
3714
- -ms-transition: none;
3715
- -o-transition: none;
3716
- transition: none;
3717
- }
3718
-
3719
- .navbar-search .search-query:-moz-placeholder {
3720
- color: #cccccc;
3721
- }
3722
-
3723
- .navbar-search .search-query:-ms-input-placeholder {
3724
- color: #cccccc;
3725
- }
3726
-
3727
- .navbar-search .search-query::-webkit-input-placeholder {
3728
- color: #cccccc;
3729
- }
3730
-
3731
- .navbar-search .search-query:focus,
3732
- .navbar-search .search-query.focused {
3733
- padding: 5px 10px;
3734
- color: #333333;
3735
- text-shadow: 0 1px 0 #ffffff;
3736
- background-color: #ffffff;
3737
- border: 0;
3738
- outline: 0;
3739
- -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
3740
- -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
3741
- box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
4135
+ -webkit-border-radius: 15px;
4136
+ -moz-border-radius: 15px;
4137
+ border-radius: 15px;
3742
4138
  }
3743
4139
 
3744
4140
  .navbar-fixed-top,
@@ -3750,6 +4146,11 @@ input[type="submit"].btn.btn-mini {
3750
4146
  margin-bottom: 0;
3751
4147
  }
3752
4148
 
4149
+ .navbar-fixed-top .navbar-inner,
4150
+ .navbar-fixed-bottom .navbar-inner {
4151
+ border: 0;
4152
+ }
4153
+
3753
4154
  .navbar-fixed-top .navbar-inner,
3754
4155
  .navbar-fixed-bottom .navbar-inner {
3755
4156
  padding-right: 0;
@@ -3768,10 +4169,22 @@ input[type="submit"].btn.btn-mini {
3768
4169
  top: 0;
3769
4170
  }
3770
4171
 
4172
+ .navbar-fixed-top .navbar-inner {
4173
+ -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
4174
+ -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
4175
+ box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
4176
+ }
4177
+
3771
4178
  .navbar-fixed-bottom {
3772
4179
  bottom: 0;
3773
4180
  }
3774
4181
 
4182
+ .navbar-fixed-bottom .navbar-inner {
4183
+ -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
4184
+ -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
4185
+ box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
4186
+ }
4187
+
3775
4188
  .navbar .nav {
3776
4189
  position: relative;
3777
4190
  left: 0;
@@ -3785,56 +4198,37 @@ input[type="submit"].btn.btn-mini {
3785
4198
  }
3786
4199
 
3787
4200
  .navbar .nav > li {
3788
- display: block;
3789
4201
  float: left;
3790
4202
  }
3791
4203
 
3792
4204
  .navbar .nav > li > a {
3793
4205
  float: none;
3794
- padding: 9px 10px 11px;
3795
- line-height: 19px;
3796
- color: #999999;
4206
+ padding: 10px 15px 10px;
4207
+ color: #555555;
3797
4208
  text-decoration: none;
3798
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
3799
- }
3800
-
3801
- .navbar .btn {
3802
- display: inline-block;
3803
- padding: 4px 10px 4px;
3804
- margin: 5px 5px 6px;
3805
- line-height: 18px;
4209
+ text-shadow: 0 1px 0 #ffffff;
3806
4210
  }
3807
4211
 
3808
- .navbar .btn-group {
3809
- padding: 5px 5px 6px;
3810
- margin: 0;
4212
+ .navbar .nav .dropdown-toggle .caret {
4213
+ margin-top: 8px;
3811
4214
  }
3812
4215
 
4216
+ .navbar .nav > li > a:focus,
3813
4217
  .navbar .nav > li > a:hover {
3814
- color: #ffffff;
4218
+ color: #333333;
3815
4219
  text-decoration: none;
3816
4220
  background-color: transparent;
3817
4221
  }
3818
4222
 
3819
4223
  .navbar .nav .active > a,
3820
- .navbar .nav .active > a:hover {
3821
- color: #ffffff;
4224
+ .navbar .nav .active > a:hover,
4225
+ .navbar .nav .active > a:focus {
4226
+ color: #555555;
3822
4227
  text-decoration: none;
3823
- background-color: #222222;
3824
- }
3825
-
3826
- .navbar .divider-vertical {
3827
- width: 1px;
3828
- height: 40px;
3829
- margin: 0 9px;
3830
- overflow: hidden;
3831
- background-color: #222222;
3832
- border-right: 1px solid #333333;
3833
- }
3834
-
3835
- .navbar .nav.pull-right {
3836
- margin-right: 0;
3837
- margin-left: 10px;
4228
+ background-color: #e5e5e5;
4229
+ -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
4230
+ -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
4231
+ box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
3838
4232
  }
3839
4233
 
3840
4234
  .navbar .btn-navbar {
@@ -3843,18 +4237,19 @@ input[type="submit"].btn.btn-mini {
3843
4237
  padding: 7px 10px;
3844
4238
  margin-right: 5px;
3845
4239
  margin-left: 5px;
3846
- background-color: #2c2c2c;
3847
- *background-color: #222222;
3848
- background-image: -ms-linear-gradient(top, #333333, #222222);
3849
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
3850
- background-image: -webkit-linear-gradient(top, #333333, #222222);
3851
- background-image: -o-linear-gradient(top, #333333, #222222);
3852
- background-image: linear-gradient(top, #333333, #222222);
3853
- background-image: -moz-linear-gradient(top, #333333, #222222);
4240
+ color: #ffffff;
4241
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
4242
+ background-color: #ededed;
4243
+ *background-color: #e5e5e5;
4244
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
4245
+ background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
4246
+ background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
4247
+ background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
4248
+ background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
3854
4249
  background-repeat: repeat-x;
3855
- border-color: #222222 #222222 #000000;
4250
+ border-color: #e5e5e5 #e5e5e5 #bfbfbf;
3856
4251
  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
3857
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
4252
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
3858
4253
  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
3859
4254
  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
3860
4255
  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
@@ -3866,13 +4261,14 @@ input[type="submit"].btn.btn-mini {
3866
4261
  .navbar .btn-navbar.active,
3867
4262
  .navbar .btn-navbar.disabled,
3868
4263
  .navbar .btn-navbar[disabled] {
3869
- background-color: #222222;
3870
- *background-color: #151515;
4264
+ color: #ffffff;
4265
+ background-color: #e5e5e5;
4266
+ *background-color: #d9d9d9;
3871
4267
  }
3872
4268
 
3873
4269
  .navbar .btn-navbar:active,
3874
4270
  .navbar .btn-navbar.active {
3875
- background-color: #080808 \9;
4271
+ background-color: #cccccc \9;
3876
4272
  }
3877
4273
 
3878
4274
  .navbar .btn-navbar .icon-bar {
@@ -3892,7 +4288,7 @@ input[type="submit"].btn.btn-mini {
3892
4288
  margin-top: 3px;
3893
4289
  }
3894
4290
 
3895
- .navbar .dropdown-menu:before {
4291
+ .navbar .nav > li > .dropdown-menu:before {
3896
4292
  position: absolute;
3897
4293
  top: -7px;
3898
4294
  left: 9px;
@@ -3904,7 +4300,7 @@ input[type="submit"].btn.btn-mini {
3904
4300
  content: '';
3905
4301
  }
3906
4302
 
3907
- .navbar .dropdown-menu:after {
4303
+ .navbar .nav > li > .dropdown-menu:after {
3908
4304
  position: absolute;
3909
4305
  top: -6px;
3910
4306
  left: 10px;
@@ -3915,7 +4311,7 @@ input[type="submit"].btn.btn-mini {
3915
4311
  content: '';
3916
4312
  }
3917
4313
 
3918
- .navbar-fixed-bottom .dropdown-menu:before {
4314
+ .navbar-fixed-bottom .nav > li > .dropdown-menu:before {
3919
4315
  top: auto;
3920
4316
  bottom: -7px;
3921
4317
  border-top: 7px solid #ccc;
@@ -3923,72 +4319,211 @@ input[type="submit"].btn.btn-mini {
3923
4319
  border-top-color: rgba(0, 0, 0, 0.2);
3924
4320
  }
3925
4321
 
3926
- .navbar-fixed-bottom .dropdown-menu:after {
4322
+ .navbar-fixed-bottom .nav > li > .dropdown-menu:after {
3927
4323
  top: auto;
3928
4324
  bottom: -6px;
3929
4325
  border-top: 6px solid #ffffff;
3930
4326
  border-bottom: 0;
3931
4327
  }
3932
4328
 
3933
- .navbar .nav li.dropdown .dropdown-toggle .caret,
3934
- .navbar .nav li.dropdown.open .caret {
3935
- border-top-color: #ffffff;
3936
- border-bottom-color: #ffffff;
3937
- }
3938
-
3939
- .navbar .nav li.dropdown.active .caret {
3940
- opacity: 1;
3941
- filter: alpha(opacity=100);
3942
- }
3943
-
3944
4329
  .navbar .nav li.dropdown.open > .dropdown-toggle,
3945
4330
  .navbar .nav li.dropdown.active > .dropdown-toggle,
3946
4331
  .navbar .nav li.dropdown.open.active > .dropdown-toggle {
3947
- background-color: transparent;
4332
+ color: #555555;
4333
+ background-color: #e5e5e5;
3948
4334
  }
3949
4335
 
3950
- .navbar .nav li.dropdown.active > .dropdown-toggle:hover {
3951
- color: #ffffff;
4336
+ .navbar .nav li.dropdown > .dropdown-toggle .caret {
4337
+ border-top-color: #555555;
4338
+ border-bottom-color: #555555;
3952
4339
  }
3953
4340
 
3954
- .navbar .pull-right .dropdown-menu,
3955
- .navbar .dropdown-menu.pull-right {
4341
+ .navbar .nav li.dropdown.open > .dropdown-toggle .caret,
4342
+ .navbar .nav li.dropdown.active > .dropdown-toggle .caret,
4343
+ .navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
4344
+ border-top-color: #555555;
4345
+ border-bottom-color: #555555;
4346
+ }
4347
+
4348
+ .navbar .pull-right > li > .dropdown-menu,
4349
+ .navbar .nav > li > .dropdown-menu.pull-right {
3956
4350
  right: 0;
3957
4351
  left: auto;
3958
4352
  }
3959
4353
 
3960
- .navbar .pull-right .dropdown-menu:before,
3961
- .navbar .dropdown-menu.pull-right:before {
4354
+ .navbar .pull-right > li > .dropdown-menu:before,
4355
+ .navbar .nav > li > .dropdown-menu.pull-right:before {
3962
4356
  right: 12px;
3963
4357
  left: auto;
3964
4358
  }
3965
4359
 
3966
- .navbar .pull-right .dropdown-menu:after,
3967
- .navbar .dropdown-menu.pull-right:after {
4360
+ .navbar .pull-right > li > .dropdown-menu:after,
4361
+ .navbar .nav > li > .dropdown-menu.pull-right:after {
3968
4362
  right: 13px;
3969
4363
  left: auto;
3970
4364
  }
3971
4365
 
4366
+ .navbar .pull-right > li > .dropdown-menu .dropdown-menu,
4367
+ .navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
4368
+ right: 100%;
4369
+ left: auto;
4370
+ margin-right: -1px;
4371
+ margin-left: 0;
4372
+ -webkit-border-radius: 6px 0 6px 6px;
4373
+ -moz-border-radius: 6px 0 6px 6px;
4374
+ border-radius: 6px 0 6px 6px;
4375
+ }
4376
+
4377
+ .navbar-inverse {
4378
+ color: #999999;
4379
+ }
4380
+
4381
+ .navbar-inverse .navbar-inner {
4382
+ background-color: #1b1b1b;
4383
+ background-image: -moz-linear-gradient(top, #222222, #111111);
4384
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
4385
+ background-image: -webkit-linear-gradient(top, #222222, #111111);
4386
+ background-image: -o-linear-gradient(top, #222222, #111111);
4387
+ background-image: linear-gradient(to bottom, #222222, #111111);
4388
+ background-repeat: repeat-x;
4389
+ border-color: #252525;
4390
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
4391
+ }
4392
+
4393
+ .navbar-inverse .brand,
4394
+ .navbar-inverse .nav > li > a {
4395
+ color: #999999;
4396
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
4397
+ }
4398
+
4399
+ .navbar-inverse .brand:hover,
4400
+ .navbar-inverse .nav > li > a:hover {
4401
+ color: #ffffff;
4402
+ }
4403
+
4404
+ .navbar-inverse .nav > li > a:focus,
4405
+ .navbar-inverse .nav > li > a:hover {
4406
+ color: #ffffff;
4407
+ background-color: transparent;
4408
+ }
4409
+
4410
+ .navbar-inverse .nav .active > a,
4411
+ .navbar-inverse .nav .active > a:hover,
4412
+ .navbar-inverse .nav .active > a:focus {
4413
+ color: #ffffff;
4414
+ background-color: #111111;
4415
+ }
4416
+
4417
+ .navbar-inverse .navbar-link {
4418
+ color: #999999;
4419
+ }
4420
+
4421
+ .navbar-inverse .navbar-link:hover {
4422
+ color: #ffffff;
4423
+ }
4424
+
4425
+ .navbar-inverse .divider-vertical {
4426
+ border-right-color: #222222;
4427
+ border-left-color: #111111;
4428
+ }
4429
+
4430
+ .navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
4431
+ .navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
4432
+ .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
4433
+ color: #ffffff;
4434
+ background-color: #111111;
4435
+ }
4436
+
4437
+ .navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
4438
+ border-top-color: #999999;
4439
+ border-bottom-color: #999999;
4440
+ }
4441
+
4442
+ .navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
4443
+ .navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
4444
+ .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
4445
+ border-top-color: #ffffff;
4446
+ border-bottom-color: #ffffff;
4447
+ }
4448
+
4449
+ .navbar-inverse .navbar-search .search-query {
4450
+ color: #ffffff;
4451
+ background-color: #515151;
4452
+ border-color: #111111;
4453
+ -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
4454
+ -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
4455
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
4456
+ -webkit-transition: none;
4457
+ -moz-transition: none;
4458
+ -o-transition: none;
4459
+ transition: none;
4460
+ }
4461
+
4462
+ .navbar-inverse .navbar-search .search-query:-moz-placeholder {
4463
+ color: #cccccc;
4464
+ }
4465
+
4466
+ .navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
4467
+ color: #cccccc;
4468
+ }
4469
+
4470
+ .navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
4471
+ color: #cccccc;
4472
+ }
4473
+
4474
+ .navbar-inverse .navbar-search .search-query:focus,
4475
+ .navbar-inverse .navbar-search .search-query.focused {
4476
+ padding: 5px 15px;
4477
+ color: #333333;
4478
+ text-shadow: 0 1px 0 #ffffff;
4479
+ background-color: #ffffff;
4480
+ border: 0;
4481
+ outline: 0;
4482
+ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
4483
+ -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
4484
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
4485
+ }
4486
+
4487
+ .navbar-inverse .btn-navbar {
4488
+ color: #ffffff;
4489
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
4490
+ background-color: #0e0e0e;
4491
+ *background-color: #040404;
4492
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
4493
+ background-image: -webkit-linear-gradient(top, #151515, #040404);
4494
+ background-image: -o-linear-gradient(top, #151515, #040404);
4495
+ background-image: linear-gradient(to bottom, #151515, #040404);
4496
+ background-image: -moz-linear-gradient(top, #151515, #040404);
4497
+ background-repeat: repeat-x;
4498
+ border-color: #040404 #040404 #000000;
4499
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
4500
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
4501
+ filter: progid:dximagetransform.microsoft.gradient(enabled=false);
4502
+ }
4503
+
4504
+ .navbar-inverse .btn-navbar:hover,
4505
+ .navbar-inverse .btn-navbar:active,
4506
+ .navbar-inverse .btn-navbar.active,
4507
+ .navbar-inverse .btn-navbar.disabled,
4508
+ .navbar-inverse .btn-navbar[disabled] {
4509
+ color: #ffffff;
4510
+ background-color: #040404;
4511
+ *background-color: #000000;
4512
+ }
4513
+
4514
+ .navbar-inverse .btn-navbar:active,
4515
+ .navbar-inverse .btn-navbar.active {
4516
+ background-color: #000000 \9;
4517
+ }
4518
+
3972
4519
  .breadcrumb {
3973
- padding: 7px 14px;
3974
- margin: 0 0 18px;
4520
+ padding: 8px 15px;
4521
+ margin: 0 0 20px;
3975
4522
  list-style: none;
3976
- background-color: #fbfbfb;
3977
- background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
3978
- background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
3979
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
3980
- background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
3981
- background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
3982
- background-image: linear-gradient(top, #ffffff, #f5f5f5);
3983
- background-repeat: repeat-x;
3984
- border: 1px solid #ddd;
3985
- -webkit-border-radius: 3px;
3986
- -moz-border-radius: 3px;
3987
- border-radius: 3px;
3988
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
3989
- -webkit-box-shadow: inset 0 1px 0 #ffffff;
3990
- -moz-box-shadow: inset 0 1px 0 #ffffff;
3991
- box-shadow: inset 0 1px 0 #ffffff;
4523
+ background-color: #f5f5f5;
4524
+ -webkit-border-radius: 4px;
4525
+ -moz-border-radius: 4px;
4526
+ border-radius: 4px;
3992
4527
  }
3993
4528
 
3994
4529
  .breadcrumb li {
@@ -4000,16 +4535,16 @@ input[type="submit"].btn.btn-mini {
4000
4535
 
4001
4536
  .breadcrumb .divider {
4002
4537
  padding: 0 5px;
4003
- color: #999999;
4538
+ color: #ccc;
4004
4539
  }
4005
4540
 
4006
- .breadcrumb .active a {
4007
- color: #333333;
4541
+ .breadcrumb .active {
4542
+ color: #999999;
4008
4543
  }
4009
4544
 
4010
4545
  .pagination {
4011
- height: 36px;
4012
- margin: 18px 0;
4546
+ height: 40px;
4547
+ margin: 20px 0;
4013
4548
  }
4014
4549
 
4015
4550
  .pagination ul {
@@ -4030,21 +4565,25 @@ input[type="submit"].btn.btn-mini {
4030
4565
  display: inline;
4031
4566
  }
4032
4567
 
4033
- .pagination a {
4568
+ .pagination a,
4569
+ .pagination span {
4034
4570
  float: left;
4035
4571
  padding: 0 14px;
4036
- line-height: 34px;
4572
+ line-height: 38px;
4037
4573
  text-decoration: none;
4038
- border: 1px solid #ddd;
4574
+ background-color: #ffffff;
4575
+ border: 1px solid #dddddd;
4039
4576
  border-left-width: 0;
4040
4577
  }
4041
4578
 
4042
4579
  .pagination a:hover,
4043
- .pagination .active a {
4580
+ .pagination .active a,
4581
+ .pagination .active span {
4044
4582
  background-color: #f5f5f5;
4045
4583
  }
4046
4584
 
4047
- .pagination .active a {
4585
+ .pagination .active a,
4586
+ .pagination .active span {
4048
4587
  color: #999999;
4049
4588
  cursor: default;
4050
4589
  }
@@ -4057,14 +4596,16 @@ input[type="submit"].btn.btn-mini {
4057
4596
  background-color: transparent;
4058
4597
  }
4059
4598
 
4060
- .pagination li:first-child a {
4599
+ .pagination li:first-child a,
4600
+ .pagination li:first-child span {
4061
4601
  border-left-width: 1px;
4062
4602
  -webkit-border-radius: 3px 0 0 3px;
4063
4603
  -moz-border-radius: 3px 0 0 3px;
4064
4604
  border-radius: 3px 0 0 3px;
4065
4605
  }
4066
4606
 
4067
- .pagination li:last-child a {
4607
+ .pagination li:last-child a,
4608
+ .pagination li:last-child span {
4068
4609
  -webkit-border-radius: 0 3px 3px 0;
4069
4610
  -moz-border-radius: 0 3px 3px 0;
4070
4611
  border-radius: 0 3px 3px 0;
@@ -4079,8 +4620,7 @@ input[type="submit"].btn.btn-mini {
4079
4620
  }
4080
4621
 
4081
4622
  .pager {
4082
- margin-bottom: 18px;
4083
- margin-left: 0;
4623
+ margin: 20px 0;
4084
4624
  text-align: center;
4085
4625
  list-style: none;
4086
4626
  *zoom: 1;
@@ -4089,6 +4629,7 @@ input[type="submit"].btn.btn-mini {
4089
4629
  .pager:before,
4090
4630
  .pager:after {
4091
4631
  display: table;
4632
+ line-height: 0;
4092
4633
  content: "";
4093
4634
  }
4094
4635
 
@@ -4193,7 +4734,6 @@ input[type="submit"].btn.btn-mini {
4193
4734
  top: -25%;
4194
4735
  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
4195
4736
  -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
4196
- -ms-transition: opacity 0.3s linear, top 0.3s ease-out;
4197
4737
  -o-transition: opacity 0.3s linear, top 0.3s ease-out;
4198
4738
  transition: opacity 0.3s linear, top 0.3s ease-out;
4199
4739
  }
@@ -4211,6 +4751,11 @@ input[type="submit"].btn.btn-mini {
4211
4751
  margin-top: 2px;
4212
4752
  }
4213
4753
 
4754
+ .modal-header h3 {
4755
+ margin: 0;
4756
+ line-height: 30px;
4757
+ }
4758
+
4214
4759
  .modal-body {
4215
4760
  max-height: 400px;
4216
4761
  padding: 15px;
@@ -4239,6 +4784,7 @@ input[type="submit"].btn.btn-mini {
4239
4784
  .modal-footer:before,
4240
4785
  .modal-footer:after {
4241
4786
  display: table;
4787
+ line-height: 0;
4242
4788
  content: "";
4243
4789
  }
4244
4790
 
@@ -4272,55 +4818,19 @@ input[type="submit"].btn.btn-mini {
4272
4818
  }
4273
4819
 
4274
4820
  .tooltip.top {
4275
- margin-top: -2px;
4821
+ margin-top: -3px;
4276
4822
  }
4277
4823
 
4278
4824
  .tooltip.right {
4279
- margin-left: 2px;
4825
+ margin-left: 3px;
4280
4826
  }
4281
4827
 
4282
4828
  .tooltip.bottom {
4283
- margin-top: 2px;
4829
+ margin-top: 3px;
4284
4830
  }
4285
4831
 
4286
4832
  .tooltip.left {
4287
- margin-left: -2px;
4288
- }
4289
-
4290
- .tooltip.top .tooltip-arrow {
4291
- bottom: 0;
4292
- left: 50%;
4293
- margin-left: -5px;
4294
- border-top: 5px solid #000000;
4295
- border-right: 5px solid transparent;
4296
- border-left: 5px solid transparent;
4297
- }
4298
-
4299
- .tooltip.left .tooltip-arrow {
4300
- top: 50%;
4301
- right: 0;
4302
- margin-top: -5px;
4303
- border-top: 5px solid transparent;
4304
- border-bottom: 5px solid transparent;
4305
- border-left: 5px solid #000000;
4306
- }
4307
-
4308
- .tooltip.bottom .tooltip-arrow {
4309
- top: 0;
4310
- left: 50%;
4311
- margin-left: -5px;
4312
- border-right: 5px solid transparent;
4313
- border-bottom: 5px solid #000000;
4314
- border-left: 5px solid transparent;
4315
- }
4316
-
4317
- .tooltip.right .tooltip-arrow {
4318
- top: 50%;
4319
- left: 0;
4320
- margin-top: -5px;
4321
- border-top: 5px solid transparent;
4322
- border-right: 5px solid #000000;
4323
- border-bottom: 5px solid transparent;
4833
+ margin-left: -3px;
4324
4834
  }
4325
4835
 
4326
4836
  .tooltip-inner {
@@ -4339,6 +4849,40 @@ input[type="submit"].btn.btn-mini {
4339
4849
  position: absolute;
4340
4850
  width: 0;
4341
4851
  height: 0;
4852
+ border-color: transparent;
4853
+ border-style: solid;
4854
+ }
4855
+
4856
+ .tooltip.top .tooltip-arrow {
4857
+ bottom: 0;
4858
+ left: 50%;
4859
+ margin-left: -5px;
4860
+ border-top-color: #000000;
4861
+ border-width: 5px 5px 0;
4862
+ }
4863
+
4864
+ .tooltip.right .tooltip-arrow {
4865
+ top: 50%;
4866
+ left: 0;
4867
+ margin-top: -5px;
4868
+ border-right-color: #000000;
4869
+ border-width: 5px 5px 5px 0;
4870
+ }
4871
+
4872
+ .tooltip.left .tooltip-arrow {
4873
+ top: 50%;
4874
+ right: 0;
4875
+ margin-top: -5px;
4876
+ border-left-color: #000000;
4877
+ border-width: 5px 0 5px 5px;
4878
+ }
4879
+
4880
+ .tooltip.bottom .tooltip-arrow {
4881
+ top: 0;
4882
+ left: 50%;
4883
+ margin-left: -5px;
4884
+ border-bottom-color: #000000;
4885
+ border-width: 0 5px 5px;
4342
4886
  }
4343
4887
 
4344
4888
  .popover {
@@ -4347,106 +4891,134 @@ input[type="submit"].btn.btn-mini {
4347
4891
  left: 0;
4348
4892
  z-index: 1010;
4349
4893
  display: none;
4350
- padding: 5px;
4894
+ width: 236px;
4895
+ padding: 1px;
4896
+ background-color: #ffffff;
4897
+ border: 1px solid #ccc;
4898
+ border: 1px solid rgba(0, 0, 0, 0.2);
4899
+ -webkit-border-radius: 6px;
4900
+ -moz-border-radius: 6px;
4901
+ border-radius: 6px;
4902
+ -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
4903
+ -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
4904
+ box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
4905
+ -webkit-background-clip: padding-box;
4906
+ -moz-background-clip: padding;
4907
+ background-clip: padding-box;
4351
4908
  }
4352
4909
 
4353
4910
  .popover.top {
4354
- margin-top: -5px;
4911
+ margin-bottom: 10px;
4355
4912
  }
4356
4913
 
4357
4914
  .popover.right {
4358
- margin-left: 5px;
4915
+ margin-left: 10px;
4359
4916
  }
4360
4917
 
4361
4918
  .popover.bottom {
4362
- margin-top: 5px;
4919
+ margin-top: 10px;
4363
4920
  }
4364
4921
 
4365
4922
  .popover.left {
4366
- margin-left: -5px;
4923
+ margin-right: 10px;
4367
4924
  }
4368
4925
 
4369
- .popover.top .arrow {
4370
- bottom: 0;
4371
- left: 50%;
4372
- margin-left: -5px;
4373
- border-top: 5px solid #000000;
4374
- border-right: 5px solid transparent;
4375
- border-left: 5px solid transparent;
4926
+ .popover-title {
4927
+ padding: 8px 14px;
4928
+ margin: 0;
4929
+ font-size: 14px;
4930
+ font-weight: normal;
4931
+ line-height: 18px;
4932
+ background-color: #f7f7f7;
4933
+ border-bottom: 1px solid #ebebeb;
4934
+ -webkit-border-radius: 5px 5px 0 0;
4935
+ -moz-border-radius: 5px 5px 0 0;
4936
+ border-radius: 5px 5px 0 0;
4376
4937
  }
4377
4938
 
4378
- .popover.right .arrow {
4379
- top: 50%;
4380
- left: 0;
4381
- margin-top: -5px;
4382
- border-top: 5px solid transparent;
4383
- border-right: 5px solid #000000;
4384
- border-bottom: 5px solid transparent;
4939
+ .popover-content {
4940
+ padding: 9px 14px;
4385
4941
  }
4386
4942
 
4387
- .popover.bottom .arrow {
4388
- top: 0;
4943
+ .popover-content p,
4944
+ .popover-content ul,
4945
+ .popover-content ol {
4946
+ margin-bottom: 0;
4947
+ }
4948
+
4949
+ .popover .arrow,
4950
+ .popover .arrow:after {
4951
+ position: absolute;
4952
+ display: inline-block;
4953
+ width: 0;
4954
+ height: 0;
4955
+ border-color: transparent;
4956
+ border-style: solid;
4957
+ }
4958
+
4959
+ .popover .arrow:after {
4960
+ z-index: -1;
4961
+ content: "";
4962
+ }
4963
+
4964
+ .popover.top .arrow {
4965
+ bottom: -10px;
4389
4966
  left: 50%;
4390
- margin-left: -5px;
4391
- border-right: 5px solid transparent;
4392
- border-bottom: 5px solid #000000;
4393
- border-left: 5px solid transparent;
4967
+ margin-left: -10px;
4968
+ border-top-color: #ffffff;
4969
+ border-width: 10px 10px 0;
4394
4970
  }
4395
4971
 
4396
- .popover.left .arrow {
4972
+ .popover.top .arrow:after {
4973
+ bottom: -1px;
4974
+ left: -11px;
4975
+ border-top-color: rgba(0, 0, 0, 0.25);
4976
+ border-width: 11px 11px 0;
4977
+ }
4978
+
4979
+ .popover.right .arrow {
4397
4980
  top: 50%;
4398
- right: 0;
4399
- margin-top: -5px;
4400
- border-top: 5px solid transparent;
4401
- border-bottom: 5px solid transparent;
4402
- border-left: 5px solid #000000;
4981
+ left: -10px;
4982
+ margin-top: -10px;
4983
+ border-right-color: #ffffff;
4984
+ border-width: 10px 10px 10px 0;
4403
4985
  }
4404
4986
 
4405
- .popover .arrow {
4406
- position: absolute;
4407
- width: 0;
4408
- height: 0;
4987
+ .popover.right .arrow:after {
4988
+ bottom: -11px;
4989
+ left: -1px;
4990
+ border-right-color: rgba(0, 0, 0, 0.25);
4991
+ border-width: 11px 11px 11px 0;
4409
4992
  }
4410
4993
 
4411
- .popover-inner {
4412
- width: 280px;
4413
- padding: 3px;
4414
- overflow: hidden;
4415
- background: #000000;
4416
- background: rgba(0, 0, 0, 0.8);
4417
- -webkit-border-radius: 6px;
4418
- -moz-border-radius: 6px;
4419
- border-radius: 6px;
4420
- -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
4421
- -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
4422
- box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
4994
+ .popover.bottom .arrow {
4995
+ top: -10px;
4996
+ left: 50%;
4997
+ margin-left: -10px;
4998
+ border-bottom-color: #ffffff;
4999
+ border-width: 0 10px 10px;
4423
5000
  }
4424
5001
 
4425
- .popover-title {
4426
- padding: 9px 15px;
4427
- line-height: 1;
4428
- background-color: #f5f5f5;
4429
- border-bottom: 1px solid #eee;
4430
- -webkit-border-radius: 3px 3px 0 0;
4431
- -moz-border-radius: 3px 3px 0 0;
4432
- border-radius: 3px 3px 0 0;
5002
+ .popover.bottom .arrow:after {
5003
+ top: -1px;
5004
+ left: -11px;
5005
+ border-bottom-color: rgba(0, 0, 0, 0.25);
5006
+ border-width: 0 11px 11px;
4433
5007
  }
4434
5008
 
4435
- .popover-content {
4436
- padding: 14px;
4437
- background-color: #ffffff;
4438
- -webkit-border-radius: 0 0 3px 3px;
4439
- -moz-border-radius: 0 0 3px 3px;
4440
- border-radius: 0 0 3px 3px;
4441
- -webkit-background-clip: padding-box;
4442
- -moz-background-clip: padding-box;
4443
- background-clip: padding-box;
5009
+ .popover.left .arrow {
5010
+ top: 50%;
5011
+ right: -10px;
5012
+ margin-top: -10px;
5013
+ border-left-color: #ffffff;
5014
+ border-width: 10px 0 10px 10px;
4444
5015
  }
4445
5016
 
4446
- .popover-content p,
4447
- .popover-content ul,
4448
- .popover-content ol {
4449
- margin-bottom: 0;
5017
+ .popover.left .arrow:after {
5018
+ right: -1px;
5019
+ bottom: -11px;
5020
+ border-left-color: rgba(0, 0, 0, 0.25);
5021
+ border-width: 11px 0 11px 11px;
4450
5022
  }
4451
5023
 
4452
5024
  .thumbnails {
@@ -4458,6 +5030,7 @@ input[type="submit"].btn.btn-mini {
4458
5030
  .thumbnails:before,
4459
5031
  .thumbnails:after {
4460
5032
  display: table;
5033
+ line-height: 0;
4461
5034
  content: "";
4462
5035
  }
4463
5036
 
@@ -4471,21 +5044,21 @@ input[type="submit"].btn.btn-mini {
4471
5044
 
4472
5045
  .thumbnails > li {
4473
5046
  float: left;
4474
- margin-bottom: 18px;
5047
+ margin-bottom: 20px;
4475
5048
  margin-left: 20px;
4476
5049
  }
4477
5050
 
4478
5051
  .thumbnail {
4479
5052
  display: block;
4480
5053
  padding: 4px;
4481
- line-height: 1;
5054
+ line-height: 20px;
4482
5055
  border: 1px solid #ddd;
4483
5056
  -webkit-border-radius: 4px;
4484
5057
  -moz-border-radius: 4px;
4485
5058
  border-radius: 4px;
4486
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
4487
- -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
4488
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
5059
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
5060
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
5061
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
4489
5062
  }
4490
5063
 
4491
5064
  a.thumbnail:hover {
@@ -4504,11 +5077,12 @@ a.thumbnail:hover {
4504
5077
 
4505
5078
  .thumbnail .caption {
4506
5079
  padding: 9px;
5080
+ color: #555555;
4507
5081
  }
4508
5082
 
4509
5083
  .label,
4510
5084
  .badge {
4511
- font-size: 10.998px;
5085
+ font-size: 11.844px;
4512
5086
  font-weight: bold;
4513
5087
  line-height: 14px;
4514
5088
  color: #ffffff;
@@ -4589,6 +5163,17 @@ a.badge:hover {
4589
5163
  background-color: #1a1a1a;
4590
5164
  }
4591
5165
 
5166
+ .btn .label,
5167
+ .btn .badge {
5168
+ position: relative;
5169
+ top: -1px;
5170
+ }
5171
+
5172
+ .btn-mini .label,
5173
+ .btn-mini .badge {
5174
+ top: 0;
5175
+ }
5176
+
4592
5177
  @-webkit-keyframes progress-bar-stripes {
4593
5178
  from {
4594
5179
  background-position: 40px 0;
@@ -4640,16 +5225,15 @@ a.badge:hover {
4640
5225
  overflow: hidden;
4641
5226
  background-color: #f7f7f7;
4642
5227
  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
4643
- background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
4644
5228
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
4645
5229
  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
4646
5230
  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
4647
- background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
5231
+ background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
4648
5232
  background-repeat: repeat-x;
4649
5233
  -webkit-border-radius: 4px;
4650
5234
  -moz-border-radius: 4px;
4651
5235
  border-radius: 4px;
4652
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
5236
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
4653
5237
  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
4654
5238
  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
4655
5239
  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
@@ -4657,42 +5241,38 @@ a.badge:hover {
4657
5241
 
4658
5242
  .progress .bar {
4659
5243
  width: 0;
4660
- height: 18px;
5244
+ height: 100%;
4661
5245
  font-size: 12px;
4662
5246
  color: #ffffff;
4663
5247
  text-align: center;
4664
5248
  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
4665
5249
  background-color: #0e90d2;
4666
- background-image: -moz-linear-gradient(top, #149bdf, #0480be);
4667
5250
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
4668
5251
  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
4669
5252
  background-image: -o-linear-gradient(top, #149bdf, #0480be);
4670
- background-image: linear-gradient(top, #149bdf, #0480be);
4671
- background-image: -ms-linear-gradient(top, #149bdf, #0480be);
5253
+ background-image: linear-gradient(to bottom, #149bdf, #0480be);
5254
+ background-image: -moz-linear-gradient(top, #149bdf, #0480be);
4672
5255
  background-repeat: repeat-x;
4673
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
5256
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
4674
5257
  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
4675
5258
  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
4676
5259
  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
4677
5260
  -webkit-box-sizing: border-box;
4678
5261
  -moz-box-sizing: border-box;
4679
- -ms-box-sizing: border-box;
4680
5262
  box-sizing: border-box;
4681
5263
  -webkit-transition: width 0.6s ease;
4682
5264
  -moz-transition: width 0.6s ease;
4683
- -ms-transition: width 0.6s ease;
4684
5265
  -o-transition: width 0.6s ease;
4685
5266
  transition: width 0.6s ease;
4686
5267
  }
4687
5268
 
4688
5269
  .progress-striped .bar {
4689
5270
  background-color: #149bdf;
4690
- 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);
4691
- 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);
4692
- 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);
4693
- 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);
4694
5271
  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));
4695
- 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);
5272
+ 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);
5273
+ 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);
5274
+ 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);
5275
+ 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);
4696
5276
  -webkit-background-size: 40px 40px;
4697
5277
  -moz-background-size: 40px 40px;
4698
5278
  -o-background-size: 40px 40px;
@@ -4710,93 +5290,85 @@ a.badge:hover {
4710
5290
  .progress-danger .bar {
4711
5291
  background-color: #dd514c;
4712
5292
  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
4713
- background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
4714
5293
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
4715
5294
  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
4716
5295
  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
4717
- background-image: linear-gradient(top, #ee5f5b, #c43c35);
5296
+ background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
4718
5297
  background-repeat: repeat-x;
4719
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
5298
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
4720
5299
  }
4721
5300
 
4722
5301
  .progress-danger.progress-striped .bar {
4723
5302
  background-color: #ee5f5b;
4724
5303
  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));
4725
- 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);
4726
- 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);
4727
- 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);
4728
- 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);
4729
- 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);
5304
+ 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);
5305
+ 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);
5306
+ 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);
5307
+ 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);
4730
5308
  }
4731
5309
 
4732
5310
  .progress-success .bar {
4733
5311
  background-color: #5eb95e;
4734
5312
  background-image: -moz-linear-gradient(top, #62c462, #57a957);
4735
- background-image: -ms-linear-gradient(top, #62c462, #57a957);
4736
5313
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
4737
5314
  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
4738
5315
  background-image: -o-linear-gradient(top, #62c462, #57a957);
4739
- background-image: linear-gradient(top, #62c462, #57a957);
5316
+ background-image: linear-gradient(to bottom, #62c462, #57a957);
4740
5317
  background-repeat: repeat-x;
4741
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
5318
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
4742
5319
  }
4743
5320
 
4744
5321
  .progress-success.progress-striped .bar {
4745
5322
  background-color: #62c462;
4746
5323
  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));
4747
- 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);
4748
- 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);
4749
- 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);
4750
- 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);
4751
- 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);
5324
+ 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);
5325
+ 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);
5326
+ 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);
5327
+ 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);
4752
5328
  }
4753
5329
 
4754
5330
  .progress-info .bar {
4755
5331
  background-color: #4bb1cf;
4756
5332
  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
4757
- background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
4758
5333
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
4759
5334
  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
4760
5335
  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
4761
- background-image: linear-gradient(top, #5bc0de, #339bb9);
5336
+ background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
4762
5337
  background-repeat: repeat-x;
4763
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
5338
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
4764
5339
  }
4765
5340
 
4766
5341
  .progress-info.progress-striped .bar {
4767
5342
  background-color: #5bc0de;
4768
5343
  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));
4769
- 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);
4770
- 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);
4771
- 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);
4772
- 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);
4773
- 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);
5344
+ 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);
5345
+ 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);
5346
+ 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);
5347
+ 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);
4774
5348
  }
4775
5349
 
4776
5350
  .progress-warning .bar {
4777
5351
  background-color: #faa732;
4778
5352
  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
4779
- background-image: -ms-linear-gradient(top, #fbb450, #f89406);
4780
5353
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
4781
5354
  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
4782
5355
  background-image: -o-linear-gradient(top, #fbb450, #f89406);
4783
- background-image: linear-gradient(top, #fbb450, #f89406);
5356
+ background-image: linear-gradient(to bottom, #fbb450, #f89406);
4784
5357
  background-repeat: repeat-x;
4785
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
5358
+ filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
4786
5359
  }
4787
5360
 
4788
5361
  .progress-warning.progress-striped .bar {
4789
5362
  background-color: #fbb450;
4790
5363
  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));
4791
- 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);
4792
- 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);
4793
- 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);
4794
- 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);
4795
- 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);
5364
+ 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);
5365
+ 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);
5366
+ 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);
5367
+ 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);
4796
5368
  }
4797
5369
 
4798
5370
  .accordion {
4799
- margin-bottom: 18px;
5371
+ margin-bottom: 20px;
4800
5372
  }
4801
5373
 
4802
5374
  .accordion-group {
@@ -4827,7 +5399,7 @@ a.badge:hover {
4827
5399
 
4828
5400
  .carousel {
4829
5401
  position: relative;
4830
- margin-bottom: 18px;
5402
+ margin-bottom: 20px;
4831
5403
  line-height: 1;
4832
5404
  }
4833
5405
 
@@ -4842,7 +5414,6 @@ a.badge:hover {
4842
5414
  display: none;
4843
5415
  -webkit-transition: 0.6s ease-in-out left;
4844
5416
  -moz-transition: 0.6s ease-in-out left;
4845
- -ms-transition: 0.6s ease-in-out left;
4846
5417
  -o-transition: 0.6s ease-in-out left;
4847
5418
  transition: 0.6s ease-in-out left;
4848
5419
  }
@@ -4928,16 +5499,25 @@ a.badge:hover {
4928
5499
  right: 0;
4929
5500
  bottom: 0;
4930
5501
  left: 0;
4931
- padding: 10px 15px 5px;
5502
+ padding: 15px;
4932
5503
  background: #333333;
4933
5504
  background: rgba(0, 0, 0, 0.75);
4934
5505
  }
4935
5506
 
4936
5507
  .carousel-caption h4,
4937
5508
  .carousel-caption p {
5509
+ line-height: 20px;
4938
5510
  color: #ffffff;
4939
5511
  }
4940
5512
 
5513
+ .carousel-caption h4 {
5514
+ margin: 0 0 5px;
5515
+ }
5516
+
5517
+ .carousel-caption p {
5518
+ margin-bottom: 0;
5519
+ }
5520
+
4941
5521
  .hero-unit {
4942
5522
  padding: 60px;
4943
5523
  margin-bottom: 30px;
@@ -4958,7 +5538,7 @@ a.badge:hover {
4958
5538
  .hero-unit p {
4959
5539
  font-size: 18px;
4960
5540
  font-weight: 200;
4961
- line-height: 27px;
5541
+ line-height: 30px;
4962
5542
  color: inherit;
4963
5543
  }
4964
5544
 
@@ -4981,3 +5561,7 @@ a.badge:hover {
4981
5561
  .invisible {
4982
5562
  visibility: hidden;
4983
5563
  }
5564
+
5565
+ .affix {
5566
+ position: fixed;
5567
+ }