Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updating to work with 2.0.3

  • Loading branch information...
commit 9a727b05f81e7dd2192367ff776735e2b18bf71d 1 parent f824710
@ajkochanowicz ajkochanowicz authored
Showing with 4,121 additions and 2,648 deletions.
  1. +3 −1 .gitignore
  2. +1,019 −1,139 css/bootstrap.css
  3. +9 −0 extras/h5bp/font-smoothing-ck.js
  4. +0 −310 extras/settings/overrides.less
  5. BIN  img/glyphicons-halflings-white.png
  6. BIN  img/glyphicons-halflings.png
  7. +10 −0 js/.jshintrc
  8. +9 −3 js/README.md
  9. +28 −32 js/bootstrap-alert.js
  10. +0 −1  js/bootstrap-alert.min.js
  11. +29 −33 js/bootstrap-button.js
  12. +0 −1  js/bootstrap-button.min.js
  13. +33 −21 js/bootstrap-carousel.js
  14. +0 −1  js/bootstrap-carousel.min.js
  15. +47 −26 js/bootstrap-collapse.js
  16. +0 −1  js/bootstrap-collapse.min.js
  17. +18 −10 js/bootstrap-dropdown.js
  18. +0 −1  js/bootstrap-dropdown.min.js
  19. +25 −17 js/bootstrap-modal.js
  20. +0 −1  js/bootstrap-modal.min.js
  21. +13 −10 js/bootstrap-popover.js
  22. +0 −1  js/bootstrap-popover.min.js
  23. +44 −18 js/bootstrap-scrollspy.js
  24. +0 −1  js/bootstrap-scrollspy.min.js
  25. +12 −7 js/bootstrap-tab.js
  26. +0 −1  js/bootstrap-tab.min.js
  27. +40 −35 js/bootstrap-tooltip.js
  28. +0 −1  js/bootstrap-tooltip.min.js
  29. +30 −20 js/bootstrap-transition.js
  30. +0 −1  js/bootstrap-transition.min.js
  31. +29 −15 js/bootstrap-typeahead.js
  32. +0 −1  js/bootstrap-typeahead.min.js
  33. +0 −1  js/bootstrap.min-ck.js
  34. +0 −1  js/bootstrap.min.js
  35. +6 −1 js/tests/index.html
  36. +63 −0 js/tests/phantom.js
  37. +14 −0 js/tests/server.js
  38. +15 −0 js/tests/unit/bootstrap-alert.js
  39. +28 −0 js/tests/unit/bootstrap-carousel.js
  40. +29 −0 js/tests/unit/bootstrap-collapse.js
  41. +34 −0 js/tests/unit/bootstrap-dropdown.js
  42. +29 −0 js/tests/unit/bootstrap-modal.js
  43. +21 −0 js/tests/unit/bootstrap-phantom.js
  44. +16 −0 js/tests/unit/bootstrap-tab.js
  45. +74 −0 js/tests/unit/bootstrap-tooltip.js
  46. +1 −1  js/tests/unit/bootstrap-transition.js
  47. +23 −3 js/tests/unit/bootstrap-typeahead.js
  48. +5 −0 less/accordion.less
  49. +2 −14 less/alerts.less
  50. +3 −3 less/bootstrap.less
  51. +2 −0  less/breadcrumbs.less
  52. +76 −33 less/button-groups.less
  53. +32 −24 less/buttons.less
  54. +12 −1 less/close.less
  55. +6 −6 less/code.less
  56. +9 −7 less/component-animations.less
  57. +58 −45 less/dropdowns.less
  58. +125 −63 less/forms.less
  59. +2 −5 less/grid.less
  60. +3 −1 less/hero-unit.less
  61. +55 −0 less/labels-badges.less
  62. +0 −32 less/labels.less
  63. +1 −1  less/layouts.less
  64. +218 −177 less/mixins.less
  65. +13 −6 less/modals.less
  66. +137 −72 less/navbar.less
  67. +53 −43 less/navs.less
  68. +6 −0 less/pager.less
  69. +1 −0  less/pagination.less
  70. +29 −7 less/progress-bars.less
  71. +3 −3 less/reset.less
  72. +26 −0 less/responsive-1200px-min.less
  73. +149 −0 less/responsive-767px-max.less
  74. +17 −0 less/responsive-768px-979px.less
  75. +146 −0 less/responsive-navbar.less
  76. +41 −0 less/responsive-utilities.less
  77. +14 −337 less/responsive.less
  78. +4 −4 less/scaffolding.less
  79. +42 −9 less/sprites.less
  80. +46 −20 less/tables.less
  81. +51 −0 less/tests/css-tests.css
  82. +827 −0 less/tests/css-tests.html
  83. +14 −2 less/thumbnails.less
  84. +27 −10 less/type.less
  85. +105 −7 less/variables.less
  86. +10 −0 less/wells.less
View
4 .gitignore
@@ -21,6 +21,7 @@ Thumbs.db
nbproject
*.sublime-project
*.sublime-workspace
+queue.txt
# Komodo
*.komodoproject
@@ -30,4 +31,5 @@ nbproject
.hg
.svn
.CVS
-.idea
+.idea
+queue
View
2,158 css/bootstrap.css
@@ -1,6 +1,6 @@
@import url(http://fonts.googleapis.com/css?family=Fredoka+One);
/*!
- * Bootstrap v2.0.1
+ * Bootstrap v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -59,7 +59,7 @@ sub {
}
img {
max-width: 100%;
- height: auto;
+ vertical-align: middle;
border: 0;
-ms-interpolation-mode: bicubic;
}
@@ -89,10 +89,10 @@ input[type="submit"] {
-webkit-appearance: button;
}
input[type="search"] {
- -webkit-appearance: textfield;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
+ -webkit-appearance: textfield;
}
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {
@@ -113,6 +113,22 @@ textarea {
.clearfix:after {
clear: both;
}
+.hide-text {
+ font: 0/0 a;
+ color: transparent;
+ text-shadow: none;
+ background-color: transparent;
+ border: 0;
+}
+.input-block-level {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+}
body {
margin: 0;
font-family: 'Helvetica Neue', helvetica, sans-serif;
@@ -145,75 +161,82 @@ a:hover {
float: left;
margin-left: 20px;
}
-.span1 {
- width: 60px;
+.container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+ width: 940px;
}
-.span2 {
- width: 140px;
+.span12 {
+ width: 940px;
}
-.span3 {
- width: 220px;
+.span11 {
+ width: 860px;
}
-.span4 {
- width: 300px;
+.span10 {
+ width: 780px;
}
-.span5 {
- width: 380px;
+.span9 {
+ width: 700px;
}
-.span6 {
- width: 460px;
+.span8 {
+ width: 620px;
}
.span7 {
width: 540px;
}
-.span8 {
- width: 620px;
+.span6 {
+ width: 460px;
}
-.span9 {
- width: 700px;
+.span5 {
+ width: 380px;
}
-.span10 {
- width: 780px;
+.span4 {
+ width: 300px;
}
-.span11 {
- width: 860px;
+.span3 {
+ width: 220px;
}
-.span12,
-.container {
- width: 940px;
+.span2 {
+ width: 140px;
}
-.offset1 {
- margin-left: 100px;
+.span1 {
+ width: 60px;
}
-.offset2 {
- margin-left: 180px;
+.offset12 {
+ margin-left: 980px;
}
-.offset3 {
- margin-left: 260px;
+.offset11 {
+ margin-left: 900px;
}
-.offset4 {
- margin-left: 340px;
+.offset10 {
+ margin-left: 820px;
}
-.offset5 {
- margin-left: 420px;
+.offset9 {
+ margin-left: 740px;
}
-.offset6 {
- margin-left: 500px;
+.offset8 {
+ margin-left: 660px;
}
.offset7 {
margin-left: 580px;
}
-.offset8 {
- margin-left: 660px;
+.offset6 {
+ margin-left: 500px;
}
-.offset9 {
- margin-left: 740px;
+.offset5 {
+ margin-left: 420px;
}
-.offset10 {
- margin-left: 820px;
+.offset4 {
+ margin-left: 340px;
}
-.offset11 {
- margin-left: 900px;
+.offset3 {
+ margin-left: 260px;
+}
+.offset2 {
+ margin-left: 180px;
+}
+.offset1 {
+ margin-left: 100px;
}
.row-fluid {
width: 100%;
@@ -227,53 +250,72 @@ a:hover {
.row-fluid:after {
clear: both;
}
-.row-fluid > [class*="span"] {
+.row-fluid [class*="span"] {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
float: left;
margin-left: 2.127659574%;
+ *margin-left: 2.0744680846382977%;
}
-.row-fluid > [class*="span"]:first-child {
+.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
-.row-fluid > .span1 {
- width: 6.382978723%;
-}
-.row-fluid > .span2 {
- width: 14.89361702%;
+.row-fluid .span12 {
+ width: 99.99999998999999%;
+ *width: 99.94680850063828%;
}
-.row-fluid > .span3 {
- width: 23.404255317%;
+.row-fluid .span11 {
+ width: 91.489361693%;
+ *width: 91.4361702036383%;
}
-.row-fluid > .span4 {
- width: 31.914893614%;
+.row-fluid .span10 {
+ width: 82.97872339599999%;
+ *width: 82.92553190663828%;
}
-.row-fluid > .span5 {
- width: 40.425531911%;
+.row-fluid .span9 {
+ width: 74.468085099%;
+ *width: 74.4148936096383%;
}
-.row-fluid > .span6 {
- width: 48.93617020799999%;
+.row-fluid .span8 {
+ width: 65.95744680199999%;
+ *width: 65.90425531263828%;
}
-.row-fluid > .span7 {
+.row-fluid .span7 {
width: 57.446808505%;
+ *width: 57.3936170156383%;
}
-.row-fluid > .span8 {
- width: 65.95744680199999%;
+.row-fluid .span6 {
+ width: 48.93617020799999%;
+ *width: 48.88297871863829%;
}
-.row-fluid > .span9 {
- width: 74.468085099%;
+.row-fluid .span5 {
+ width: 40.425531911%;
+ *width: 40.3723404216383%;
}
-.row-fluid > .span10 {
- width: 82.97872339599999%;
+.row-fluid .span4 {
+ width: 31.914893614%;
+ *width: 31.8617021246383%;
}
-.row-fluid > .span11 {
- width: 91.489361693%;
+.row-fluid .span3 {
+ width: 23.404255317%;
+ *width: 23.3510638276383%;
}
-.row-fluid > .span12 {
- width: 99.99999998999999%;
+.row-fluid .span2 {
+ width: 14.89361702%;
+ *width: 14.8404255306383%;
+}
+.row-fluid .span1 {
+ width: 6.382978723%;
+ *width: 6.329787233638298%;
}
.container {
- width: 940px;
- margin-left: auto;
margin-right: auto;
+ margin-left: auto;
*zoom: 1;
}
.container:before,
@@ -285,8 +327,8 @@ a:hover {
clear: both;
}
.container-fluid {
- padding-left: 20px;
padding-right: 20px;
+ padding-left: 20px;
*zoom: 1;
}
.container-fluid:before,
@@ -320,8 +362,9 @@ h4,
h5,
h6 {
margin: 0;
+ font-family: inherit;
font-weight: bold;
- color: #333333;
+ color: inherit;
text-rendering: optimizelegibility;
}
h1 small,
@@ -348,8 +391,8 @@ h2 small {
font-size: 18px;
}
h3 {
- line-height: 27px;
font-size: 18px;
+ line-height: 27px;
}
h3 small {
font-size: 14px;
@@ -415,10 +458,23 @@ dd {
}
dt {
font-weight: bold;
+ line-height: 17px;
}
dd {
margin-left: 9px;
}
+.dl-horizontal dt {
+ float: left;
+ width: 120px;
+ clear: left;
+ text-align: right;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.dl-horizontal dd {
+ margin-left: 130px;
+}
hr {
margin: 18px 0;
border: 0;
@@ -434,11 +490,13 @@ em {
.muted {
color: #999999;
}
-abbr {
+abbr[title] {
+ cursor: help;
+ border-bottom: 1px dotted #ddd;
+}
+abbr.initialism {
font-size: 90%;
text-transform: uppercase;
- border-bottom: 1px dotted #ddd;
- cursor: help;
}
blockquote {
padding: 0 0 0 15px;
@@ -461,10 +519,10 @@ blockquote small:before {
}
blockquote.pull-right {
float: right;
- padding-left: 0;
padding-right: 15px;
- border-left: 0;
+ padding-left: 0;
border-right: 5px solid #eeeeee;
+ border-left: 0;
}
blockquote.pull-right p,
blockquote.pull-right small {
@@ -479,8 +537,8 @@ blockquote:after {
address {
display: block;
margin-bottom: 18px;
- line-height: 18px;
font-style: normal;
+ line-height: 18px;
}
small {
font-size: 100%;
@@ -491,7 +549,7 @@ cite {
code,
pre {
padding: 0 3px 2px;
- font-family: Menlo, Monaco, "Courier New", monospace;
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 12px;
color: #333333;
-webkit-border-radius: 3px;
@@ -499,7 +557,7 @@ pre {
border-radius: 3px;
}
code {
- padding: 3px 4px;
+ padding: 2px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
@@ -508,18 +566,18 @@ pre {
display: block;
padding: 8.5px;
margin: 0 0 9px;
- font-size: 12px;
+ font-size: 12.025px;
line-height: 18px;
+ word-break: break-all;
+ word-wrap: break-word;
+ white-space: pre;
+ white-space: pre-wrap;
background-color: #f5f5f5;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- white-space: pre;
- white-space: pre-wrap;
- word-break: break-all;
- word-wrap: break-word;
}
pre.prettyprint {
margin-bottom: 18px;
@@ -570,7 +628,7 @@ input,
button,
select,
textarea {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: 'Helvetica Neue', helvetica, sans-serif;
}
label {
display: block;
@@ -589,7 +647,8 @@ select,
font-size: 13px;
line-height: 18px;
color: #555555;
- border: 1px solid #ccc;
+ background-color: #ffffff;
+ border: 1px solid #cccccc;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@@ -615,12 +674,13 @@ input[type="radio"] {
line-height: normal;
cursor: pointer;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
+ background-color: transparent;
border: 0 \9;
/* IE9 and down */
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
}
input[type="image"] {
border: 0;
@@ -629,9 +689,9 @@ input[type="file"] {
width: auto;
padding: initial;
line-height: initial;
- border: initial;
background-color: #ffffff;
background-color: initial;
+ border: initial;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
@@ -676,6 +736,7 @@ input[type="hidden"] {
}
.radio,
.checkbox {
+ min-height: 18px;
padding-left: 18px;
}
.radio input[type="radio"],
@@ -712,24 +773,24 @@ textarea {
input:focus,
textarea:focus {
border-color: rgba(82, 168, 236, 0.8);
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
outline: 0;
outline: thin dotted \9;
/* IE6-9 */
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
}
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus,
select:focus {
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
.input-mini {
width: 60px;
@@ -752,69 +813,54 @@ select:focus {
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
-.uneditable-input {
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
float: none;
margin-left: 0;
}
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
- width: 50px;
+input,
+textarea,
+.uneditable-input {
+ margin-left: 0;
}
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
- width: 130px;
+input.span12, textarea.span12, .uneditable-input.span12 {
+ width: 930px;
}
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
- width: 210px;
+input.span11, textarea.span11, .uneditable-input.span11 {
+ width: 850px;
}
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
- width: 290px;
+input.span10, textarea.span10, .uneditable-input.span10 {
+ width: 770px;
}
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
- width: 370px;
+input.span9, textarea.span9, .uneditable-input.span9 {
+ width: 690px;
}
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
- width: 450px;
+input.span8, textarea.span8, .uneditable-input.span8 {
+ width: 610px;
}
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
+input.span7, textarea.span7, .uneditable-input.span7 {
width: 530px;
}
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
- width: 610px;
+input.span6, textarea.span6, .uneditable-input.span6 {
+ width: 450px;
}
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
- width: 690px;
+input.span5, textarea.span5, .uneditable-input.span5 {
+ width: 370px;
}
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
- width: 770px;
+input.span4, textarea.span4, .uneditable-input.span4 {
+ width: 290px;
}
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
- width: 850px;
+input.span3, textarea.span3, .uneditable-input.span3 {
+ width: 210px;
}
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
- width: 930px;
+input.span2, textarea.span2, .uneditable-input.span2 {
+ width: 130px;
+}
+input.span1, textarea.span1, .uneditable-input.span1 {
+ width: 50px;
}
input[disabled],
select[disabled],
@@ -822,9 +868,15 @@ textarea[disabled],
input[readonly],
select[readonly],
textarea[readonly] {
- background-color: #f5f5f5;
- border-color: #ddd;
cursor: not-allowed;
+ background-color: #eeeeee;
+ border-color: #ddd;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+ background-color: transparent;
}
.control-group.warning > label,
.control-group.warning .help-block,
@@ -921,15 +973,25 @@ select:focus:required:invalid:focus {
margin-bottom: 18px;
background-color: #f5f5f5;
border-top: 1px solid #ddd;
+ *zoom: 1;
+}
+.form-actions:before,
+.form-actions:after {
+ display: table;
+ content: "";
+}
+.form-actions:after {
+ clear: both;
}
.uneditable-input {
- display: block;
+ overflow: hidden;
+ white-space: nowrap;
+ cursor: not-allowed;
background-color: #ffffff;
border-color: #eee;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
- cursor: not-allowed;
}
:-moz-placeholder {
color: #999999;
@@ -937,11 +999,13 @@ select:focus:required:invalid:focus {
::-webkit-input-placeholder {
color: #999999;
}
+.help-block,
+.help-inline {
+ color: #555555;
+}
.help-block {
display: block;
- margin-top: 5px;
- margin-bottom: 0;
- color: #999999;
+ margin-bottom: 9px;
}
.help-inline {
display: inline-block;
@@ -949,39 +1013,33 @@ select:focus:required:invalid:focus {
/* IE7 inline-block hack */
*zoom: 1;
- margin-bottom: 9px;
vertical-align: middle;
padding-left: 5px;
}
.input-prepend,
.input-append {
margin-bottom: 5px;
- *zoom: 1;
-}
-.input-prepend:before,
-.input-append:before,
-.input-prepend:after,
-.input-append:after {
- display: table;
- content: "";
-}
-.input-prepend:after,
-.input-append:after {
- clear: both;
}
.input-prepend input,
.input-append input,
+.input-prepend select,
+.input-append select,
.input-prepend .uneditable-input,
.input-append .uneditable-input {
+ position: relative;
+ margin-bottom: 0;
+ *margin-left: 0;
+ vertical-align: middle;
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
.input-prepend input:focus,
.input-append input:focus,
+.input-prepend select:focus,
+.input-append select:focus,
.input-prepend .uneditable-input:focus,
.input-append .uneditable-input:focus {
- position: relative;
z-index: 2;
}
.input-prepend .uneditable-input,
@@ -990,61 +1048,88 @@ select:focus:required:invalid:focus {
}
.input-prepend .add-on,
.input-append .add-on {
- float: left;
- display: block;
+ display: inline-block;
width: auto;
- min-width: 16px;
height: 18px;
- margin-right: -1px;
+ min-width: 16px;
padding: 4px 5px;
font-weight: normal;
line-height: 18px;
- color: #999999;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
- background-color: #f5f5f5;
+ vertical-align: middle;
+ background-color: #eeeeee;
border: 1px solid #ccc;
- -webkit-border-radius: 3px 0 0 3px;
- -moz-border-radius: 3px 0 0 3px;
- border-radius: 3px 0 0 3px;
+}
+.input-prepend .add-on,
+.input-append .add-on,
+.input-prepend .btn,
+.input-append .btn {
+ margin-left: -1px;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
}
.input-prepend .active,
.input-append .active {
background-color: #baeb9e;
border-color: #62c729;
}
-.input-prepend .add-on {
- *margin-top: 1px;
- /* IE6-7 */
-
+.input-prepend .add-on,
+.input-prepend .btn {
+ margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+ -webkit-border-radius: 3px 0 0 3px;
+ -moz-border-radius: 3px 0 0 3px;
+ border-radius: 3px 0 0 3px;
}
.input-append input,
+.input-append select,
.input-append .uneditable-input {
- float: left;
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
.input-append .uneditable-input {
- border-left-color: #eee;
border-right-color: #ccc;
+ border-left-color: #eee;
}
-.input-append .add-on {
- margin-right: 0;
- margin-left: -1px;
+.input-append .add-on:last-child,
+.input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
-.input-append input:first-child {
- *margin-left: -160px;
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
}
-.input-append input:first-child + .add-on {
- *margin-left: -21px;
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+ margin-right: -1px;
+ -webkit-border-radius: 3px 0 0 3px;
+ -moz-border-radius: 3px 0 0 3px;
+ border-radius: 3px 0 0 3px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+ margin-left: -1px;
+ -webkit-border-radius: 0 3px 3px 0;
+ -moz-border-radius: 0 3px 3px 0;
+ border-radius: 0 3px 3px 0;
}
.search-query {
- padding-left: 14px;
padding-right: 14px;
+ padding-right: 4px \9;
+ padding-left: 14px;
+ padding-left: 4px \9;
+ /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
margin-bottom: 0;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
@@ -1064,8 +1149,18 @@ select:focus:required:invalid:focus {
.form-horizontal .help-inline,
.form-search .uneditable-input,
.form-inline .uneditable-input,
-.form-horizontal .uneditable-input {
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
display: inline-block;
+ *display: inline;
+ /* IE7 inline-block hack */
+
+ *zoom: 1;
margin-bottom: 0;
}
.form-search .hide,
@@ -1074,26 +1169,31 @@ select:focus:required:invalid:focus {
display: none;
}
.form-search label,
-.form-inline label,
+.form-inline label {
+ display: inline-block;
+}
.form-search .input-append,
.form-inline .input-append,
.form-search .input-prepend,
.form-inline .input-prepend {
- display: inline-block;
-}
-.form-search .input-append .add-on,
-.form-inline .input-prepend .add-on,
-.form-search .input-append .add-on,
-.form-inline .input-prepend .add-on {
- vertical-align: middle;
+ margin-bottom: 0;
}
.form-search .radio,
-.form-inline .radio,
.form-search .checkbox,
+.form-inline .radio,
.form-inline .checkbox {
+ padding-left: 0;
margin-bottom: 0;
vertical-align: middle;
}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+ float: left;
+ margin-right: 3px;
+ margin-left: 0;
+}
.control-group {
margin-bottom: 9px;
}
@@ -1120,13 +1220,24 @@ legend + .control-group {
text-align: right;
}
.form-horizontal .controls {
+ *display: inline-block;
+ *padding-left: 20px;
margin-left: 160px;
+ *margin-left: 0;
+}
+.form-horizontal .controls:first-child {
+ *padding-left: 160px;
+}
+.form-horizontal .help-block {
+ margin-top: 9px;
+ margin-bottom: 0;
}
.form-horizontal .form-actions {
padding-left: 160px;
}
table {
max-width: 100%;
+ background-color: transparent;
border-collapse: collapse;
border-spacing: 0;
}
@@ -1140,7 +1251,7 @@ table {
line-height: 18px;
text-align: left;
vertical-align: top;
- border-top: 1px solid #ddd;
+ border-top: 1px solid #dddddd;
}
.table th {
font-weight: bold;
@@ -1148,31 +1259,40 @@ table {
.table thead th {
vertical-align: bottom;
}
-.table thead:first-child tr th,
-.table thead:first-child tr td {
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
border-top: 0;
}
.table tbody + tbody {
- border-top: 2px solid #ddd;
+ border-top: 2px solid #dddddd;
}
.table-condensed th,
.table-condensed td {
padding: 4px 5px;
}
.table-bordered {
- border: 1px solid #ddd;
+ border: 1px solid #dddddd;
border-collapse: separate;
*border-collapse: collapsed;
+ border-left: 0;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
-.table-bordered th + th,
-.table-bordered td + td,
-.table-bordered th + td,
-.table-bordered td + th {
- border-left: 1px solid #ddd;
+.table-bordered th,
+.table-bordered td {
+ border-left: 1px solid #dddddd;
}
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
.table-bordered thead:first-child tr:first-child th,
.table-bordered tbody:first-child tr:first-child th,
.table-bordered tbody:first-child tr:first-child td {
@@ -1180,27 +1300,30 @@ table {
}
.table-bordered thead:first-child tr:first-child th:first-child,
.table-bordered tbody:first-child tr:first-child td:first-child {
- -webkit-border-radius: 4px 0 0 0;
- -moz-border-radius: 4px 0 0 0;
- border-radius: 4px 0 0 0;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-topleft: 4px;
}
.table-bordered thead:first-child tr:first-child th:last-child,
.table-bordered tbody:first-child tr:first-child td:last-child {
- -webkit-border-radius: 0 4px 0 0;
- -moz-border-radius: 0 4px 0 0;
- border-radius: 0 4px 0 0;
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+ -moz-border-radius-topright: 4px;
}
.table-bordered thead:last-child tr:last-child th:first-child,
.table-bordered tbody:last-child tr:last-child td:first-child {
-webkit-border-radius: 0 0 0 4px;
-moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -moz-border-radius-bottomleft: 4px;
}
.table-bordered thead:last-child tr:last-child th:last-child,
.table-bordered tbody:last-child tr:last-child td:last-child {
- -webkit-border-radius: 0 0 4px 0;
- -moz-border-radius: 0 0 4px 0;
- border-radius: 0 0 4px 0;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ -moz-border-radius-bottomright: 4px;
}
.table-striped tbody tr:nth-child(odd) td,
.table-striped tbody tr:nth-child(odd) th {
@@ -1270,17 +1393,77 @@ table .span12 {
width: 924px;
margin-left: 0;
}
+table .span13 {
+ float: none;
+ width: 1004px;
+ margin-left: 0;
+}
+table .span14 {
+ float: none;
+ width: 1084px;
+ margin-left: 0;
+}
+table .span15 {
+ float: none;
+ width: 1164px;
+ margin-left: 0;
+}
+table .span16 {
+ float: none;
+ width: 1244px;
+ margin-left: 0;
+}
+table .span17 {
+ float: none;
+ width: 1324px;
+ margin-left: 0;
+}
+table .span18 {
+ float: none;
+ width: 1404px;
+ margin-left: 0;
+}
+table .span19 {
+ float: none;
+ width: 1484px;
+ margin-left: 0;
+}
+table .span20 {
+ float: none;
+ width: 1564px;
+ margin-left: 0;
+}
+table .span21 {
+ float: none;
+ width: 1644px;
+ margin-left: 0;
+}
+table .span22 {
+ float: none;
+ width: 1724px;
+ margin-left: 0;
+}
+table .span23 {
+ float: none;
+ width: 1804px;
+ margin-left: 0;
+}
+table .span24 {
+ float: none;
+ width: 1884px;
+ margin-left: 0;
+}
[class^="icon-"],
[class*=" icon-"] {
display: inline-block;
width: 14px;
height: 14px;
+ *margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
- *margin-right: .3em;
}
[class^="icon-"]:last-child,
[class*=" icon-"]:last-child {
@@ -1649,6 +1832,67 @@ table .span12 {
.icon-resize-horizontal {
background-position: -456px -118px;
}
+.icon-hdd {
+ background-position: 0 -144px;
+}
+.icon-bullhorn {
+ background-position: -24px -144px;
+}
+.icon-bell {
+ background-position: -48px -144px;
+}
+.icon-certificate {
+ background-position: -72px -144px;
+}
+.icon-thumbs-up {
+ background-position: -96px -144px;
+}
+.icon-thumbs-down {
+ background-position: -120px -144px;
+}
+.icon-hand-right {
+ background-position: -144px -144px;
+}
+.icon-hand-left {
+ background-position: -168px -144px;
+}
+.icon-hand-up {
+ background-position: -192px -144px;
+}
+.icon-hand-down {
+ background-position: -216px -144px;
+}
+.icon-circle-arrow-right {
+ background-position: -240px -144px;
+}
+.icon-circle-arrow-left {
+ background-position: -264px -144px;
+}
+.icon-circle-arrow-up {
+ background-position: -288px -144px;
+}
+.icon-circle-arrow-down {
+ background-position: -312px -144px;
+}
+.icon-globe {
+ background-position: -336px -144px;
+}
+.icon-wrench {
+ background-position: -360px -144px;
+}
+.icon-tasks {
+ background-position: -384px -144px;
+}
+.icon-filter {
+ background-position: -408px -144px;
+}
+.icon-briefcase {
+ background-position: -432px -144px;
+}
+.icon-fullscreen {
+ background-position: -456px -144px;
+}
+.dropup,
.dropdown {
position: relative;
}
@@ -1663,22 +1907,20 @@ table .span12 {
display: inline-block;
width: 0;
height: 0;
- text-indent: -99999px;
- *text-indent: 0;
vertical-align: top;
- border-left: 4px solid transparent;
- border-right: 4px solid transparent;
border-top: 4px solid #000000;
+ border-right: 4px solid transparent;
+ border-left: 4px solid transparent;
+ content: "";
opacity: 0.3;
filter: alpha(opacity=30);
- content: "\2193";
}
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
}
.dropdown:hover .caret,
-.open.dropdown .caret {
+.open .caret {
opacity: 1;
filter: alpha(opacity=100);
}
@@ -1687,43 +1929,39 @@ table .span12 {
top: 100%;
left: 0;
z-index: 1000;
- float: left;
display: none;
+ float: left;
min-width: 160px;
- _width: 160px;
padding: 4px 0;
- margin: 0;
+ margin: 1px 0 0;
list-style: none;
background-color: #ffffff;
- border-color: #ccc;
- border-color: rgba(0, 0, 0, 0.2);
- border-style: solid;
- border-width: 1px;
- -webkit-border-radius: 0 0 5px 5px;
- -moz-border-radius: 0 0 5px 5px;
- border-radius: 0 0 5px 5px;
+ border: 1px solid #ccc;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ *border-right-width: 2px;
+ *border-bottom-width: 2px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
- *border-right-width: 2px;
- *border-bottom-width: 2px;
}
-.dropdown-menu.bottom-up {
- top: auto;
- bottom: 100%;
- margin-bottom: 2px;
+.dropdown-menu.pull-right {
+ right: 0;
+ left: auto;
}
.dropdown-menu .divider {
+ *width: 100%;
height: 1px;
- margin: 5px 1px;
+ margin: 8px 1px;
+ *margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid #ffffff;
- *width: 100%;
- *margin: -5px 0 5px;
}
.dropdown-menu a {
display: block;
@@ -1731,7 +1969,7 @@ table .span12 {
clear: both;
font-weight: normal;
line-height: 18px;
- color: #555555;
+ color: #333333;
white-space: nowrap;
}
.dropdown-menu li > a:hover,
@@ -1741,17 +1979,28 @@ table .span12 {
text-decoration: none;
background-color: #1a4445;
}
-.dropdown.open {
+.open {
*z-index: 1000;
}
-.dropdown.open .dropdown-toggle {
- color: #ffffff;
- background: #ccc;
- background: rgba(0, 0, 0, 0.3);
-}
-.dropdown.open .dropdown-menu {
+.open .dropdown-menu {
display: block;
}
+.pull-right .dropdown-menu {
+ right: 0;
+ left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+ border-top: 0;
+ border-bottom: 4px solid #000000;
+ content: "\2191";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+ top: auto;
+ bottom: 100%;
+ margin-bottom: 1px;
+}
.typeahead {
margin-top: 2px;
-webkit-border-radius: 4px;
@@ -1776,26 +2025,40 @@ table .span12 {
border-color: #ddd;
border-color: rgba(0, 0, 0, 0.15);
}
+.well-large {
+ padding: 24px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+}
+.well-small {
+ padding: 9px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+}
.fade {
+ opacity: 0;
+ filter: alpha(opacity=0);
-webkit-transition: opacity 0.15s linear;
-moz-transition: opacity 0.15s linear;
-ms-transition: opacity 0.15s linear;
-o-transition: opacity 0.15s linear;
transition: opacity 0.15s linear;
- opacity: 0;
}
.fade.in {
opacity: 1;
+ filter: alpha(opacity=100);
}
.collapse {
+ position: relative;
+ height: 0;
+ overflow: hidden;
-webkit-transition: height 0.35s ease;
-moz-transition: height 0.35s ease;
-ms-transition: height 0.35s ease;
-o-transition: height 0.35s ease;
transition: height 0.35s ease;
- position: relative;
- overflow: hidden;
- height: 0;
}
.collapse.in {
height: auto;
@@ -1813,20 +2076,33 @@ table .span12 {
.close:hover {
color: #000000;
text-decoration: none;
+ cursor: pointer;
opacity: 0.4;
filter: alpha(opacity=40);
+}
+button.close {
+ padding: 0;
cursor: pointer;
+ background: transparent;
+ border: 0;
+ -webkit-appearance: none;
}
.btn {
display: inline-block;
+ *display: inline;
+ /* IE7 inline-block hack */
+
+ *zoom: 1;
padding: 4px 10px 4px;
margin-bottom: 0;
font-size: 13px;
line-height: 18px;
+ *line-height: 20px;
color: #333333;
text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
vertical-align: middle;
+ cursor: pointer;
background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
@@ -1838,18 +2114,20 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ *background-color: #e6e6e6;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
+ border: 1px solid #cccccc;
+ *border: 0;
+ border-bottom-color: #b3b3b3;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- cursor: pointer;
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
*margin-left: .3em;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
}
.btn:hover,
.btn:active,
@@ -1857,6 +2135,7 @@ table .span12 {
.btn.disabled,
.btn[disabled] {
background-color: #e6e6e6;
+ *background-color: #d9d9d9;
}
.btn:active,
.btn.active {
@@ -1869,6 +2148,9 @@ table .span12 {
color: #333333;
text-decoration: none;
background-color: #e6e6e6;
+ *background-color: #d9d9d9;
+ /* Buttons in IE7 don't get borders, so darken on hover */
+
background-position: 0 -15px;
-webkit-transition: background-position 0.1s linear;
-moz-transition: background-position 0.1s linear;
@@ -1883,19 +2165,19 @@ table .span12 {
}
.btn.active,
.btn:active {
- background-image: none;
- -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
+ background-image: none;
outline: 0;
+ -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
}
.btn.disabled,
.btn[disabled] {
cursor: default;
- background-image: none;
background-color: #e6e6e6;
+ background-image: none;
opacity: 0.65;
filter: alpha(opacity=65);
-webkit-box-shadow: none;
@@ -1938,29 +2220,36 @@ table .span12 {
.btn-info:hover,
.btn-inverse,
.btn-inverse:hover {
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.btn-primary.active,
.btn-warning.active,
.btn-danger.active,
.btn-success.active,
.btn-info.active,
-.btn-dark.active {
+.btn-inverse.active {
color: rgba(255, 255, 255, 0.75);
}
+.btn {
+ border-color: #ccc;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
.btn-primary {
- background-color: #2499a8;
- background-image: -moz-linear-gradient(top, #24aaa7, #247faa);
- background-image: -ms-linear-gradient(top, #24aaa7, #247faa);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#24aaa7), to(#247faa));
- background-image: -webkit-linear-gradient(top, #24aaa7, #247faa);
- background-image: -o-linear-gradient(top, #24aaa7, #247faa);
- background-image: linear-gradient(top, #24aaa7, #247faa);
+ background-color: #1a4045;
+ background-image: -moz-linear-gradient(top, #1a4445, #1a3945);
+ background-image: -ms-linear-gradient(top, #1a4445, #1a3945);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1a4445), to(#1a3945));
+ background-image: -webkit-linear-gradient(top, #1a4445, #1a3945);
+ background-image: -o-linear-gradient(top, #1a4445, #1a3945);
+ background-image: linear-gradient(top, #1a4445, #1a3945);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#24aaa7', endColorstr='#247faa', GradientType=0);
- border-color: #247faa #247faa #16506a;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1a4445', endColorstr='#1a3945', GradientType=0);
+ border-color: #1a3945 #1a3945 #050b0d;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ *background-color: #1a3945;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.btn-primary:hover,
@@ -1968,11 +2257,12 @@ table .span12 {
.btn-primary.active,
.btn-primary.disabled,
.btn-primary[disabled] {
- background-color: #247faa;
+ background-color: #1a3945;
+ *background-color: #132a32;
}
.btn-primary:active,
.btn-primary.active {
- background-color: #1b607f \9;
+ background-color: #0c1b20 \9;
}
.btn-warning {
background-color: #171717;
@@ -1986,6 +2276,9 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#262626', endColorstr='#000000', GradientType=0);
border-color: #000000 #000000 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ *background-color: #000000;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.btn-warning:hover,
@@ -1994,6 +2287,7 @@ table .span12 {
.btn-warning.disabled,
.btn-warning[disabled] {
background-color: #000000;
+ *background-color: #000000;
}
.btn-warning:active,
.btn-warning.active {
@@ -2011,6 +2305,9 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
border-color: #bd362f #bd362f #802420;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ *background-color: #bd362f;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.btn-danger:hover,
@@ -2019,6 +2316,7 @@ table .span12 {
.btn-danger.disabled,
.btn-danger[disabled] {
background-color: #bd362f;
+ *background-color: #a9302a;
}
.btn-danger:active,
.btn-danger.active {
@@ -2036,6 +2334,9 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
border-color: #51a351 #51a351 #387038;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ *background-color: #51a351;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.btn-success:hover,
@@ -2044,6 +2345,7 @@ table .span12 {
.btn-success.disabled,
.btn-success[disabled] {
background-color: #51a351;
+ *background-color: #499249;
}
.btn-success:active,
.btn-success.active {
@@ -2061,6 +2363,9 @@ table .span12 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
border-color: #2f96b4 #2f96b4 #1f6377;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ *background-color: #2f96b4;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.btn-info:hover,
@@ -2069,23 +2374,27 @@ table .span12 {
.btn-info.disabled,
.btn-info[disabled] {
background-color: #2f96b4;
+ *background-color: #2a85a0;
}
.btn-info:active,
.btn-info.active {
background-color: #24748c \9;
}
.btn-inverse {
- background-color: #393939;
- background-image: -moz-linear-gradient(top, #454545, #262626);
- background-image: -ms-linear-gradient(top, #454545, #262626);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626));
- background-image: -webkit-linear-gradient(top, #454545, #262626);
- background-image: -o-linear-gradient(top, #454545, #262626);
- background-image: linear-gradient(top, #454545, #262626);
+ background-color: #414141;
+ background-image: -moz-linear-gradient(top, #555555, #222222);
+ background-image: -ms-linear-gradient(top, #555555, #222222);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));
+ background-image: -webkit-linear-gradient(top, #555555, #222222);
+ background-image: -o-linear-gradient(top, #555555, #222222);
+ background-image: linear-gradient(top, #555555, #222222);
background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
- border-color: #262626 #262626 #000000;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);
+ border-color: #222222 #222222 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ *background-color: #222222;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.btn-inverse:hover,
@@ -2093,11 +2402,12 @@ table .span12 {
.btn-inverse.active,
.btn-inverse.disabled,
.btn-inverse[disabled] {
- background-color: #262626;
+ background-color: #222222;
+ *background-color: #151515;
}
.btn-inverse:active,
.btn-inverse.active {
- background-color: #0c0c0c \9;
+ background-color: #080808 \9;
}
button.btn,
input[type="submit"].btn {
@@ -2109,16 +2419,21 @@ input[type="submit"].btn::-moz-focus-inner {
padding: 0;
border: 0;
}
-button.btn.large,
-input[type="submit"].btn.large {
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
*padding-top: 7px;
*padding-bottom: 7px;
}
-button.btn.small,
-input[type="submit"].btn.small {
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
*padding-top: 3px;
*padding-bottom: 3px;
}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+ *padding-top: 1px;
+ *padding-bottom: 1px;
+}
.btn-group {
position: relative;
*zoom: 1;
@@ -2149,7 +2464,7 @@ input[type="submit"].btn.small {
*zoom: 1;
}
-.btn-group .btn {
+.btn-group > .btn {
position: relative;
float: left;
margin-left: -1px;
@@ -2157,7 +2472,7 @@ input[type="submit"].btn.small {
-moz-border-radius: 0;
border-radius: 0;
}
-.btn-group .btn:first-child {
+.btn-group > .btn:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
@@ -2166,8 +2481,8 @@ input[type="submit"].btn.small {
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
}
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px;
@@ -2175,7 +2490,7 @@ input[type="submit"].btn.small {
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px;
}
-.btn-group .btn.large:first-child {
+.btn-group > .btn.large:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 6px;
-moz-border-radius-topleft: 6px;
@@ -2184,8 +2499,8 @@ input[type="submit"].btn.small {
-moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px;
}
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle {
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
-webkit-border-top-right-radius: 6px;
-moz-border-radius-topright: 6px;
border-top-right-radius: 6px;
@@ -2193,40 +2508,63 @@ input[type="submit"].btn.small {
-moz-border-radius-bottomright: 6px;
border-bottom-right-radius: 6px;
}
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active {
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
z-index: 2;
}
.btn-group .dropdown-toggle:active,
.btn-group.open .dropdown-toggle {
outline: 0;
}
-.btn-group .dropdown-toggle {
+.btn-group > .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
- -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- 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);
- *padding-top: 5px;
- *padding-bottom: 5px;
+ -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ *padding-top: 4px;
+ *padding-bottom: 4px;
}
-.btn-group.open {
- *z-index: 1000;
+.btn-group > .btn-mini.dropdown-toggle {
+ padding-left: 5px;
+ padding-right: 5px;
}
-.btn-group.open .dropdown-menu {
- display: block;
- margin-top: 1px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
+.btn-group > .btn-small.dropdown-toggle {
+ *padding-top: 4px;
+ *padding-bottom: 4px;
+}
+.btn-group > .btn-large.dropdown-toggle {
+ padding-left: 12px;
+ padding-right: 12px;
}
.btn-group.open .dropdown-toggle {
background-image: none;
- -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn-group.open .btn.dropdown-toggle {
+ background-color: #e6e6e6;
+}
+.btn-group.open .btn-primary.dropdown-toggle {
+ background-color: #1a3945;
+}
+.btn-group.open .btn-warning.dropdown-toggle {
+ background-color: #000000;
+}
+.btn-group.open .btn-danger.dropdown-toggle {
+ background-color: #bd362f;
+}
+.btn-group.open .btn-success.dropdown-toggle {
+ background-color: #51a351;
+}
+.btn-group.open .btn-info.dropdown-toggle {
+ background-color: #2f96b4;
+}
+.btn-group.open .btn-inverse.dropdown-toggle {
+ background-color: #222222;
}
.btn .caret {
margin-top: 7px;
@@ -2237,18 +2575,33 @@ input[type="submit"].btn.small {
opacity: 1;
filter: alpha(opacity=100);
}
+.btn-mini .caret {
+ margin-top: 5px;
+}
+.btn-small .caret {
+ margin-top: 6px;
+}
+.btn-large .caret {
+ margin-top: 6px;
+ border-left-width: 5px;
+ border-right-width: 5px;
+ border-top-width: 5px;
+}
+.dropup .btn-large .caret {
+ border-bottom: 5px solid #000000;
+ border-top: 0;
+}
.btn-primary .caret,
+.btn-warning .caret,
.btn-danger .caret,
.btn-info .caret,
.btn-success .caret,
.btn-inverse .caret {
border-top-color: #ffffff;
+ border-bottom-color: #ffffff;
opacity: 0.75;
filter: alpha(opacity=75);
}
-.btn-small .caret {
- margin-top: 4px;
-}
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 18px;
@@ -2258,10 +2611,10 @@ input[type="submit"].btn.small {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
+ color: #5f5c27;
}
-.alert,
.alert-heading {
- color: #5f5c27;
+ color: inherit;
}
.alert .close {
position: relative;
@@ -2272,28 +2625,17 @@ input[type="submit"].btn.small {
.alert-success {
background-color: #abe789;
border-color: #aee274;
-}
-.alert-success,
-.alert-success .alert-heading {
color: #387218;
}
.alert-danger,
.alert-error {
background-color: #fadfdd;
border-color: #f8d0d4;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
color: #df382c;
}
.alert-info {
background-color: #c9f4f3;
border-color: #acede1;
-}
-.alert-info,
-.alert-info .alert-heading {
color: #187371;
}
.alert-block {
@@ -2319,6 +2661,9 @@ input[type="submit"].btn.small {
text-decoration: none;
background-color: #eeeeee;
}
+.nav > .pull-right {
+ float: right;
+}
.nav .nav-header {
display: block;
padding: 3px 15px;
@@ -2333,8 +2678,8 @@ input[type="submit"].btn.small {
margin-top: 9px;
}
.nav-list {
- padding-left: 14px;
- padding-right: 14px;
+ padding-left: 15px;
+ padding-right: 15px;
margin-bottom: 0;
}
.nav-list > li > a,
@@ -2346,8 +2691,8 @@ input[type="submit"].btn.small {
.nav-list > li > a {
padding: 3px 15px;
}
-.nav-list .active > a,
-.nav-list .active > a:hover {
+.nav-list > .active > a,
+.nav-list > .active > a:hover {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
background-color: #1a4445;
@@ -2355,6 +2700,15 @@ input[type="submit"].btn.small {
.nav-list [class^="icon-"] {
margin-right: 2px;
}
+.nav-list .divider {
+ *width: 100%;
+ height: 1px;
+ margin: 8px 1px;
+ *margin: -5px 0 5px;
+ overflow: hidden;
+ background-color: #e5e5e5;
+ border-bottom: 1px solid #ffffff;
+}
.nav-tabs,
.nav-pills {
*zoom: 1;
@@ -2388,8 +2742,9 @@ input[type="submit"].btn.small {
margin-bottom: -1px;
}
.nav-tabs > li > a {
- padding-top: 9px;
- padding-bottom: 9px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ line-height: 18px;
border: 1px solid transparent;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
@@ -2415,8 +2770,8 @@ input[type="submit"].btn.small {
-moz-border-radius: 5px;
border-radius: 5px;
}
-.nav-pills .active > a,
-.nav-pills .active > a:hover {
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover {
color: #ffffff;
background-color: #1a4445;
}
@@ -2455,10 +2810,10 @@ input[type="submit"].btn.small {
.nav-pills.nav-stacked > li:last-child > a {
margin-bottom: 1px;
}
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu {
- margin-top: 1px;
- border-width: 1px;
+.nav-tabs .dropdown-menu {
+ -webkit-border-radius: 0 0 5px 5px;
+ -moz-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
}
.nav-pills .dropdown-menu {
-webkit-border-radius: 4px;
@@ -2468,15 +2823,18 @@ input[type="submit"].btn.small {