twitter-bootstrap-rails 2.1.7 → 2.2.8

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of twitter-bootstrap-rails might be problematic. Click here for more details.

Files changed (117) hide show
  1. data/README.md +428 -21
  2. data/Rakefile +15 -3
  3. data/app/assets/fonts/fontawesome-webfont.eot +0 -0
  4. data/app/assets/fonts/fontawesome-webfont.svg +399 -0
  5. data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
  6. data/app/assets/fonts/fontawesome-webfont.woff +0 -0
  7. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-affix.js +12 -1
  8. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +12 -1
  9. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-button.js +12 -1
  10. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +42 -11
  11. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +18 -7
  12. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +32 -11
  13. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +25 -12
  14. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +17 -6
  15. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +13 -2
  16. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +12 -1
  17. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +115 -30
  18. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +1 -1
  19. data/{vendor → app}/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +38 -13
  20. data/app/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +890 -0
  21. data/app/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +787 -0
  22. data/{vendor → app}/assets/stylesheets/twitter-bootstrap-static/sprites.css.erb +2 -2
  23. data/app/helpers/badge_label_helper.rb +16 -0
  24. data/app/helpers/bootstrap_flash_helper.rb +22 -16
  25. data/app/helpers/glyph_helper.rb +7 -2
  26. data/app/helpers/modal_helper.rb +29 -16
  27. data/app/helpers/navbar_helper.rb +194 -0
  28. data/app/helpers/twitter_breadcrumbs_helper.rb +7 -2
  29. data/app/views/twitter-bootstrap/_breadcrumbs.html.erb +2 -2
  30. data/lib/generators/bootstrap/install/install_generator.rb +19 -6
  31. data/lib/generators/bootstrap/install/templates/bootstrap.coffee +2 -3
  32. data/lib/generators/bootstrap/install/templates/bootstrap.js +2 -3
  33. data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +8 -10
  34. data/lib/generators/bootstrap/install/templates/en.bootstrap.yml +18 -0
  35. data/lib/generators/bootstrap/layout/templates/layout.html.erb +10 -12
  36. data/lib/generators/bootstrap/layout/templates/layout.html.haml +8 -11
  37. data/lib/generators/bootstrap/layout/templates/layout.html.slim +10 -11
  38. data/lib/generators/bootstrap/themed/templates/edit.html.erb +1 -2
  39. data/lib/generators/bootstrap/themed/templates/edit.html.haml +1 -1
  40. data/lib/generators/bootstrap/themed/templates/edit.html.slim +1 -1
  41. data/lib/generators/bootstrap/themed/templates/index.html.erb +1 -1
  42. data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -1
  43. data/lib/generators/bootstrap/themed/templates/index.html.slim +1 -1
  44. data/lib/generators/bootstrap/themed/templates/new.html.erb +1 -2
  45. data/lib/generators/bootstrap/themed/templates/new.html.haml +1 -1
  46. data/lib/generators/bootstrap/themed/templates/new.html.slim +1 -1
  47. data/lib/generators/bootstrap/themed/templates/show.html.erb +1 -1
  48. data/lib/generators/bootstrap/themed/templates/show.html.haml +1 -1
  49. data/lib/generators/bootstrap/themed/templates/show.html.slim +1 -1
  50. data/lib/generators/bootstrap/themed/themed_generator.rb +2 -2
  51. data/lib/twitter/bootstrap/rails/engine.rb +3 -0
  52. data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb +14 -2
  53. data/lib/twitter/bootstrap/rails/version.rb +2 -2
  54. data/lib/twitter-bootstrap-rails.rb +4 -4
  55. data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb +22 -0
  56. data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb +62 -0
  57. data/spec/lib/twitter_bootstrap_rails/navbar_helper_spec.rb +362 -0
  58. data/spec/lib/twitter_bootstrap_rails/uri_state_spec.rb +47 -0
  59. data/spec/spec_helper.rb +11 -0
  60. data/test/lib/breadcrumbs_test.rb +75 -0
  61. data/test/test_helper.rb +11 -0
  62. data/vendor/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +316 -294
  63. data/vendor/static-source/fontawesome.less +8 -6
  64. data/vendor/static-source/sprites.less +3 -2
  65. data/vendor/toolkit/fontawesome/bootstrap.less +84 -0
  66. data/vendor/toolkit/fontawesome/core.less +129 -0
  67. data/vendor/toolkit/fontawesome/extras.less +93 -0
  68. data/vendor/toolkit/fontawesome/font-awesome-ie7.less +1953 -0
  69. data/vendor/toolkit/fontawesome/font-awesome.less +33 -0
  70. data/vendor/toolkit/fontawesome/icons.less +381 -0
  71. data/vendor/toolkit/fontawesome/mixins.less +48 -0
  72. data/vendor/toolkit/fontawesome/path.less +14 -0
  73. data/vendor/toolkit/fontawesome/variables.less +735 -0
  74. data/vendor/toolkit/twitter/bootstrap/alerts.less +14 -0
  75. data/vendor/toolkit/twitter/bootstrap/bootstrap.less +4 -4
  76. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +6 -6
  77. data/vendor/toolkit/twitter/bootstrap/button-groups.less +31 -44
  78. data/vendor/toolkit/twitter/bootstrap/buttons.less +13 -17
  79. data/vendor/toolkit/twitter/bootstrap/carousel.less +48 -21
  80. data/vendor/toolkit/twitter/bootstrap/close.less +2 -1
  81. data/vendor/toolkit/twitter/bootstrap/code.less +3 -0
  82. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +32 -21
  83. data/vendor/toolkit/twitter/bootstrap/forms.less +17 -10
  84. data/vendor/toolkit/twitter/bootstrap/labels-badges.less +12 -2
  85. data/vendor/toolkit/twitter/bootstrap/media.less +2 -2
  86. data/vendor/toolkit/twitter/bootstrap/mixins.less +25 -9
  87. data/vendor/toolkit/twitter/bootstrap/modals.less +4 -3
  88. data/vendor/toolkit/twitter/bootstrap/navbar.less +35 -13
  89. data/vendor/toolkit/twitter/bootstrap/navs.less +45 -21
  90. data/vendor/toolkit/twitter/bootstrap/pager.less +3 -1
  91. data/vendor/toolkit/twitter/bootstrap/pagination.less +3 -1
  92. data/vendor/toolkit/twitter/bootstrap/popovers.less +55 -39
  93. data/vendor/toolkit/twitter/bootstrap/reset.less +82 -4
  94. data/vendor/toolkit/twitter/bootstrap/responsive-767px-max.less +2 -2
  95. data/vendor/toolkit/twitter/bootstrap/responsive-navbar.less +6 -2
  96. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +16 -0
  97. data/vendor/toolkit/twitter/bootstrap/responsive.less +1 -1
  98. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +2 -1
  99. data/vendor/toolkit/twitter/bootstrap/sprites.less +9 -5
  100. data/vendor/toolkit/twitter/bootstrap/tables.less +54 -46
  101. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +3 -2
  102. data/vendor/toolkit/twitter/bootstrap/tooltip.less +6 -6
  103. data/vendor/toolkit/twitter/bootstrap/type.less +44 -24
  104. data/vendor/toolkit/twitter/bootstrap/variables.less +3 -3
  105. metadata +130 -44
  106. data/lib/generators/bootstrap/partial/templates/_navbar.html.erb +0 -13
  107. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  108. data/vendor/assets/fonts/fontawesome-webfont.svg +0 -255
  109. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  110. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  111. data/vendor/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +0 -218
  112. data/vendor/toolkit/font-awesome-ie7.less +0 -245
  113. data/vendor/toolkit/fontawesome.less +0 -327
  114. /data/{vendor → app}/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
  115. /data/{vendor → app}/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
  116. /data/{vendor → app}/assets/javascripts/twitter/bootstrap.js +0 -0
  117. /data/{vendor → app}/assets/javascripts/twitter/bootstrap_ujs.js +0 -0
@@ -1,5 +1,5 @@
1
1
  //
2
- // Modals
2
+ // Reset CSS
3
3
  // Adapted from http://github.com/necolas/normalize.css
4
4
  // --------------------------------------------------
5
5
 
@@ -122,10 +122,18 @@ input[type="submit"] {
122
122
  -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
123
123
  cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
124
124
  }
125
+ label,
126
+ select,
127
+ button,
128
+ input[type="button"],
129
+ input[type="reset"],
130
+ input[type="submit"],
131
+ input[type="radio"],
132
+ input[type="checkbox"] {
133
+ cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
134
+ }
125
135
  input[type="search"] { // Appearance in Safari/Chrome
126
- -webkit-box-sizing: content-box;
127
- -moz-box-sizing: content-box;
128
- box-sizing: content-box;
136
+ .box-sizing(content-box);
129
137
  -webkit-appearance: textfield;
130
138
  }
131
139
  input[type="search"]::-webkit-search-decoration,
@@ -136,3 +144,73 @@ textarea {
136
144
  overflow: auto; // Remove vertical scrollbar in IE6-9
137
145
  vertical-align: top; // Readability and alignment cross-browser
138
146
  }
147
+
148
+
149
+ // Printing
150
+ // -------------------------
151
+ // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
152
+
153
+ @media print {
154
+
155
+ * {
156
+ text-shadow: none !important;
157
+ color: #000 !important; // Black prints faster: h5bp.com/s
158
+ background: transparent !important;
159
+ box-shadow: none !important;
160
+ }
161
+
162
+ a,
163
+ a:visited {
164
+ text-decoration: underline;
165
+ }
166
+
167
+ a[href]:after {
168
+ content: " (" attr(href) ")";
169
+ }
170
+
171
+ abbr[title]:after {
172
+ content: " (" attr(title) ")";
173
+ }
174
+
175
+ // Don't show links for images, or javascript/internal links
176
+ .ir a:after,
177
+ a[href^="javascript:"]:after,
178
+ a[href^="#"]:after {
179
+ content: "";
180
+ }
181
+
182
+ pre,
183
+ blockquote {
184
+ border: 1px solid #999;
185
+ page-break-inside: avoid;
186
+ }
187
+
188
+ thead {
189
+ display: table-header-group; // h5bp.com/t
190
+ }
191
+
192
+ tr,
193
+ img {
194
+ page-break-inside: avoid;
195
+ }
196
+
197
+ img {
198
+ max-width: 100% !important;
199
+ }
200
+
201
+ @page {
202
+ margin: 0.5cm;
203
+ }
204
+
205
+ p,
206
+ h2,
207
+ h3 {
208
+ orphans: 3;
209
+ widows: 3;
210
+ }
211
+
212
+ h2,
213
+ h3 {
214
+ page-break-after: avoid;
215
+ }
216
+ }
@@ -72,8 +72,8 @@
72
72
  .box-sizing(border-box);
73
73
  }
74
74
  .row-fluid [class*="offset"]:first-child {
75
- margin-left: 0;
76
- }
75
+ margin-left: 0;
76
+ }
77
77
 
78
78
  // FORM FIELDS
79
79
  // -----------
@@ -81,7 +81,9 @@
81
81
  margin-bottom: 2px;
82
82
  }
83
83
  .nav-collapse .nav > li > a:hover,
84
- .nav-collapse .dropdown-menu a:hover {
84
+ .nav-collapse .nav > li > a:focus,
85
+ .nav-collapse .dropdown-menu a:hover,
86
+ .nav-collapse .dropdown-menu a:focus {
85
87
  background-color: @navbarBackground;
86
88
  }
87
89
  .navbar-inverse .nav-collapse .nav > li > a,
@@ -89,7 +91,9 @@
89
91
  color: @navbarInverseLinkColor;
90
92
  }
91
93
  .navbar-inverse .nav-collapse .nav > li > a:hover,
92
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
94
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
95
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
96
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
93
97
  background-color: @navbarInverseBackground;
94
98
  }
95
99
  // Buttons in the navbar
@@ -3,6 +3,13 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
+ // IE10 Metro responsive
7
+ // Required for Windows 8 Metro split-screen snapping with IE10
8
+ // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
9
+ @-ms-viewport{
10
+ width: device-width;
11
+ }
12
+
6
13
  // Hide from screenreaders and browsers
7
14
  // Credit: HTML5 Boilerplate
8
15
  .hidden {
@@ -41,3 +48,12 @@
41
48
  // Hide
42
49
  .hidden-phone { display: none !important; }
43
50
  }
51
+
52
+ // Print utilities
53
+ .visible-print { display: none !important; }
54
+ .hidden-print { }
55
+
56
+ @media print {
57
+ .visible-print { display: inherit !important; }
58
+ .hidden-print { display: none !important; }
59
+ }
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.2.1
2
+ * Bootstrap Responsive v2.3.2
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -23,7 +23,8 @@ a {
23
23
  color: @linkColor;
24
24
  text-decoration: none;
25
25
  }
26
- a:hover {
26
+ a:hover,
27
+ a:focus {
27
28
  color: @linkColorHover;
28
29
  text-decoration: underline;
29
30
  }
@@ -22,13 +22,13 @@
22
22
  .ie7-restore-right-whitespace();
23
23
  line-height: 14px;
24
24
  vertical-align: text-top;
25
- background-image: url(@iconSpritePath);
25
+ background-image: @iconSpritePath;
26
26
  background-position: 14px 14px;
27
27
  background-repeat: no-repeat;
28
28
  margin-top: 1px;
29
29
  }
30
30
 
31
- /* White icons with optional class, or on hover/active states of certain elements */
31
+ /* White icons with optional class, or on hover/focus/active states of certain elements */
32
32
  .icon-white,
33
33
  .nav-pills > .active > a > [class^="icon-"],
34
34
  .nav-pills > .active > a > [class*=" icon-"],
@@ -37,12 +37,16 @@
37
37
  .navbar-inverse .nav > .active > a > [class^="icon-"],
38
38
  .navbar-inverse .nav > .active > a > [class*=" icon-"],
39
39
  .dropdown-menu > li > a:hover > [class^="icon-"],
40
+ .dropdown-menu > li > a:focus > [class^="icon-"],
40
41
  .dropdown-menu > li > a:hover > [class*=" icon-"],
42
+ .dropdown-menu > li > a:focus > [class*=" icon-"],
41
43
  .dropdown-menu > .active > a > [class^="icon-"],
42
44
  .dropdown-menu > .active > a > [class*=" icon-"],
43
45
  .dropdown-submenu:hover > a > [class^="icon-"],
44
- .dropdown-submenu:hover > a > [class*=" icon-"] {
45
- background-image: url(@iconWhiteSpritePath);
46
+ .dropdown-submenu:focus > a > [class^="icon-"],
47
+ .dropdown-submenu:hover > a > [class*=" icon-"],
48
+ .dropdown-submenu:focus > a > [class*=" icon-"] {
49
+ background-image: @iconWhiteSpritePath;
46
50
  }
47
51
 
48
52
  .icon-glass { background-position: 0 0; }
@@ -166,7 +170,7 @@
166
170
  .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off
167
171
  .icon-retweet { background-position: -336px -120px; }
168
172
  .icon-shopping-cart { background-position: -360px -120px; }
169
- .icon-folder-close { background-position: -384px -120px; }
173
+ .icon-folder-close { background-position: -384px -120px; width: 16px; }
170
174
  .icon-folder-open { background-position: -408px -120px; width: 16px; }
171
175
  .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
172
176
  .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
@@ -48,6 +48,11 @@ table {
48
48
  tbody + tbody {
49
49
  border-top: 2px solid @tableBorder;
50
50
  }
51
+
52
+ // Nesting
53
+ .table {
54
+ background-color: @bodyBackground;
55
+ }
51
56
  }
52
57
 
53
58
 
@@ -88,34 +93,41 @@ table {
88
93
  tbody:first-child tr:first-child td {
89
94
  border-top: 0;
90
95
  }
91
- // For first th or td in the first row in the first thead or tbody
92
- thead:first-child tr:first-child th:first-child,
93
- tbody:first-child tr:first-child td:first-child {
94
- -webkit-border-top-left-radius: 4px;
95
- border-top-left-radius: 4px;
96
- -moz-border-radius-topleft: 4px;
97
- }
98
- thead:first-child tr:first-child th:last-child,
99
- tbody:first-child tr:first-child td:last-child {
100
- -webkit-border-top-right-radius: 4px;
101
- border-top-right-radius: 4px;
102
- -moz-border-radius-topright: 4px;
103
- }
104
- // For first th or td in the first row in the first thead or tbody
105
- thead:last-child tr:last-child th:first-child,
106
- tbody:last-child tr:last-child td:first-child,
107
- tfoot:last-child tr:last-child td:first-child {
108
- .border-radius(0 0 0 4px);
109
- -webkit-border-bottom-left-radius: 4px;
110
- border-bottom-left-radius: 4px;
111
- -moz-border-radius-bottomleft: 4px;
112
- }
113
- thead:last-child tr:last-child th:last-child,
114
- tbody:last-child tr:last-child td:last-child,
115
- tfoot:last-child tr:last-child td:last-child {
116
- -webkit-border-bottom-right-radius: 4px;
117
- border-bottom-right-radius: 4px;
118
- -moz-border-radius-bottomright: 4px;
96
+ // For first th/td in the first row in the first thead or tbody
97
+ thead:first-child tr:first-child > th:first-child,
98
+ tbody:first-child tr:first-child > td:first-child,
99
+ tbody:first-child tr:first-child > th:first-child {
100
+ .border-top-left-radius(@baseBorderRadius);
101
+ }
102
+ // For last th/td in the first row in the first thead or tbody
103
+ thead:first-child tr:first-child > th:last-child,
104
+ tbody:first-child tr:first-child > td:last-child,
105
+ tbody:first-child tr:first-child > th:last-child {
106
+ .border-top-right-radius(@baseBorderRadius);
107
+ }
108
+ // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
109
+ thead:last-child tr:last-child > th:first-child,
110
+ tbody:last-child tr:last-child > td:first-child,
111
+ tbody:last-child tr:last-child > th:first-child,
112
+ tfoot:last-child tr:last-child > td:first-child,
113
+ tfoot:last-child tr:last-child > th:first-child {
114
+ .border-bottom-left-radius(@baseBorderRadius);
115
+ }
116
+ // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
117
+ thead:last-child tr:last-child > th:last-child,
118
+ tbody:last-child tr:last-child > td:last-child,
119
+ tbody:last-child tr:last-child > th:last-child,
120
+ tfoot:last-child tr:last-child > td:last-child,
121
+ tfoot:last-child tr:last-child > th:last-child {
122
+ .border-bottom-right-radius(@baseBorderRadius);
123
+ }
124
+
125
+ // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
126
+ tfoot + tbody:last-child tr:last-child td:first-child {
127
+ .border-bottom-left-radius(0);
128
+ }
129
+ tfoot + tbody:last-child tr:last-child td:last-child {
130
+ .border-bottom-right-radius(0);
119
131
  }
120
132
 
121
133
  // Special fixes to round the left border on the first td/th
@@ -123,17 +135,13 @@ table {
123
135
  caption + tbody tr:first-child td:first-child,
124
136
  colgroup + thead tr:first-child th:first-child,
125
137
  colgroup + tbody tr:first-child td:first-child {
126
- -webkit-border-top-left-radius: 4px;
127
- border-top-left-radius: 4px;
128
- -moz-border-radius-topleft: 4px;
138
+ .border-top-left-radius(@baseBorderRadius);
129
139
  }
130
140
  caption + thead tr:first-child th:last-child,
131
141
  caption + tbody tr:first-child td:last-child,
132
142
  colgroup + thead tr:first-child th:last-child,
133
143
  colgroup + tbody tr:first-child td:last-child {
134
- -webkit-border-top-right-radius: 4px;
135
- border-top-right-radius: 4px;
136
- -moz-border-radius-topright: 4px;
144
+ .border-top-right-radius(@baseBorderRadius);
137
145
  }
138
146
 
139
147
  }
@@ -147,8 +155,8 @@ table {
147
155
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
148
156
  .table-striped {
149
157
  tbody {
150
- tr:nth-child(odd) td,
151
- tr:nth-child(odd) th {
158
+ > tr:nth-child(odd) > td,
159
+ > tr:nth-child(odd) > th {
152
160
  background-color: @tableBackgroundAccent;
153
161
  }
154
162
  }
@@ -160,8 +168,8 @@ table {
160
168
  // Placed here since it has to come after the potential zebra striping
161
169
  .table-hover {
162
170
  tbody {
163
- tr:hover td,
164
- tr:hover th {
171
+ tr:hover > td,
172
+ tr:hover > th {
165
173
  background-color: @tableBackgroundHover;
166
174
  }
167
175
  }
@@ -205,32 +213,32 @@ table th[class*="span"],
205
213
  // Exact selectors below required to override .table-striped
206
214
 
207
215
  .table tbody tr {
208
- &.success td {
216
+ &.success > td {
209
217
  background-color: @successBackground;
210
218
  }
211
- &.error td {
219
+ &.error > td {
212
220
  background-color: @errorBackground;
213
221
  }
214
- &.warning td {
222
+ &.warning > td {
215
223
  background-color: @warningBackground;
216
224
  }
217
- &.info td {
225
+ &.info > td {
218
226
  background-color: @infoBackground;
219
227
  }
220
228
  }
221
229
 
222
230
  // Hover states for .table-hover
223
231
  .table-hover tbody tr {
224
- &.success:hover td {
232
+ &.success:hover > td {
225
233
  background-color: darken(@successBackground, 5%);
226
234
  }
227
- &.error:hover td {
235
+ &.error:hover > td {
228
236
  background-color: darken(@errorBackground, 5%);
229
237
  }
230
- &.warning:hover td {
238
+ &.warning:hover > td {
231
239
  background-color: darken(@warningBackground, 5%);
232
240
  }
233
- &.info:hover td {
241
+ &.info:hover > td {
234
242
  background-color: darken(@infoBackground, 5%);
235
243
  }
236
244
  }
@@ -33,8 +33,9 @@
33
33
  .box-shadow(0 1px 3px rgba(0,0,0,.055));
34
34
  .transition(all .2s ease-in-out);
35
35
  }
36
- // Add a hover state for linked versions only
37
- a.thumbnail:hover {
36
+ // Add a hover/focus state for linked versions only
37
+ a.thumbnail:hover,
38
+ a.thumbnail:focus {
38
39
  border-color: @linkColor;
39
40
  .box-shadow(0 1px 4px rgba(0,105,214,.25));
40
41
  }
@@ -9,20 +9,20 @@
9
9
  z-index: @zindexTooltip;
10
10
  display: block;
11
11
  visibility: visible;
12
- padding: 5px;
13
12
  font-size: 11px;
13
+ line-height: 1.4;
14
14
  .opacity(0);
15
15
  &.in { .opacity(80); }
16
- &.top { margin-top: -3px; }
17
- &.right { margin-left: 3px; }
18
- &.bottom { margin-top: 3px; }
19
- &.left { margin-left: -3px; }
16
+ &.top { margin-top: -3px; padding: 5px 0; }
17
+ &.right { margin-left: 3px; padding: 0 5px; }
18
+ &.bottom { margin-top: 3px; padding: 5px 0; }
19
+ &.left { margin-left: -3px; padding: 0 5px; }
20
20
  }
21
21
 
22
22
  // Wrapper for the tooltip content
23
23
  .tooltip-inner {
24
24
  max-width: 200px;
25
- padding: 3px 8px;
25
+ padding: 8px;
26
26
  color: @tooltipColor;
27
27
  text-align: center;
28
28
  text-decoration: none;
@@ -20,34 +20,37 @@ p {
20
20
  // Emphasis & misc
21
21
  // -------------------------
22
22
 
23
- small {
24
- font-size: 85%; // Ex: 14px base font * 85% = about 12px
25
- }
26
- strong {
27
- font-weight: bold;
28
- }
29
- em {
30
- font-style: italic;
31
- }
32
- cite {
33
- font-style: normal;
34
- }
23
+ // Ex: 14px base font * 85% = about 12px
24
+ small { font-size: 85%; }
25
+
26
+ strong { font-weight: bold; }
27
+ em { font-style: italic; }
28
+ cite { font-style: normal; }
35
29
 
36
30
  // Utility classes
37
- .muted {
38
- color: @grayLight;
39
- }
40
- .text-warning { color: @warningText; }
41
- a.text-warning:hover { color: darken(@warningText, 10%); }
31
+ .muted { color: @grayLight; }
32
+ a.muted:hover,
33
+ a.muted:focus { color: darken(@grayLight, 10%); }
42
34
 
43
- .text-error { color: @errorText; }
44
- a.text-error:hover { color: darken(@errorText, 10%); }
35
+ .text-warning { color: @warningText; }
36
+ a.text-warning:hover,
37
+ a.text-warning:focus { color: darken(@warningText, 10%); }
45
38
 
46
- .text-info { color: @infoText; }
47
- a.text-info:hover { color: darken(@infoText, 10%); }
39
+ .text-error { color: @errorText; }
40
+ a.text-error:hover,
41
+ a.text-error:focus { color: darken(@errorText, 10%); }
48
42
 
49
- .text-success { color: @successText; }
50
- a.text-success:hover { color: darken(@successText, 10%); }
43
+ .text-info { color: @infoText; }
44
+ a.text-info:hover,
45
+ a.text-info:focus { color: darken(@infoText, 10%); }
46
+
47
+ .text-success { color: @successText; }
48
+ a.text-success:hover,
49
+ a.text-success:focus { color: darken(@successText, 10%); }
50
+
51
+ .text-left { text-align: left; }
52
+ .text-right { text-align: right; }
53
+ .text-center { text-align: center; }
51
54
 
52
55
 
53
56
  // Headings
@@ -112,12 +115,27 @@ ol ul {
112
115
  li {
113
116
  line-height: @baseLineHeight;
114
117
  }
118
+
119
+ // Remove default list styles
115
120
  ul.unstyled,
116
121
  ol.unstyled {
117
122
  margin-left: 0;
118
123
  list-style: none;
119
124
  }
120
125
 
126
+ // Single-line list items
127
+ ul.inline,
128
+ ol.inline {
129
+ margin-left: 0;
130
+ list-style: none;
131
+ > li {
132
+ display: inline-block;
133
+ .ie7-inline-block();
134
+ padding-left: 5px;
135
+ padding-right: 5px;
136
+ }
137
+ }
138
+
121
139
  // Description Lists
122
140
  dl {
123
141
  margin-bottom: @baseLineHeight;
@@ -177,7 +195,9 @@ blockquote {
177
195
  border-left: 5px solid @grayLighter;
178
196
  p {
179
197
  margin-bottom: 0;
180
- #font > .shorthand(16px,300,@baseLineHeight * 1.25);
198
+ font-size: @baseFontSize * 1.25;
199
+ font-weight: 300;
200
+ line-height: 1.25;
181
201
  }
182
202
  small {
183
203
  display: block;
@@ -68,7 +68,7 @@
68
68
 
69
69
  @paddingLarge: 11px 19px; // 44px
70
70
  @paddingSmall: 2px 10px; // 26px
71
- @paddingMini: 1px 6px; // 24px
71
+ @paddingMini: 0 6px; // 22px
72
72
 
73
73
  @baseBorderRadius: 4px;
74
74
  @borderRadiusLarge: 6px;
@@ -86,7 +86,7 @@
86
86
  // -------------------------
87
87
  @btnBackground: @white;
88
88
  @btnBackgroundHighlight: darken(@white, 10%);
89
- @btnBorder: #bbb;
89
+ @btnBorder: #ccc;
90
90
 
91
91
  @btnPrimaryBackground: @linkColor;
92
92
  @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
@@ -126,7 +126,7 @@
126
126
 
127
127
  @dropdownLinkColor: @grayDark;
128
128
  @dropdownLinkColorHover: @white;
129
- @dropdownLinkColorActive: @dropdownLinkColor;
129
+ @dropdownLinkColorActive: @white;
130
130
 
131
131
  @dropdownLinkBackgroundActive: @linkColor;
132
132
  @dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;