anjlab-bootstrap-rails 3.0.0.2 → 3.0.0.3

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 (31) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/twitter/bootstrap/_bootstrap.scss +0 -10
  3. data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +1 -1
  4. data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +1 -0
  5. data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +20 -9
  6. data/app/assets/stylesheets/twitter/bootstrap/_code.scss +3 -6
  7. data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +12 -2
  8. data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +4 -0
  9. data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +10 -10
  10. data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +9 -0
  11. data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +1 -1
  12. data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +68 -23
  13. data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +1 -3
  14. data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +2 -2
  15. data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +25 -7
  16. data/app/assets/stylesheets/twitter/bootstrap/_normalize.scss +16 -6
  17. data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss +2 -0
  18. data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +27 -7
  19. data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +2 -1
  20. data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +19 -20
  21. data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +0 -11
  22. data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +26 -16
  23. data/app/assets/stylesheets/twitter/bootstrap/_theme.scss +24 -11
  24. data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +1 -0
  25. data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss +9 -9
  26. data/app/assets/stylesheets/twitter/bootstrap/_type.scss +52 -20
  27. data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +4 -2
  28. data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +55 -39
  29. data/lib/bootstrap-rails/engine.rb +1 -1
  30. data/lib/bootstrap-rails/version.rb +1 -1
  31. metadata +2 -2
@@ -124,11 +124,9 @@ body.modal-open,
124
124
  }
125
125
 
126
126
  // Scale up the modal
127
- @media screen and (min-width: $screen-tablet) {
127
+ @media screen and (min-width: $screen-sm-min) {
128
128
 
129
129
  .modal-dialog {
130
- left: 50%;
131
- right: auto;
132
130
  width: 600px;
133
131
  padding-top: 30px;
134
132
  padding-bottom: 30px;
@@ -412,7 +412,7 @@
412
412
 
413
413
  .navbar-collapse,
414
414
  .navbar-form {
415
- border-color: darken($navbar-default-bg, 7%);
415
+ border-color: $navbar-default-border;
416
416
  }
417
417
 
418
418
  // Dropdown menu items and carets
@@ -622,4 +622,4 @@
622
622
  }
623
623
  }
624
624
 
625
- }
625
+ }
@@ -51,7 +51,11 @@
51
51
  }
52
52
  }
53
53
 
54
- // Dividers (basically an hr) within the dropdown
54
+ // Nav dividers (deprecated with v3.0.1)
55
+ //
56
+ // This should have been removed in v3 with the dropping of `.nav-list`, but
57
+ // we missed it. We don't currently support this anywhere, but in the interest
58
+ // of maintaining backward compatibility in case you use it, it's deprecated.
55
59
  .nav-divider {
56
60
  @include nav-divider();
57
61
  }
@@ -70,13 +74,17 @@
70
74
  float: none;
71
75
  > a {
72
76
  text-align: center;
77
+ margin-bottom: 5px;
73
78
  }
74
79
  }
75
80
 
76
- @media (min-width: $screen-sm) {
81
+ @media (min-width: $screen-sm-min) {
77
82
  > li {
78
83
  display: table-cell;
79
84
  width: 1%;
85
+ > a {
86
+ margin-bottom: 0;
87
+ }
80
88
  }
81
89
  }
82
90
  }
@@ -84,14 +92,24 @@
84
92
  // Move borders to anchors instead of bottom of list
85
93
  @mixin nav-tabs-justified {
86
94
  border-bottom: 0;
87
- > li > a {
88
- border-bottom: 1px solid $nav-tabs-justified-link-border-color;
89
95
 
96
+ > li > a {
90
97
  // Override margin from .nav-tabs
91
98
  margin-right: 0;
99
+ border-radius: $border-radius-base;
92
100
  }
93
- > .active > a {
94
- border-bottom-color: $nav-tabs-justified-active-link-border-color;
101
+
102
+ > .active > a,
103
+ > .active > a:hover,
104
+ > .active > a:focus {
105
+ border: 1px solid $nav-tabs-justified-link-border-color;
106
+ }
107
+
108
+ // Prevent IE8 from misplacing imgs
109
+ //
110
+ // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
111
+ > li > a > img {
112
+ max-width: none;
95
113
  }
96
114
  }
97
115
 
@@ -147,7 +165,7 @@
147
165
 
148
166
  // Links rendered as pills
149
167
  > a {
150
- border-radius: 5px;
168
+ border-radius: $nav-pills-border-radius;
151
169
  }
152
170
  + li {
153
171
  margin-left: 2px;
@@ -1,4 +1,4 @@
1
- /*! normalize.css v2.1.0 | MIT License | git.io/normalize */
1
+ /*! normalize.css v2.1.3 | MIT License | git.io/normalize */
2
2
 
3
3
  // ==========================================================================
4
4
  // HTML5 display definitions
@@ -44,10 +44,12 @@ audio:not([controls]) {
44
44
  }
45
45
 
46
46
  //
47
- // Address styling not present in IE 8/9.
47
+ // Address `[hidden]` styling not present in IE 8/9.
48
+ // Hide the `template` element in IE, Safari, and Firefox < 22.
48
49
  //
49
50
 
50
- [hidden] {
51
+ [hidden],
52
+ template {
51
53
  display: none;
52
54
  }
53
55
 
@@ -63,8 +65,8 @@ audio:not([controls]) {
63
65
 
64
66
  html {
65
67
  font-family: sans-serif; // 1
66
- -webkit-text-size-adjust: 100%; // 2
67
68
  -ms-text-size-adjust: 100%; // 2
69
+ -webkit-text-size-adjust: 100%; // 2
68
70
  }
69
71
 
70
72
  //
@@ -79,6 +81,14 @@ body {
79
81
  // Links
80
82
  // ==========================================================================
81
83
 
84
+ //
85
+ // Remove the gray background color from active links in IE 10.
86
+ //
87
+
88
+ a {
89
+ background: transparent;
90
+ }
91
+
82
92
  //
83
93
  // Address `outline` inconsistency between Chrome and other browsers.
84
94
  //
@@ -329,8 +339,8 @@ html input[disabled] {
329
339
  }
330
340
 
331
341
  //
332
- // 1. Address box sizing set to `content-box` in IE 8/9.
333
- // 2. Remove excess padding in IE 8/9.
342
+ // 1. Address box sizing set to `content-box` in IE 8/9/10.
343
+ // 2. Remove excess padding in IE 8/9/10.
334
344
  //
335
345
 
336
346
  input[type="checkbox"],
@@ -58,6 +58,8 @@
58
58
 
59
59
  > .disabled {
60
60
  > span,
61
+ > span:hover,
62
+ > span:focus,
61
63
  > a,
62
64
  > a:hover,
63
65
  > a:focus {
@@ -56,12 +56,37 @@
56
56
  // watch it go full width.
57
57
 
58
58
  .panel {
59
- > .table {
59
+ > .table,
60
+ > .table-responsive {
60
61
  margin-bottom: 0;
61
62
  }
62
- > .panel-body + .table {
63
+ > .panel-body + .table,
64
+ > .panel-body + .table-responsive {
63
65
  border-top: 1px solid $table-border-color;
64
66
  }
67
+ > .table-bordered,
68
+ > .table-responsive > .table-bordered {
69
+ border: 0;
70
+ > thead,
71
+ > tbody,
72
+ > tfoot {
73
+ > tr {
74
+ > th:first-child,
75
+ > td:first-child {
76
+ border-left: 0;
77
+ }
78
+ > th:last-child,
79
+ > td:last-child {
80
+ border-right: 0;
81
+ }
82
+
83
+ &:last-child > th,
84
+ &:last-child > td {
85
+ border-bottom: 0;
86
+ }
87
+ }
88
+ }
89
+ }
65
90
  }
66
91
 
67
92
 
@@ -119,11 +144,6 @@
119
144
  border-bottom: 1px solid $panel-inner-border;
120
145
  }
121
146
  }
122
-
123
- // New subcomponent for wrapping collapsable content for proper animations
124
- .panel-collapse {
125
-
126
- }
127
147
  }
128
148
 
129
149
 
@@ -51,6 +51,7 @@
51
51
  width: 0%;
52
52
  height: 100%;
53
53
  font-size: $font-size-small;
54
+ line-height: $line-height-computed;
54
55
  color: $progress-bar-color;
55
56
  text-align: center;
56
57
  background-color: $progress-bar-bg;
@@ -60,7 +61,7 @@
60
61
 
61
62
  // Striped bars
62
63
  .progress-striped .progress-bar {
63
- @include gradient-striped($progress-bar-bg);
64
+ @include gradient-striped();
64
65
  background-size: 40px 40px;
65
66
  }
66
67
 
@@ -3,36 +3,35 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // IE10 Metro responsive
7
- // Required for Windows 8 Metro split-screen snapping with IE10
6
+ // IE10 in Windows (Phone) 8
8
7
  //
8
+ // Support for responsive views via media queries is kind of borked in IE10, for
9
+ // Surface/desktop in split view and for Windows Phone 8. This particular fix
10
+ // must be accompanied by a snippet of JavaScript to sniff the user agent and
11
+ // apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at
12
+ // our Getting Started page for more information on this bug.
13
+ //
14
+ // For more information, see the following:
15
+ //
16
+ // Issue: https://github.com/twbs/bootstrap/issues/10497
17
+ // Docs: http://getbootstrap.com/getting-started/#browsers
9
18
  // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
10
- @-ms-viewport{
19
+
20
+ @-ms-viewport {
11
21
  width: device-width;
12
22
  }
13
23
 
14
- // IE10 on Windows Phone 8
15
- // IE10 on WP8 doesn't report CSS pixels, but actual device pixels. In
16
- // other words, say on a Lumia, you'll get 768px as the device width,
17
- // meaning users will see the tablet styles and not phone styles.
18
- //
19
- // Alternatively you can override this with JS (see source below), but
20
- // we won't be doing that here given our limited scope.
21
- //
22
- // Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
23
- @media screen and (max-width: 400px) {
24
- @-ms-viewport{
25
- width: 320px;
26
- }
27
- }
28
24
 
29
25
  // Hide from screenreaders and browsers
26
+ //
30
27
  // Credit: HTML5 Boilerplate
28
+
31
29
  .hidden {
32
30
  display: none !important;
33
31
  visibility: hidden !important;
34
32
  }
35
33
 
34
+
36
35
  // Visibility utilities
37
36
 
38
37
 
@@ -57,7 +56,7 @@
57
56
  @include responsive-invisibility(".hidden-md.hidden-xs");
58
57
  @include responsive-invisibility(".hidden-lg.hidden-xs");
59
58
  }
60
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
59
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
61
60
  @include responsive-visibility(".visible-xs.visible-sm");
62
61
  @include responsive-visibility(".visible-sm");
63
62
  @include responsive-visibility(".visible-md.visible-sm");
@@ -68,7 +67,7 @@
68
67
  @include responsive-invisibility(".hidden-md.hidden-sm");
69
68
  @include responsive-invisibility(".hidden-lg.hidden-sm");
70
69
  }
71
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
70
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
72
71
  @include responsive-visibility(".visible-xs.visible-md");
73
72
  @include responsive-visibility(".visible-sm.visible-md");
74
73
  @include responsive-visibility(".visible-md");
@@ -79,7 +78,7 @@
79
78
  @include responsive-invisibility(".hidden-md");
80
79
  @include responsive-invisibility(".hidden-lg.hidden-md");
81
80
  }
82
- @media (min-width: $screen-lg) {
81
+ @media (min-width: $screen-lg-min) {
83
82
  @include responsive-visibility(".visible-xs.visible-lg");
84
83
  @include responsive-visibility(".visible-sm.visible-lg");
85
84
  @include responsive-visibility(".visible-md.visible-lg");
@@ -37,17 +37,6 @@ textarea {
37
37
  line-height: inherit;
38
38
  }
39
39
 
40
- // Reset unusual Firefox-on-Android default style.
41
- //
42
- // See https://github.com/necolas/normalize.css/issues/214
43
-
44
- button,
45
- input,
46
- select[multiple],
47
- textarea {
48
- background-image: none;
49
- }
50
-
51
40
 
52
41
  // Links
53
42
 
@@ -18,9 +18,9 @@ th {
18
18
  width: 100%;
19
19
  margin-bottom: $line-height-computed;
20
20
  // Cells
21
- thead,
22
- tbody,
23
- tfoot {
21
+ > thead,
22
+ > tbody,
23
+ > tfoot {
24
24
  > tr {
25
25
  > th,
26
26
  > td {
@@ -32,22 +32,23 @@ th {
32
32
  }
33
33
  }
34
34
  // Bottom align for column headings
35
- thead > tr > th {
35
+ > thead > tr > th {
36
36
  vertical-align: bottom;
37
37
  border-bottom: 2px solid $table-border-color;
38
38
  }
39
39
  // Remove top border from thead by default
40
- caption + thead,
41
- colgroup + thead,
42
- thead:first-child {
43
- tr:first-child {
44
- th, td {
40
+ > caption + thead,
41
+ > colgroup + thead,
42
+ > thead:first-child {
43
+ > tr:first-child {
44
+ > th,
45
+ > td {
45
46
  border-top: 0;
46
47
  }
47
48
  }
48
49
  }
49
50
  // Account for multiple tbody instances
50
- tbody + tbody {
51
+ > tbody + tbody {
51
52
  border-top: 2px solid $table-border-color;
52
53
  }
53
54
 
@@ -61,9 +62,9 @@ th {
61
62
  // Condensed table w/ half padding
62
63
 
63
64
  .table-condensed {
64
- thead,
65
- tbody,
66
- tfoot {
65
+ > thead,
66
+ > tbody,
67
+ > tfoot {
67
68
  > tr {
68
69
  > th,
69
70
  > td {
@@ -176,22 +177,23 @@ table {
176
177
 
177
178
  // Responsive tables
178
179
  //
179
- // Wrap your tables in `.table-scrollable` and we'll make them mobile friendly
180
+ // Wrap your tables in `.table-responsive` and we'll make them mobile friendly
180
181
  // by enabling horizontal scrolling. Only applies <768px. Everything above that
181
182
  // will display normally.
182
183
 
183
- @media (max-width: $screen-sm) {
184
+ @media (max-width: $screen-sm-min) {
184
185
  .table-responsive {
185
186
  width: 100%;
186
187
  margin-bottom: 15px;
187
188
  overflow-y: hidden;
188
189
  overflow-x: scroll;
190
+ -ms-overflow-style: -ms-autohiding-scrollbar;
189
191
  border: 1px solid $table-border-color;
192
+ -webkit-overflow-scrolling: touch;
190
193
 
191
194
  // Tighten up spacing and give a background color
192
195
  > .table {
193
196
  margin-bottom: 0;
194
- background-color: #fff;
195
197
 
196
198
  // Ensure the content doesn't wrap
197
199
  > thead,
@@ -224,6 +226,13 @@ table {
224
226
  border-right: 0;
225
227
  }
226
228
  }
229
+ }
230
+
231
+ // Only nuke the last row's bottom-border in `tbody` and `tfoot` since
232
+ // chances are there will be only one `tr` in a `thead` and that would
233
+ // remove the border altogether.
234
+ > tbody,
235
+ > tfoot {
227
236
  > tr:last-child {
228
237
  > th,
229
238
  > td {
@@ -231,6 +240,7 @@ table {
231
240
  }
232
241
  }
233
242
  }
243
+
234
244
  }
235
245
  }
236
246
  }
@@ -32,13 +32,21 @@
32
32
 
33
33
  // Mixin for generating new styles
34
34
  @mixin btn-styles($btn-color: #555) {
35
- @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 10%));
36
- border-color: darken($btn-color, 12%);
35
+ @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
36
+
37
+ background-repeat: repeat-x;
38
+ border-color: darken($btn-color, 14%);
39
+
40
+ &:hover,
41
+ &:focus {
42
+ background-color: darken($btn-color, 12%);
43
+ background-position: 0 -15px;
44
+ }
37
45
 
38
46
  &:active,
39
47
  &.active {
40
- background-color: darken($btn-color, 10%);
41
- border-color: darken($btn-color, 12%);
48
+ background-color: darken($btn-color, 12%);
49
+ border-color: darken($btn-color, 14%);
42
50
  }
43
51
  }
44
52
 
@@ -77,12 +85,15 @@
77
85
  // --------------------------------------------------
78
86
 
79
87
  .dropdown-menu > li > a:hover,
80
- .dropdown-menu > li > a:focus,
88
+ .dropdown-menu > li > a:focus {
89
+ @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
90
+ background-color: darken($dropdown-link-hover-bg, 5%);
91
+ }
81
92
  .dropdown-menu > .active > a,
82
93
  .dropdown-menu > .active > a:hover,
83
94
  .dropdown-menu > .active > a:focus {
84
- @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
85
- background-color: darken($dropdown-link-hover-bg, 5%);
95
+ @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
96
+ background-color: darken($dropdown-link-active-bg, 5%);
86
97
  }
87
98
 
88
99
 
@@ -91,15 +102,16 @@
91
102
  // Navbar
92
103
  // --------------------------------------------------
93
104
 
94
- // Basic navbar
95
- .navbar {
105
+ // Default navbar
106
+ .navbar-default {
96
107
  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
97
108
  border-radius: $navbar-border-radius;
98
109
  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
99
110
  @include box-shadow($shadow);
100
111
 
101
112
  .navbar-nav > .active > a {
102
- background-color: $navbar-default-bg;
113
+ @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
114
+ @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
103
115
  }
104
116
  }
105
117
  .navbar-brand,
@@ -112,7 +124,8 @@
112
124
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
113
125
 
114
126
  .navbar-nav > .active > a {
115
- background-color: $navbar-inverse-bg;
127
+ @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
128
+ @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
116
129
  }
117
130
 
118
131
  .navbar-brand,