anjlab-bootstrap-rails 3.0.0.3 → 3.0.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/Rakefile +0 -1
  4. data/app/assets/fonts/twitter/glyphicons-halflings-regular.eot +0 -0
  5. data/app/assets/fonts/twitter/glyphicons-halflings-regular.svg +200 -199
  6. data/app/assets/fonts/twitter/glyphicons-halflings-regular.ttf +0 -0
  7. data/app/assets/fonts/twitter/glyphicons-halflings-regular.woff +0 -0
  8. data/app/assets/javascripts/twitter/bootstrap.js +1 -2
  9. data/app/assets/javascripts/twitter/bootstrap/affix.js +3 -3
  10. data/app/assets/javascripts/twitter/bootstrap/alert.js +2 -2
  11. data/app/assets/javascripts/twitter/bootstrap/button.js +2 -2
  12. data/app/assets/javascripts/twitter/bootstrap/carousel.js +3 -3
  13. data/app/assets/javascripts/twitter/bootstrap/collapse.js +3 -3
  14. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +3 -3
  15. data/app/assets/javascripts/twitter/bootstrap/modal.js +3 -3
  16. data/app/assets/javascripts/twitter/bootstrap/popover.js +3 -3
  17. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +3 -3
  18. data/app/assets/javascripts/twitter/bootstrap/tab.js +4 -4
  19. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +3 -3
  20. data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
  21. data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +1 -1
  22. data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +1 -1
  23. data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +6 -1
  24. data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +1 -4
  25. data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +12 -1
  26. data/app/assets/stylesheets/twitter/bootstrap/_code.scss +3 -3
  27. data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +1 -2
  28. data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +10 -9
  29. data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +13 -12
  30. data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +22 -275
  31. data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +1 -1
  32. data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +15 -0
  33. data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +91 -18
  34. data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +1 -7
  35. data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +9 -6
  36. data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +32 -18
  37. data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +4 -0
  38. data/app/assets/stylesheets/twitter/bootstrap/_print.scss +6 -1
  39. data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +2 -6
  40. data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +0 -10
  41. data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +1 -1
  42. data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +15 -25
  43. data/app/assets/stylesheets/twitter/bootstrap/_theme.scss +3 -1
  44. data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +5 -6
  45. data/app/assets/stylesheets/twitter/bootstrap/_type.scss +20 -12
  46. data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +11 -0
  47. data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +3 -3
  48. data/lib/bootstrap-rails/version.rb +1 -1
  49. metadata +2 -2
@@ -6,7 +6,7 @@
6
6
  // Bar animations
7
7
  // -------------------------
8
8
 
9
- // Webkit
9
+ // WebKit
10
10
  @-webkit-keyframes progress-bar-stripes {
11
11
  from { background-position: 40px 0; }
12
12
  to { background-position: 0 0; }
@@ -67,11 +67,7 @@
67
67
 
68
68
  // Call animation for the active one
69
69
  .progress.active .progress-bar {
70
- -webkit-animation: progress-bar-stripes 2s linear infinite;
71
- -moz-animation: progress-bar-stripes 2s linear infinite;
72
- -ms-animation: progress-bar-stripes 2s linear infinite;
73
- -o-animation: progress-bar-stripes 2s linear infinite;
74
- animation: progress-bar-stripes 2s linear infinite;
70
+ @include animation(progress-bar-stripes 2s linear infinite);
75
71
  }
76
72
 
77
73
 
@@ -22,16 +22,6 @@
22
22
  }
23
23
 
24
24
 
25
- // Hide from screenreaders and browsers
26
- //
27
- // Credit: HTML5 Boilerplate
28
-
29
- .hidden {
30
- display: none !important;
31
- visibility: hidden !important;
32
- }
33
-
34
-
35
25
  // Visibility utilities
36
26
 
37
27
 
@@ -114,6 +114,6 @@ hr {
114
114
  margin: -1px;
115
115
  padding: 0;
116
116
  overflow: hidden;
117
- clip: rect(0 0 0 0);
117
+ clip: rect(0,0,0,0);
118
118
  border: 0;
119
119
  }
@@ -91,12 +91,10 @@ th {
91
91
  }
92
92
  }
93
93
  }
94
- > thead {
95
- > tr {
96
- > th,
97
- > td {
98
- border-bottom-width: 2px;
99
- }
94
+ > thead > tr {
95
+ > th,
96
+ > td {
97
+ border-bottom-width: 2px;
100
98
  }
101
99
  }
102
100
  }
@@ -106,14 +104,10 @@ th {
106
104
  //
107
105
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
108
106
 
109
- .table-striped {
110
- > tbody {
111
- > tr:nth-child(odd) {
112
- > td,
113
- > th {
114
- background-color: $table-bg-accent;
115
- }
116
- }
107
+ .table-striped > tbody > tr:nth-child(odd) {
108
+ > td,
109
+ > th {
110
+ background-color: $table-bg-accent;
117
111
  }
118
112
  }
119
113
 
@@ -122,14 +116,10 @@ th {
122
116
  //
123
117
  // Placed here since it has to come after the potential zebra striping
124
118
 
125
- .table-hover {
126
- > tbody {
127
- > tr:hover {
128
- > td,
129
- > th {
130
- background-color: $table-bg-hover;
131
- }
132
- }
119
+ .table-hover > tbody > tr:hover {
120
+ > td,
121
+ > th {
122
+ background-color: $table-bg-hover;
133
123
  }
134
124
  }
135
125
 
@@ -181,17 +171,17 @@ table {
181
171
  // by enabling horizontal scrolling. Only applies <768px. Everything above that
182
172
  // will display normally.
183
173
 
184
- @media (max-width: $screen-sm-min) {
174
+ @media (max-width: $screen-xs-max) {
185
175
  .table-responsive {
186
176
  width: 100%;
187
- margin-bottom: 15px;
177
+ margin-bottom: ($line-height-computed * 0.75);
188
178
  overflow-y: hidden;
189
179
  overflow-x: scroll;
190
180
  -ms-overflow-style: -ms-autohiding-scrollbar;
191
181
  border: 1px solid $table-border-color;
192
182
  -webkit-overflow-scrolling: touch;
193
183
 
194
- // Tighten up spacing and give a background color
184
+ // Tighten up spacing
195
185
  > .table {
196
186
  margin-bottom: 0;
197
187
 
@@ -33,7 +33,7 @@
33
33
  // Mixin for generating new styles
34
34
  @mixin btn-styles($btn-color: #555) {
35
35
  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
36
-
36
+ @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
37
37
  background-repeat: repeat-x;
38
38
  border-color: darken($btn-color, 14%);
39
39
 
@@ -105,6 +105,7 @@
105
105
  // Default navbar
106
106
  .navbar-default {
107
107
  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
108
+ @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
108
109
  border-radius: $navbar-border-radius;
109
110
  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
110
111
  @include box-shadow($shadow);
@@ -122,6 +123,7 @@
122
123
  // Inverted navbar
123
124
  .navbar-inverse {
124
125
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
126
+ @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
125
127
 
126
128
  .navbar-nav > .active > a {
127
129
  @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
@@ -11,21 +11,20 @@
11
11
 
12
12
  > img {
13
13
  @include img-responsive();
14
+ margin-left: auto;
15
+ margin-right: auto;
14
16
  }
15
17
  }
16
18
 
17
19
 
18
20
  // Add a hover state for linked versions only
19
21
  a.thumbnail:hover,
20
- a.thumbnail:focus {
22
+ a.thumbnail:focus,
23
+ a.thumbnail.active {
21
24
  border-color: $link-color;
22
25
  }
23
26
 
24
- // Images and captions
25
- .thumbnail > img {
26
- margin-left: auto;
27
- margin-right: auto;
28
- }
27
+ // Image captions
29
28
  .thumbnail .caption {
30
29
  padding: $thumbnail-caption-padding;
31
30
  color: $thumbnail-caption-color;
@@ -11,7 +11,7 @@ p {
11
11
  }
12
12
  .lead {
13
13
  margin-bottom: $line-height-computed;
14
- font-size: ($font-size-base * 1.15);
14
+ font-size: floor($font-size-base * 1.15);
15
15
  font-weight: 200;
16
16
  line-height: 1.4;
17
17
 
@@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6,
82
82
  line-height: $headings-line-height;
83
83
  color: $headings-color;
84
84
 
85
- small {
85
+ small,
86
+ .small {
86
87
  font-weight: normal;
87
88
  line-height: 1;
88
89
  color: $headings-small-color;
@@ -95,7 +96,8 @@ h3 {
95
96
  margin-top: $line-height-computed;
96
97
  margin-bottom: ($line-height-computed / 2);
97
98
 
98
- small {
99
+ small,
100
+ .small {
99
101
  font-size: 65%;
100
102
  }
101
103
  }
@@ -105,7 +107,8 @@ h6 {
105
107
  margin-top: ($line-height-computed / 2);
106
108
  margin-bottom: ($line-height-computed / 2);
107
109
 
108
- small {
110
+ small,
111
+ .small {
109
112
  font-size: 75%;
110
113
  }
111
114
  }
@@ -138,7 +141,7 @@ ol {
138
141
  margin-top: 0;
139
142
  margin-bottom: ($line-height-computed / 2);
140
143
  ul,
141
- ol{
144
+ ol {
142
145
  margin-bottom: 0;
143
146
  }
144
147
  }
@@ -156,10 +159,15 @@ ol {
156
159
  // Inline turns list items into inline-block
157
160
  .list-inline {
158
161
  @include list-unstyled();
162
+
159
163
  > li {
160
164
  display: inline-block;
161
165
  padding-left: 5px;
162
166
  padding-right: 5px;
167
+
168
+ &:first-child {
169
+ padding-left: 0;
170
+ }
163
171
  }
164
172
  }
165
173
 
@@ -204,7 +212,7 @@ dd {
204
212
 
205
213
  // Abbreviations and acronyms
206
214
  abbr[title],
207
- // Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
215
+ // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
208
216
  abbr[data-original-title] {
209
217
  cursor: help;
210
218
  border-bottom: 1px dotted $abbr-border-color;
@@ -232,7 +240,7 @@ blockquote {
232
240
  line-height: $line-height-base;
233
241
  color: $blockquote-small-color;
234
242
  &:before {
235
- content: '\2014 \00A0';// EM DASH, NBSP
243
+ content: '\2014 \00A0'; // EM DASH, NBSP
236
244
  }
237
245
  }
238
246
 
@@ -243,23 +251,23 @@ blockquote {
243
251
  border-right: 5px solid $blockquote-border-color;
244
252
  border-left: 0;
245
253
  p,
246
- small {
254
+ small,
255
+ .small {
247
256
  text-align: right;
248
257
  }
249
- small {
258
+ small,
259
+ .small {
250
260
  &:before {
251
261
  content: '';
252
262
  }
253
263
  &:after {
254
- content: '\00A0 \2014';// NBSP, EM DASH
264
+ content: '\00A0 \2014'; // NBSP, EM DASH
255
265
  }
256
266
  }
257
267
  }
258
268
  }
259
269
 
260
270
  // Quotes
261
- q:before,
262
- q:after,
263
271
  blockquote:before,
264
272
  blockquote:after {
265
273
  content: "";
@@ -23,6 +23,7 @@
23
23
  // Toggling content
24
24
  // -------------------------
25
25
 
26
+ // Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1
26
27
  .hide {
27
28
  display: none !important;
28
29
  }
@@ -37,6 +38,16 @@
37
38
  }
38
39
 
39
40
 
41
+ // Hide from screenreaders and browsers
42
+ //
43
+ // Credit: HTML5 Boilerplate
44
+
45
+ .hidden {
46
+ display: none !important;
47
+ visibility: hidden !important;
48
+ }
49
+
50
+
40
51
  // For Affix plugin
41
52
  // -------------------------
42
53
 
@@ -48,9 +48,9 @@ $font-size-base: 14px !default;
48
48
  $font-size-large: ceil($font-size-base * 1.25) !default; // ~18px
49
49
  $font-size-small: ceil($font-size-base * 0.85) !default; // ~12px
50
50
 
51
- $font-size-h1: floor($font-size-base * 2.60) !default; // ~36px
51
+ $font-size-h1: floor($font-size-base * 2.6) !default; // ~36px
52
52
  $font-size-h2: floor($font-size-base * 2.15) !default; // ~30px
53
- $font-size-h3: ceil($font-size-base * 1.70) !default; // ~24px
53
+ $font-size-h3: ceil($font-size-base * 1.7) !default; // ~24px
54
54
  $font-size-h4: ceil($font-size-base * 1.25) !default; // ~18px
55
55
  $font-size-h5: $font-size-base !default;
56
56
  $font-size-h6: ceil($font-size-base * 0.85) !default; // ~12px
@@ -367,8 +367,8 @@ $pager-disabled-color: $gray-light !default;
367
367
  $jumbotron-padding: 30px !default;
368
368
  $jumbotron-color: inherit !default;
369
369
  $jumbotron-bg: $gray-lighter !default;
370
-
371
370
  $jumbotron-heading-color: inherit !default;
371
+ $jumbotron-font-size: ceil($font-size-base * 1.5) !default;
372
372
 
373
373
 
374
374
  // Form states and alerts
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module Rails
3
- VERSION = '3.0.0.3'
3
+ VERSION = '3.0.1.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: anjlab-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.3
4
+ version: 3.0.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yury Korolev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-19 00:00:00.000000000 Z
11
+ date: 2013-11-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties