anjlab-bootstrap-rails 3.0.2.0 → 3.0.3.0

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 (39) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +6 -6
  3. data/Rakefile +6 -6
  4. data/app/assets/javascripts/twitter/bootstrap/affix.js +1 -1
  5. data/app/assets/javascripts/twitter/bootstrap/alert.js +1 -1
  6. data/app/assets/javascripts/twitter/bootstrap/button.js +11 -5
  7. data/app/assets/javascripts/twitter/bootstrap/carousel.js +5 -5
  8. data/app/assets/javascripts/twitter/bootstrap/collapse.js +1 -1
  9. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +5 -5
  10. data/app/assets/javascripts/twitter/bootstrap/modal.js +1 -1
  11. data/app/assets/javascripts/twitter/bootstrap/popover.js +1 -1
  12. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +2 -2
  13. data/app/assets/javascripts/twitter/bootstrap/tab.js +1 -1
  14. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +1 -1
  15. data/app/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  16. data/app/assets/stylesheets/twitter/bootstrap/_badges.scss +6 -6
  17. data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +7 -33
  18. data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +1 -3
  19. data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +1 -0
  20. data/app/assets/stylesheets/twitter/bootstrap/_component-animations.scss +1 -1
  21. data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +3 -8
  22. data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +11 -0
  23. data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +12 -26
  24. data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +1 -1
  25. data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +8 -2
  26. data/app/assets/stylesheets/twitter/bootstrap/_labels.scss +6 -0
  27. data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +32 -45
  28. data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +2 -5
  29. data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +41 -53
  30. data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +0 -20
  31. data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +11 -1
  32. data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +0 -12
  33. data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +17 -22
  34. data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +9 -3
  35. data/app/assets/stylesheets/twitter/bootstrap/_type.scss +54 -52
  36. data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +16 -11
  37. data/bootstrap-rails.gemspec +1 -1
  38. data/lib/bootstrap-rails/version.rb +1 -1
  39. metadata +3 -4
@@ -48,11 +48,6 @@
48
48
  &:focus {
49
49
  background-color: $nav-link-hover-bg;
50
50
  border-color: $link-color;
51
-
52
- .caret {
53
- border-top-color: $link-hover-color;
54
- border-bottom-color: $link-hover-color;
55
- }
56
51
  }
57
52
  }
58
53
 
@@ -195,11 +190,6 @@
195
190
  &:focus {
196
191
  color: $nav-pills-active-link-hover-color;
197
192
  background-color: $nav-pills-active-link-hover-bg;
198
-
199
- .caret {
200
- border-top-color: $nav-pills-active-link-hover-color;
201
- border-bottom-color: $nav-pills-active-link-hover-color;
202
- }
203
193
  }
204
194
  }
205
195
  }
@@ -236,16 +226,6 @@
236
226
  // Dropdowns
237
227
  // -------------------------
238
228
 
239
- // Make dropdown carets use link color in navs
240
- .nav .caret {
241
- border-top-color: $link-color;
242
- border-bottom-color: $link-color;
243
- }
244
- .nav a:hover .caret {
245
- border-top-color: $link-hover-color;
246
- border-bottom-color: $link-hover-color;
247
- }
248
-
249
229
  // Specific dropdowns
250
230
  .nav-tabs .dropdown-menu {
251
231
  // make dropdown border overlap tab border
@@ -57,13 +57,17 @@
57
57
 
58
58
  .panel {
59
59
  > .table,
60
- > .table-responsive {
60
+ > .table-responsive > .table {
61
61
  margin-bottom: 0;
62
62
  }
63
63
  > .panel-body + .table,
64
64
  > .panel-body + .table-responsive {
65
65
  border-top: 1px solid $table-border-color;
66
66
  }
67
+ > .table > tbody:first-child th,
68
+ > .table > tbody:first-child td {
69
+ border-top: 0;
70
+ }
67
71
  > .table-bordered,
68
72
  > .table-responsive > .table-bordered {
69
73
  border: 0;
@@ -87,6 +91,10 @@
87
91
  }
88
92
  }
89
93
  }
94
+ > .table-responsive {
95
+ border: 0;
96
+ margin-bottom: 0;
97
+ }
90
98
  }
91
99
 
92
100
 
@@ -106,6 +114,8 @@
106
114
  margin-top: 0;
107
115
  margin-bottom: 0;
108
116
  font-size: ceil(($font-size-base * 1.125));
117
+ color: inherit;
118
+
109
119
  > a {
110
120
  color: inherit;
111
121
  }
@@ -12,18 +12,6 @@
12
12
  to { background-position: 0 0; }
13
13
  }
14
14
 
15
- // Firefox
16
- @-moz-keyframes progress-bar-stripes {
17
- from { background-position: 40px 0; }
18
- to { background-position: 0 0; }
19
- }
20
-
21
- // Opera
22
- @-o-keyframes progress-bar-stripes {
23
- from { background-position: 0 0; }
24
- to { background-position: 40px 0; }
25
- }
26
-
27
15
  // Spec and IE10+
28
16
  @keyframes progress-bar-stripes {
29
17
  from { background-position: 40px 0; }
@@ -104,10 +104,12 @@ th {
104
104
  //
105
105
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
106
106
 
107
- .table-striped > tbody > tr:nth-child(odd) {
108
- > td,
109
- > th {
110
- background-color: $table-bg-accent;
107
+ .table-striped {
108
+ > tbody > tr:nth-child(odd) {
109
+ > td,
110
+ > th {
111
+ background-color: $table-bg-accent;
112
+ }
111
113
  }
112
114
  }
113
115
 
@@ -116,10 +118,12 @@ th {
116
118
  //
117
119
  // Placed here since it has to come after the potential zebra striping
118
120
 
119
- .table-hover > tbody > tr:hover {
120
- > td,
121
- > th {
122
- background-color: $table-bg-hover;
121
+ .table-hover {
122
+ > tbody > tr:hover {
123
+ > td,
124
+ > th {
125
+ background-color: $table-bg-hover;
126
+ }
123
127
  }
124
128
  }
125
129
 
@@ -129,6 +133,7 @@ th {
129
133
  // Reset default table behavior
130
134
 
131
135
  table col[class*="col-"] {
136
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
132
137
  float: none;
133
138
  display: table-column;
134
139
  }
@@ -148,21 +153,11 @@ table {
148
153
  // Exact selectors below required to override `.table-striped` and prevent
149
154
  // inheritance to nested tables.
150
155
 
151
- .table > thead > tr,
152
- .table > tbody > tr,
153
- .table > tfoot > tr {
154
- > td.active,
155
- > th.active,
156
- &.active > td,
157
- &.active > th {
158
- background-color: $table-bg-active;
159
- }
160
- }
161
-
162
156
  // Generate the contextual variants
163
- @include table-row-variant(success, $state-success-bg, $state-success-border);
164
- @include table-row-variant(danger, $state-danger-bg, $state-danger-border);
165
- @include table-row-variant(warning, $state-warning-bg, $state-warning-border);
157
+ @include table-row-variant(active, $table-bg-active);
158
+ @include table-row-variant(success, $state-success-bg);
159
+ @include table-row-variant(danger, $state-danger-bg);
160
+ @include table-row-variant(warning, $state-warning-bg);
166
161
 
167
162
 
168
163
  // Responsive tables
@@ -5,11 +5,17 @@
5
5
 
6
6
  // Mixin and adjust the regular image class
7
7
  .thumbnail {
8
- @extend .img-thumbnail;
9
- display: block; // Override the inline-block from `.img-thumbnail`
8
+ display: block;
9
+ padding: $thumbnail-padding;
10
10
  margin-bottom: $line-height-computed;
11
+ line-height: $line-height-base;
12
+ background-color: $thumbnail-bg;
13
+ border: 1px solid $thumbnail-border;
14
+ border-radius: $thumbnail-border-radius;
15
+ @include transition(all .2s ease-in-out);
11
16
 
12
- > img {
17
+ > img,
18
+ a > img {
13
19
  @include img-responsive();
14
20
  margin-left: auto;
15
21
  margin-right: auto;
@@ -3,12 +3,62 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
+ // Headings
7
+ // -------------------------
8
+
9
+ h1, h2, h3, h4, h5, h6,
10
+ .h1, .h2, .h3, .h4, .h5, .h6 {
11
+ font-family: $headings-font-family;
12
+ font-weight: $headings-font-weight;
13
+ line-height: $headings-line-height;
14
+ color: $headings-color;
15
+
16
+ small,
17
+ .small {
18
+ font-weight: normal;
19
+ line-height: 1;
20
+ color: $headings-small-color;
21
+ }
22
+ }
23
+
24
+ h1,
25
+ h2,
26
+ h3 {
27
+ margin-top: $line-height-computed;
28
+ margin-bottom: ($line-height-computed / 2);
29
+
30
+ small,
31
+ .small {
32
+ font-size: 65%;
33
+ }
34
+ }
35
+ h4,
36
+ h5,
37
+ h6 {
38
+ margin-top: ($line-height-computed / 2);
39
+ margin-bottom: ($line-height-computed / 2);
40
+
41
+ small,
42
+ .small {
43
+ font-size: 75%;
44
+ }
45
+ }
46
+
47
+ h1, .h1 { font-size: $font-size-h1; }
48
+ h2, .h2 { font-size: $font-size-h2; }
49
+ h3, .h3 { font-size: $font-size-h3; }
50
+ h4, .h4 { font-size: $font-size-h4; }
51
+ h5, .h5 { font-size: $font-size-h5; }
52
+ h6, .h6 { font-size: $font-size-h6; }
53
+
54
+
6
55
  // Body text
7
56
  // -------------------------
8
57
 
9
58
  p {
10
59
  margin: 0 0 ($line-height-computed / 2);
11
60
  }
61
+
12
62
  .lead {
13
63
  margin-bottom: $line-height-computed;
14
64
  font-size: floor($font-size-base * 1.15);
@@ -72,55 +122,6 @@ cite { font-style: normal; }
72
122
  .text-center { text-align: center; }
73
123
 
74
124
 
75
- // Headings
76
- // -------------------------
77
-
78
- h1, h2, h3, h4, h5, h6,
79
- .h1, .h2, .h3, .h4, .h5, .h6 {
80
- font-family: $headings-font-family;
81
- font-weight: $headings-font-weight;
82
- line-height: $headings-line-height;
83
- color: $headings-color;
84
-
85
- small,
86
- .small {
87
- font-weight: normal;
88
- line-height: 1;
89
- color: $headings-small-color;
90
- }
91
- }
92
-
93
- h1,
94
- h2,
95
- h3 {
96
- margin-top: $line-height-computed;
97
- margin-bottom: ($line-height-computed / 2);
98
-
99
- small,
100
- .small {
101
- font-size: 65%;
102
- }
103
- }
104
- h4,
105
- h5,
106
- h6 {
107
- margin-top: ($line-height-computed / 2);
108
- margin-bottom: ($line-height-computed / 2);
109
-
110
- small,
111
- .small {
112
- font-size: 75%;
113
- }
114
- }
115
-
116
- h1, .h1 { font-size: $font-size-h1; }
117
- h2, .h2 { font-size: $font-size-h2; }
118
- h3, .h3 { font-size: $font-size-h3; }
119
- h4, .h4 { font-size: $font-size-h4; }
120
- h5, .h5 { font-size: $font-size-h5; }
121
- h6, .h6 { font-size: $font-size-h6; }
122
-
123
-
124
125
  // Page header
125
126
  // -------------------------
126
127
 
@@ -131,7 +132,6 @@ h6, .h6 { font-size: $font-size-h6; }
131
132
  }
132
133
 
133
134
 
134
-
135
135
  // Lists
136
136
  // --------------------------------------------------
137
137
 
@@ -173,6 +173,7 @@ ol {
173
173
 
174
174
  // Description Lists
175
175
  dl {
176
+ margin-top: 0; // Remove browser default
176
177
  margin-bottom: $line-height-computed;
177
178
  }
178
179
  dt,
@@ -217,7 +218,7 @@ abbr[data-original-title] {
217
218
  cursor: help;
218
219
  border-bottom: 1px dotted $abbr-border-color;
219
220
  }
220
- abbr.initialism {
221
+ .initialism {
221
222
  font-size: 90%;
222
223
  text-transform: uppercase;
223
224
  }
@@ -235,7 +236,8 @@ blockquote {
235
236
  p:last-child {
236
237
  margin-bottom: 0;
237
238
  }
238
- small {
239
+ small,
240
+ .small {
239
241
  display: block;
240
242
  line-height: $line-height-base;
241
243
  color: $blockquote-small-color;
@@ -41,7 +41,7 @@ $link-hover-color: darken($link-color, 15%) !default;
41
41
 
42
42
  $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
43
43
  $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
44
- $font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace !default;
44
+ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
45
45
  $font-family-base: $font-family-sans-serif !default;
46
46
 
47
47
  $font-size-base: 14px !default;
@@ -83,6 +83,9 @@ $padding-large-horizontal: 16px !default;
83
83
  $padding-small-vertical: 5px !default;
84
84
  $padding-small-horizontal: 10px !default;
85
85
 
86
+ $padding-xs-vertical: 1px !default;
87
+ $padding-xs-horizontal: 5px !default;
88
+
86
89
  $line-height-large: 1.33 !default;
87
90
  $line-height-small: 1.5 !default;
88
91
 
@@ -156,7 +159,7 @@ $input-border-focus: #66afe9 !default;
156
159
  $input-color-placeholder: $gray-light !default;
157
160
 
158
161
  $input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
159
- $input-height-large: (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
162
+ $input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
160
163
  $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
161
164
 
162
165
  $legend-color: $gray-dark !default;
@@ -185,8 +188,6 @@ $dropdown-link-disabled-color: $gray-light !default;
185
188
 
186
189
  $dropdown-header-color: $gray-light !default;
187
190
 
188
- $dropdown-caret-color: #000 !default;
189
-
190
191
 
191
192
  // COMPONENT VARIABLES
192
193
  // --------------------------------------------------
@@ -245,8 +246,13 @@ $screen-md-max: ($screen-lg-min - 1) !default;
245
246
  $grid-columns: 12 !default;
246
247
  // Padding, to be divided by two and applied to the left and right of all columns
247
248
  $grid-gutter-width: 30px !default;
248
- // Point at which the navbar stops collapsing
249
+
250
+ // Navbar collapse
251
+
252
+ // Point at which the navbar becomes uncollapsed
249
253
  $grid-float-breakpoint: $screen-sm-min !default;
254
+ // Point at which the navbar begins collapsing
255
+ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
250
256
 
251
257
 
252
258
  // Navbar
@@ -320,7 +326,6 @@ $nav-disabled-link-color: $gray-light !default;
320
326
  $nav-disabled-link-hover-color: $gray-light !default;
321
327
 
322
328
  $nav-open-link-hover-color: #fff !default;
323
- $nav-open-caret-border-color: #fff !default;
324
329
 
325
330
  // Tabs
326
331
  $nav-tabs-border-color: #ddd !default;
@@ -374,19 +379,19 @@ $jumbotron-font-size: ceil($font-size-base * 1.5) !default;
374
379
  // Form states and alerts
375
380
  // -------------------------
376
381
 
377
- $state-success-text: #468847 !default;
382
+ $state-success-text: #3c763d !default;
378
383
  $state-success-bg: #dff0d8 !default;
379
384
  $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
380
385
 
381
- $state-info-text: #3a87ad !default;
386
+ $state-info-text: #31708f !default;
382
387
  $state-info-bg: #d9edf7 !default;
383
- $state-info-border: darken(adjust-hue($state-info-bg, -10%), 7%) !default;
388
+ $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
384
389
 
385
- $state-warning-text: #c09853 !default;
390
+ $state-warning-text: #8a6d3b !default;
386
391
  $state-warning-bg: #fcf8e3 !default;
387
392
  $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
388
393
 
389
- $state-danger-text: #b94a48 !default;
394
+ $state-danger-text: #a94442 !default;
390
395
  $state-danger-bg: #f2dede !default;
391
396
  $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
392
397
 
@@ -4,7 +4,7 @@ require File.expand_path('../lib/bootstrap-rails/version', __FILE__)
4
4
  Gem::Specification.new do |gem|
5
5
  gem.authors = ["Yury Korolev"]
6
6
  gem.email = ["yury.korolev@gmail.com"]
7
- gem.description = %q{Twitter Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
7
+ gem.description = %q{Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
8
8
  gem.summary = %q{Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
9
9
  gem.homepage = "https://github.com/anjlab/bootstrap-rails"
10
10
 
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module Rails
3
- VERSION = '3.0.2.0'
3
+ VERSION = '3.0.3.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.2.0
4
+ version: 3.0.3.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-11-07 00:00:00.000000000 Z
11
+ date: 2013-12-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -66,8 +66,7 @@ dependencies:
66
66
  - - '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '3.1'
69
- description: Twitter Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3
70
- projects
69
+ description: Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects
71
70
  email:
72
71
  - yury.korolev@gmail.com
73
72
  executables: []