bootstrap-sass 3.3.7 → 3.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (103) hide show
  1. checksums.yaml +5 -5
  2. data/.travis.yml +4 -10
  3. data/CHANGELOG.md +5 -0
  4. data/Gemfile +1 -4
  5. data/README.md +26 -58
  6. data/Rakefile +12 -8
  7. data/assets/javascripts/bootstrap-sprockets.js +3 -3
  8. data/assets/javascripts/bootstrap.js +300 -97
  9. data/assets/javascripts/bootstrap.min.js +3 -4
  10. data/assets/javascripts/bootstrap/affix.js +7 -5
  11. data/assets/javascripts/bootstrap/alert.js +6 -5
  12. data/assets/javascripts/bootstrap/button.js +4 -4
  13. data/assets/javascripts/bootstrap/carousel.js +16 -7
  14. data/assets/javascripts/bootstrap/collapse.js +6 -6
  15. data/assets/javascripts/bootstrap/dropdown.js +5 -5
  16. data/assets/javascripts/bootstrap/modal.js +43 -24
  17. data/assets/javascripts/bootstrap/popover.js +25 -10
  18. data/assets/javascripts/bootstrap/scrollspy.js +4 -4
  19. data/assets/javascripts/bootstrap/tab.js +10 -10
  20. data/assets/javascripts/bootstrap/tooltip.js +167 -10
  21. data/assets/javascripts/bootstrap/transition.js +5 -5
  22. data/assets/stylesheets/_bootstrap.scss +2 -2
  23. data/assets/stylesheets/bootstrap/_alerts.scss +3 -3
  24. data/assets/stylesheets/bootstrap/_badges.scss +3 -3
  25. data/assets/stylesheets/bootstrap/_breadcrumbs.scss +2 -2
  26. data/assets/stylesheets/bootstrap/_button-groups.scss +5 -5
  27. data/assets/stylesheets/bootstrap/_buttons.scss +4 -4
  28. data/assets/stylesheets/bootstrap/_carousel.scss +26 -25
  29. data/assets/stylesheets/bootstrap/_close.scss +1 -0
  30. data/assets/stylesheets/bootstrap/_code.scss +3 -3
  31. data/assets/stylesheets/bootstrap/_component-animations.scss +1 -0
  32. data/assets/stylesheets/bootstrap/_dropdowns.scss +20 -23
  33. data/assets/stylesheets/bootstrap/_forms.scss +47 -57
  34. data/assets/stylesheets/bootstrap/_glyphicons.scss +9 -9
  35. data/assets/stylesheets/bootstrap/_grid.scss +10 -0
  36. data/assets/stylesheets/bootstrap/_input-groups.scss +2 -2
  37. data/assets/stylesheets/bootstrap/_jumbotron.scss +5 -5
  38. data/assets/stylesheets/bootstrap/_labels.scss +1 -1
  39. data/assets/stylesheets/bootstrap/_list-group.scss +30 -32
  40. data/assets/stylesheets/bootstrap/_media.scss +1 -1
  41. data/assets/stylesheets/bootstrap/_modals.scss +7 -7
  42. data/assets/stylesheets/bootstrap/_navbar.scss +75 -81
  43. data/assets/stylesheets/bootstrap/_navs.scss +4 -4
  44. data/assets/stylesheets/bootstrap/_normalize.scss +5 -2
  45. data/assets/stylesheets/bootstrap/_pager.scss +2 -2
  46. data/assets/stylesheets/bootstrap/_pagination.scss +12 -15
  47. data/assets/stylesheets/bootstrap/_panels.scss +4 -4
  48. data/assets/stylesheets/bootstrap/_popovers.scss +47 -52
  49. data/assets/stylesheets/bootstrap/_print.scss +90 -92
  50. data/assets/stylesheets/bootstrap/_progress-bars.scss +3 -3
  51. data/assets/stylesheets/bootstrap/_responsive-embed.scss +2 -2
  52. data/assets/stylesheets/bootstrap/_responsive-utilities.scss +3 -3
  53. data/assets/stylesheets/bootstrap/_scaffolding.scss +7 -7
  54. data/assets/stylesheets/bootstrap/_tables.scss +23 -23
  55. data/assets/stylesheets/bootstrap/_theme.scss +21 -17
  56. data/assets/stylesheets/bootstrap/_thumbnails.scss +1 -1
  57. data/assets/stylesheets/bootstrap/_tooltip.scss +38 -27
  58. data/assets/stylesheets/bootstrap/_type.scss +10 -10
  59. data/assets/stylesheets/bootstrap/_variables.scss +6 -6
  60. data/assets/stylesheets/bootstrap/_wells.scss +2 -2
  61. data/assets/stylesheets/bootstrap/mixins/_alerts.scss +2 -1
  62. data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +4 -4
  63. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +6 -10
  64. data/assets/stylesheets/bootstrap/mixins/_center-block.scss +1 -1
  65. data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
  66. data/assets/stylesheets/bootstrap/mixins/_forms.scss +4 -4
  67. data/assets/stylesheets/bootstrap/mixins/_gradients.scss +6 -8
  68. data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +1 -1
  69. data/assets/stylesheets/bootstrap/mixins/_grid.scss +7 -7
  70. data/assets/stylesheets/bootstrap/mixins/_image.scss +5 -10
  71. data/assets/stylesheets/bootstrap/mixins/_opacity.scss +2 -3
  72. data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +4 -4
  73. data/assets/stylesheets/bootstrap/mixins/_resize.scss +1 -1
  74. data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +0 -4
  75. data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +1 -1
  76. data/bootstrap-sass.gemspec +5 -4
  77. data/bower.json +1 -1
  78. data/composer.json +1 -1
  79. data/lib/bootstrap-sass.rb +13 -16
  80. data/lib/bootstrap-sass/version.rb +2 -2
  81. data/package-lock.json +1611 -0
  82. data/package.json +3 -3
  83. data/tasks/converter/less_conversion.rb +7 -8
  84. data/tasks/converter/network.rb +2 -2
  85. data/templates/project/_bootstrap-variables.sass +7 -7
  86. data/test/compilation_test.rb +24 -12
  87. data/test/dummy_rails/config/application.rb +1 -0
  88. data/test/dummy_rails/config/boot.rb +1 -1
  89. data/test/dummy_sass_only/Gemfile +1 -1
  90. data/test/dummy_sass_only/compile.rb +14 -7
  91. data/test/dummy_sass_only/import_all.scss +2 -0
  92. data/test/gemfiles/default.gemfile +3 -0
  93. data/test/node_sass_compile_test.sh +4 -3
  94. data/test/sass_test.rb +10 -7
  95. data/test/sprockets_rails_test.rb +12 -8
  96. data/test/test_helper.rb +2 -1
  97. metadata +33 -26
  98. data/test/compass_test.rb +0 -9
  99. data/test/dummy_sass_only/import_all.sass +0 -2
  100. data/test/gemfiles/rails_head.gemfile +0 -17
  101. data/test/gemfiles/sass_3_3.gemfile +0 -9
  102. data/test/gemfiles/sass_3_4.gemfile +0 -7
  103. data/test/gemfiles/sass_head.gemfile +0 -6
@@ -7,8 +7,8 @@
7
7
  // --------------------------------------------------
8
8
 
9
9
  .nav {
10
- margin-bottom: 0;
11
10
  padding-left: 0; // Override default ul/ol
11
+ margin-bottom: 0;
12
12
  list-style: none;
13
13
  @include clearfix;
14
14
 
@@ -35,8 +35,8 @@
35
35
  &:focus {
36
36
  color: $nav-disabled-link-hover-color;
37
37
  text-decoration: none;
38
- background-color: transparent;
39
38
  cursor: $cursor-disabled;
39
+ background-color: transparent;
40
40
  }
41
41
  }
42
42
  }
@@ -97,10 +97,10 @@
97
97
  &:hover,
98
98
  &:focus {
99
99
  color: $nav-tabs-active-link-hover-color;
100
+ cursor: default;
100
101
  background-color: $nav-tabs-active-link-hover-bg;
101
102
  border: 1px solid $nav-tabs-active-link-hover-border-color;
102
103
  border-bottom-color: transparent;
103
- cursor: default;
104
104
  }
105
105
  }
106
106
  }
@@ -163,8 +163,8 @@
163
163
  > li {
164
164
  float: none;
165
165
  > a {
166
- text-align: center;
167
166
  margin-bottom: 5px;
167
+ text-align: center;
168
168
  }
169
169
  }
170
170
 
@@ -104,11 +104,14 @@ a:hover {
104
104
  // ==========================================================================
105
105
 
106
106
  //
107
- // Address styling not present in IE 8/9/10/11, Safari, and Chrome.
107
+ // 1. Remove the bottom border in Chrome 57- and Firefox 39-.
108
+ // 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
108
109
  //
109
110
 
110
111
  abbr[title] {
111
- border-bottom: 1px dotted;
112
+ border-bottom: none; // 1
113
+ text-decoration: underline; // 2
114
+ text-decoration: underline dotted; // 2
112
115
  }
113
116
 
114
117
  //
@@ -6,8 +6,8 @@
6
6
  .pager {
7
7
  padding-left: 0;
8
8
  margin: $line-height-computed 0;
9
- list-style: none;
10
9
  text-align: center;
10
+ list-style: none;
11
11
  @include clearfix;
12
12
  li {
13
13
  display: inline;
@@ -47,8 +47,8 @@
47
47
  > a:focus,
48
48
  > span {
49
49
  color: $pager-disabled-color;
50
- background-color: $pager-bg;
51
50
  cursor: $cursor-disabled;
51
+ background-color: $pager-bg;
52
52
  }
53
53
  }
54
54
  }
@@ -14,12 +14,20 @@
14
14
  position: relative;
15
15
  float: left; // Collapse white-space
16
16
  padding: $padding-base-vertical $padding-base-horizontal;
17
+ margin-left: -1px;
17
18
  line-height: $line-height-base;
18
- text-decoration: none;
19
19
  color: $pagination-color;
20
+ text-decoration: none;
20
21
  background-color: $pagination-bg;
21
22
  border: 1px solid $pagination-border;
22
- margin-left: -1px;
23
+
24
+ &:hover,
25
+ &:focus {
26
+ z-index: 2;
27
+ color: $pagination-hover-color;
28
+ background-color: $pagination-hover-bg;
29
+ border-color: $pagination-hover-border;
30
+ }
23
31
  }
24
32
  &:first-child {
25
33
  > a,
@@ -36,17 +44,6 @@
36
44
  }
37
45
  }
38
46
 
39
- > li > a,
40
- > li > span {
41
- &:hover,
42
- &:focus {
43
- z-index: 2;
44
- color: $pagination-hover-color;
45
- background-color: $pagination-hover-bg;
46
- border-color: $pagination-hover-border;
47
- }
48
- }
49
-
50
47
  > .active > a,
51
48
  > .active > span {
52
49
  &,
@@ -54,9 +51,9 @@
54
51
  &:focus {
55
52
  z-index: 3;
56
53
  color: $pagination-active-color;
54
+ cursor: default;
57
55
  background-color: $pagination-active-bg;
58
56
  border-color: $pagination-active-border;
59
- cursor: default;
60
57
  }
61
58
  }
62
59
 
@@ -68,9 +65,9 @@
68
65
  > a:hover,
69
66
  > a:focus {
70
67
  color: $pagination-disabled-color;
68
+ cursor: $cursor-disabled;
71
69
  background-color: $pagination-disabled-bg;
72
70
  border-color: $pagination-disabled-border;
73
- cursor: $cursor-disabled;
74
71
  }
75
72
  }
76
73
  }
@@ -9,7 +9,7 @@
9
9
  background-color: $panel-bg;
10
10
  border: 1px solid transparent;
11
11
  border-radius: $panel-border-radius;
12
- @include box-shadow(0 1px 1px rgba(0,0,0,.05));
12
+ @include box-shadow(0 1px 1px rgba(0, 0, 0, .05));
13
13
  }
14
14
 
15
15
  // Panel contents
@@ -113,8 +113,8 @@
113
113
  margin-bottom: 0;
114
114
 
115
115
  caption {
116
- padding-left: $panel-body-padding;
117
116
  padding-right: $panel-body-padding;
117
+ padding-left: $panel-body-padding;
118
118
  }
119
119
  }
120
120
  // Add border top radius for first one
@@ -147,8 +147,8 @@
147
147
  > tbody:last-child,
148
148
  > tfoot:last-child {
149
149
  > tr:last-child {
150
- border-bottom-left-radius: ($panel-border-radius - 1);
151
150
  border-bottom-right-radius: ($panel-border-radius - 1);
151
+ border-bottom-left-radius: ($panel-border-radius - 1);
152
152
 
153
153
  td:first-child,
154
154
  th:first-child {
@@ -208,8 +208,8 @@
208
208
  }
209
209
  }
210
210
  > .table-responsive {
211
- border: 0;
212
211
  margin-bottom: 0;
212
+ border: 0;
213
213
  }
214
214
  }
215
215
 
@@ -15,99 +15,81 @@
15
15
  // So reset our font and text properties to avoid inheriting weird values.
16
16
  @include reset-text;
17
17
  font-size: $font-size-base;
18
-
19
18
  background-color: $popover-bg;
20
19
  background-clip: padding-box;
21
20
  border: 1px solid $popover-fallback-border-color;
22
21
  border: 1px solid $popover-border-color;
23
22
  border-radius: $border-radius-large;
24
- @include box-shadow(0 5px 10px rgba(0,0,0,.2));
23
+ @include box-shadow(0 5px 10px rgba(0, 0, 0, .2));
25
24
 
26
25
  // Offset the popover to account for the popover arrow
27
- &.top { margin-top: -$popover-arrow-width; }
28
- &.right { margin-left: $popover-arrow-width; }
29
- &.bottom { margin-top: $popover-arrow-width; }
30
- &.left { margin-left: -$popover-arrow-width; }
31
- }
26
+ &.top { margin-top: -$popover-arrow-width; }
27
+ &.right { margin-left: $popover-arrow-width; }
28
+ &.bottom { margin-top: $popover-arrow-width; }
29
+ &.left { margin-left: -$popover-arrow-width; }
32
30
 
33
- .popover-title {
34
- margin: 0; // reset heading margin
35
- padding: 8px 14px;
36
- font-size: $font-size-base;
37
- background-color: $popover-title-bg;
38
- border-bottom: 1px solid darken($popover-title-bg, 5%);
39
- border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
40
- }
31
+ // Arrows
32
+ // .arrow is outer, .arrow:after is inner
33
+ > .arrow {
34
+ border-width: $popover-arrow-outer-width;
41
35
 
42
- .popover-content {
43
- padding: 9px 14px;
44
- }
45
-
46
- // Arrows
47
- //
48
- // .arrow is outer, .arrow:after is inner
36
+ &,
37
+ &:after {
38
+ position: absolute;
39
+ display: block;
40
+ width: 0;
41
+ height: 0;
42
+ border-color: transparent;
43
+ border-style: solid;
44
+ }
49
45
 
50
- .popover > .arrow {
51
- &,
52
- &:after {
53
- position: absolute;
54
- display: block;
55
- width: 0;
56
- height: 0;
57
- border-color: transparent;
58
- border-style: solid;
46
+ &:after {
47
+ content: "";
48
+ border-width: $popover-arrow-width;
49
+ }
59
50
  }
60
- }
61
- .popover > .arrow {
62
- border-width: $popover-arrow-outer-width;
63
- }
64
- .popover > .arrow:after {
65
- border-width: $popover-arrow-width;
66
- content: "";
67
- }
68
51
 
69
- .popover {
70
52
  &.top > .arrow {
53
+ bottom: -$popover-arrow-outer-width;
71
54
  left: 50%;
72
55
  margin-left: -$popover-arrow-outer-width;
73
- border-bottom-width: 0;
74
56
  border-top-color: $popover-arrow-outer-fallback-color; // IE8 fallback
75
57
  border-top-color: $popover-arrow-outer-color;
76
- bottom: -$popover-arrow-outer-width;
58
+ border-bottom-width: 0;
77
59
  &:after {
78
- content: " ";
79
60
  bottom: 1px;
80
61
  margin-left: -$popover-arrow-width;
81
- border-bottom-width: 0;
62
+ content: " ";
82
63
  border-top-color: $popover-arrow-color;
64
+ border-bottom-width: 0;
83
65
  }
84
66
  }
85
67
  &.right > .arrow {
86
68
  top: 50%;
87
69
  left: -$popover-arrow-outer-width;
88
70
  margin-top: -$popover-arrow-outer-width;
89
- border-left-width: 0;
90
71
  border-right-color: $popover-arrow-outer-fallback-color; // IE8 fallback
91
72
  border-right-color: $popover-arrow-outer-color;
73
+ border-left-width: 0;
92
74
  &:after {
93
- content: " ";
94
- left: 1px;
95
75
  bottom: -$popover-arrow-width;
96
- border-left-width: 0;
76
+ left: 1px;
77
+ content: " ";
97
78
  border-right-color: $popover-arrow-color;
79
+ border-left-width: 0;
98
80
  }
99
81
  }
100
82
  &.bottom > .arrow {
83
+ top: -$popover-arrow-outer-width;
101
84
  left: 50%;
102
85
  margin-left: -$popover-arrow-outer-width;
103
86
  border-top-width: 0;
104
87
  border-bottom-color: $popover-arrow-outer-fallback-color; // IE8 fallback
105
88
  border-bottom-color: $popover-arrow-outer-color;
106
- top: -$popover-arrow-outer-width;
107
89
  &:after {
108
- content: " ";
109
90
  top: 1px;
110
91
  margin-left: -$popover-arrow-width;
92
+ content: " ";
111
93
  border-top-width: 0;
112
94
  border-bottom-color: $popover-arrow-color;
113
95
  }
@@ -121,11 +103,24 @@
121
103
  border-left-color: $popover-arrow-outer-fallback-color; // IE8 fallback
122
104
  border-left-color: $popover-arrow-outer-color;
123
105
  &:after {
124
- content: " ";
125
106
  right: 1px;
107
+ bottom: -$popover-arrow-width;
108
+ content: " ";
126
109
  border-right-width: 0;
127
110
  border-left-color: $popover-arrow-color;
128
- bottom: -$popover-arrow-width;
129
111
  }
130
112
  }
131
113
  }
114
+
115
+ .popover-title {
116
+ padding: 8px 14px;
117
+ margin: 0; // reset heading margin
118
+ font-size: $font-size-base;
119
+ background-color: $popover-title-bg;
120
+ border-bottom: 1px solid darken($popover-title-bg, 5%);
121
+ border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
122
+ }
123
+
124
+ .popover-content {
125
+ padding: 9px 14px;
126
+ }
@@ -6,96 +6,94 @@
6
6
  // ==========================================================================
7
7
 
8
8
  @media print {
9
- *,
10
- *:before,
11
- *:after {
12
- background: transparent !important;
13
- color: #000 !important; // Black prints faster: h5bp.com/s
14
- box-shadow: none !important;
15
- text-shadow: none !important;
16
- }
17
-
18
- a,
19
- a:visited {
20
- text-decoration: underline;
21
- }
22
-
23
- a[href]:after {
24
- content: " (" attr(href) ")";
25
- }
26
-
27
- abbr[title]:after {
28
- content: " (" attr(title) ")";
29
- }
30
-
31
- // Don't show links that are fragment identifiers,
32
- // or use the `javascript:` pseudo protocol
33
- a[href^="#"]:after,
34
- a[href^="javascript:"]:after {
35
- content: "";
36
- }
37
-
38
- pre,
39
- blockquote {
40
- border: 1px solid #999;
41
- page-break-inside: avoid;
42
- }
43
-
44
- thead {
45
- display: table-header-group; // h5bp.com/t
46
- }
47
-
48
- tr,
49
- img {
50
- page-break-inside: avoid;
51
- }
52
-
53
- img {
54
- max-width: 100% !important;
55
- }
56
-
57
- p,
58
- h2,
59
- h3 {
60
- orphans: 3;
61
- widows: 3;
62
- }
63
-
64
- h2,
65
- h3 {
66
- page-break-after: avoid;
67
- }
68
-
69
- // Bootstrap specific changes start
70
-
71
- // Bootstrap components
72
- .navbar {
73
- display: none;
74
- }
75
- .btn,
76
- .dropup > .btn {
77
- > .caret {
78
- border-top-color: #000 !important;
79
- }
80
- }
81
- .label {
82
- border: 1px solid #000;
83
- }
84
-
85
- .table {
86
- border-collapse: collapse !important;
87
-
88
- td,
89
- th {
90
- background-color: #fff !important;
91
- }
92
- }
93
- .table-bordered {
94
- th,
95
- td {
96
- border: 1px solid #ddd !important;
97
- }
98
- }
99
-
100
- // Bootstrap specific changes end
9
+ *,
10
+ *:before,
11
+ *:after {
12
+ color: #000 !important; // Black prints faster: h5bp.com/s
13
+ text-shadow: none !important;
14
+ background: transparent !important;
15
+ box-shadow: none !important;
16
+ }
17
+
18
+ a,
19
+ a:visited {
20
+ text-decoration: underline;
21
+ }
22
+
23
+ a[href]:after {
24
+ content: " (" attr(href) ")";
25
+ }
26
+
27
+ abbr[title]:after {
28
+ content: " (" attr(title) ")";
29
+ }
30
+
31
+ // Don't show links that are fragment identifiers,
32
+ // or use the `javascript:` pseudo protocol
33
+ a[href^="#"]:after,
34
+ a[href^="javascript:"]:after {
35
+ content: "";
36
+ }
37
+
38
+ pre,
39
+ blockquote {
40
+ border: 1px solid #999;
41
+ page-break-inside: avoid;
42
+ }
43
+
44
+ thead {
45
+ display: table-header-group; // h5bp.com/t
46
+ }
47
+
48
+ tr,
49
+ img {
50
+ page-break-inside: avoid;
51
+ }
52
+
53
+ img {
54
+ max-width: 100% !important;
55
+ }
56
+
57
+ p,
58
+ h2,
59
+ h3 {
60
+ orphans: 3;
61
+ widows: 3;
62
+ }
63
+
64
+ h2,
65
+ h3 {
66
+ page-break-after: avoid;
67
+ }
68
+
69
+ // Bootstrap specific changes start
70
+
71
+ // Bootstrap components
72
+ .navbar {
73
+ display: none;
74
+ }
75
+ .btn,
76
+ .dropup > .btn {
77
+ > .caret {
78
+ border-top-color: #000 !important;
79
+ }
80
+ }
81
+ .label {
82
+ border: 1px solid #000;
83
+ }
84
+
85
+ .table {
86
+ border-collapse: collapse !important;
87
+
88
+ td,
89
+ th {
90
+ background-color: #fff !important;
91
+ }
92
+ }
93
+ .table-bordered {
94
+ th,
95
+ td {
96
+ border: 1px solid #ddd !important;
97
+ }
98
+ }
101
99
  }