bootstrap-generators 3.2.0 → 3.3.1
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.
- checksums.yaml +4 -4
- data/README.md +5 -3
- data/Rakefile +9 -18
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +31 -21
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +38 -24
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/starter.scss +2 -1
- data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +3 -3
- data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +5 -3
- data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.slim +7 -4
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +10 -9
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +12 -9
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim +15 -11
- data/readme-template.md.erb +3 -1
- data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
- data/vendor/assets/javascripts/bootstrap/affix.js +43 -23
- data/vendor/assets/javascripts/bootstrap/alert.js +6 -4
- data/vendor/assets/javascripts/bootstrap/button.js +16 -10
- data/vendor/assets/javascripts/bootstrap/carousel.js +27 -10
- data/vendor/assets/javascripts/bootstrap/collapse.js +69 -28
- data/vendor/assets/javascripts/bootstrap/dropdown.js +20 -10
- data/vendor/assets/javascripts/bootstrap/modal.js +67 -23
- data/vendor/assets/javascripts/bootstrap/popover.js +13 -7
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +12 -7
- data/vendor/assets/javascripts/bootstrap/tab.js +41 -16
- data/vendor/assets/javascripts/bootstrap/tooltip.js +60 -39
- data/vendor/assets/javascripts/bootstrap/transition.js +1 -1
- data/vendor/assets/stylesheets/bootstrap.css.erb +332 -203
- data/vendor/assets/stylesheets/bootstrap.css.map +1 -0
- data/vendor/twitter/bootstrap/less/badges.less +7 -1
- data/vendor/twitter/bootstrap/less/button-groups.less +16 -13
- data/vendor/twitter/bootstrap/less/buttons.less +7 -4
- data/vendor/twitter/bootstrap/less/carousel.less +24 -0
- data/vendor/twitter/bootstrap/less/code.less +1 -0
- data/vendor/twitter/bootstrap/less/component-animations.less +5 -2
- data/vendor/twitter/bootstrap/less/dropdowns.less +3 -5
- data/vendor/twitter/bootstrap/less/forms.less +46 -40
- data/vendor/twitter/bootstrap/less/glyphicons.less +2 -1
- data/vendor/twitter/bootstrap/less/jumbotron.less +6 -5
- data/vendor/twitter/bootstrap/less/list-group.less +1 -8
- data/vendor/twitter/bootstrap/less/media.less +27 -36
- data/vendor/twitter/bootstrap/less/mixins/buttons.less +2 -0
- data/vendor/twitter/bootstrap/less/mixins/forms.less +5 -1
- data/vendor/twitter/bootstrap/less/mixins/grid-framework.less +2 -2
- data/vendor/twitter/bootstrap/less/mixins/image.less +0 -1
- data/vendor/twitter/bootstrap/less/mixins/labels.less +1 -1
- data/vendor/twitter/bootstrap/less/mixins/vendor-prefixes.less +6 -3
- data/vendor/twitter/bootstrap/less/modals.less +3 -5
- data/vendor/twitter/bootstrap/less/navbar.less +30 -25
- data/vendor/twitter/bootstrap/less/navs.less +3 -1
- data/vendor/twitter/bootstrap/less/normalize.less +5 -3
- data/vendor/twitter/bootstrap/less/pager.less +1 -2
- data/vendor/twitter/bootstrap/less/pagination.less +1 -1
- data/vendor/twitter/bootstrap/less/panels.less +21 -3
- data/vendor/twitter/bootstrap/less/popovers.less +6 -4
- data/vendor/twitter/bootstrap/less/print.less +102 -96
- data/vendor/twitter/bootstrap/less/progress-bars.less +1 -19
- data/vendor/twitter/bootstrap/less/responsive-embed.less +2 -1
- data/vendor/twitter/bootstrap/less/scaffolding.less +1 -1
- data/vendor/twitter/bootstrap/less/tables.less +11 -10
- data/vendor/twitter/bootstrap/less/theme.less +23 -9
- data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
- data/vendor/twitter/bootstrap/less/tooltip.less +12 -4
- data/vendor/twitter/bootstrap/less/type.less +0 -11
- data/vendor/twitter/bootstrap/less/utilities.less +0 -1
- data/vendor/twitter/bootstrap/less/variables.less +31 -21
- data/vendor/twitter/bootstrap/sass/_bootstrap-compass.scss +7 -0
- data/vendor/twitter/bootstrap/sass/_bootstrap-mincer.scss +17 -0
- data/vendor/twitter/bootstrap/sass/_bootstrap-sprockets.scss +7 -0
- data/vendor/twitter/bootstrap/sass/_bootstrap.scss +50 -0
- data/vendor/twitter/bootstrap/sass/{_alerts.scss → bootstrap/_alerts.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_badges.scss → bootstrap/_badges.scss} +7 -1
- data/vendor/twitter/bootstrap/sass/{_breadcrumbs.scss → bootstrap/_breadcrumbs.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_button-groups.scss → bootstrap/_button-groups.scss} +18 -15
- data/vendor/twitter/bootstrap/sass/{_buttons.scss → bootstrap/_buttons.scss} +8 -5
- data/vendor/twitter/bootstrap/sass/{_carousel.scss → bootstrap/_carousel.scss} +25 -1
- data/vendor/twitter/bootstrap/sass/{_close.scss → bootstrap/_close.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_code.scss → bootstrap/_code.scss} +1 -0
- data/vendor/twitter/bootstrap/sass/{_component-animations.scss → bootstrap/_component-animations.scss} +5 -2
- data/vendor/twitter/bootstrap/sass/{_dropdowns.scss → bootstrap/_dropdowns.scss} +4 -6
- data/vendor/twitter/bootstrap/sass/{_forms.scss → bootstrap/_forms.scss} +53 -43
- data/vendor/twitter/bootstrap/sass/{_glyphicons.scss → bootstrap/_glyphicons.scss} +7 -10
- data/vendor/twitter/bootstrap/sass/{_grid.scss → bootstrap/_grid.scss} +4 -4
- data/vendor/twitter/bootstrap/sass/{_input-groups.scss → bootstrap/_input-groups.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_jumbotron.scss → bootstrap/_jumbotron.scss} +6 -5
- data/vendor/twitter/bootstrap/sass/{_labels.scss → bootstrap/_labels.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_list-group.scss → bootstrap/_list-group.scss} +1 -8
- data/vendor/twitter/bootstrap/sass/bootstrap/_media.scss +47 -0
- data/vendor/twitter/bootstrap/sass/{_mixins.scss → bootstrap/_mixins.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_modals.scss → bootstrap/_modals.scss} +4 -6
- data/vendor/twitter/bootstrap/sass/{_navbar.scss → bootstrap/_navbar.scss} +36 -33
- data/vendor/twitter/bootstrap/sass/{_navs.scss → bootstrap/_navs.scss} +5 -3
- data/vendor/twitter/bootstrap/sass/{_normalize.scss → bootstrap/_normalize.scss} +5 -3
- data/vendor/twitter/bootstrap/sass/{_pager.scss → bootstrap/_pager.scss} +2 -3
- data/vendor/twitter/bootstrap/sass/{_pagination.scss → bootstrap/_pagination.scss} +1 -1
- data/vendor/twitter/bootstrap/sass/{_panels.scss → bootstrap/_panels.scss} +22 -4
- data/vendor/twitter/bootstrap/sass/{_popovers.scss → bootstrap/_popovers.scss} +6 -4
- data/vendor/twitter/bootstrap/sass/bootstrap/_print.scss +107 -0
- data/vendor/twitter/bootstrap/sass/{_progress-bars.scss → bootstrap/_progress-bars.scss} +2 -20
- data/vendor/twitter/bootstrap/sass/{_responsive-embed.scss → bootstrap/_responsive-embed.scss} +2 -1
- data/vendor/twitter/bootstrap/sass/{_responsive-utilities.scss → bootstrap/_responsive-utilities.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_scaffolding.scss → bootstrap/_scaffolding.scss} +3 -3
- data/vendor/twitter/bootstrap/sass/{_tables.scss → bootstrap/_tables.scss} +11 -10
- data/vendor/twitter/bootstrap/sass/{_theme.scss → bootstrap/_theme.scss} +27 -13
- data/vendor/twitter/bootstrap/sass/{_thumbnails.scss → bootstrap/_thumbnails.scss} +2 -2
- data/vendor/twitter/bootstrap/sass/{_tooltip.scss → bootstrap/_tooltip.scss} +12 -4
- data/vendor/twitter/bootstrap/sass/{_type.scss → bootstrap/_type.scss} +10 -16
- data/vendor/twitter/bootstrap/sass/{_utilities.scss → bootstrap/_utilities.scss} +3 -4
- data/vendor/twitter/bootstrap/sass/{_variables.scss → bootstrap/_variables.scss} +38 -24
- data/vendor/twitter/bootstrap/sass/{_wells.scss → bootstrap/_wells.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_alerts.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_background-variant.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_border-radius.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_buttons.scss +2 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_center-block.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_clearfix.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_forms.scss +5 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_gradients.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid-framework.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid.scss +2 -2
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_hide-text.scss +1 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_image.scss +0 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_labels.scss +1 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_list-group.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-divider.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-vertical-align.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_opacity.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_pagination.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_panels.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_progress-bar.scss +1 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_reset-filter.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_resize.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_responsive-visibility.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_size.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_tab-focus.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_table-row.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-emphasis.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-overflow.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_vendor-prefixes.scss +6 -3
- metadata +76 -72
- data/vendor/twitter/bootstrap/sass/_media.scss +0 -56
- data/vendor/twitter/bootstrap/sass/_print.scss +0 -101
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -50
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
|
|
2
|
+
|
|
3
|
+
// ==========================================================================
|
|
4
|
+
// Print styles.
|
|
5
|
+
// Inlined to avoid the additional HTTP request: h5bp.com/r
|
|
6
|
+
// ==========================================================================
|
|
7
|
+
|
|
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
|
+
// Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
|
|
72
|
+
// Once fixed, we can just straight up remove this.
|
|
73
|
+
select {
|
|
74
|
+
background: #fff !important;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
// Bootstrap components
|
|
78
|
+
.navbar {
|
|
79
|
+
display: none;
|
|
80
|
+
}
|
|
81
|
+
.btn,
|
|
82
|
+
.dropup > .btn {
|
|
83
|
+
> .caret {
|
|
84
|
+
border-top-color: #000 !important;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
.label {
|
|
88
|
+
border: 1px solid #000;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
.table {
|
|
92
|
+
border-collapse: collapse !important;
|
|
93
|
+
|
|
94
|
+
td,
|
|
95
|
+
th {
|
|
96
|
+
background-color: #fff !important;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
.table-bordered {
|
|
100
|
+
th,
|
|
101
|
+
td {
|
|
102
|
+
border: 1px solid #ddd !important;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
// Bootstrap specific changes end
|
|
107
|
+
}
|
|
@@ -19,7 +19,6 @@
|
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
|
|
22
|
-
|
|
23
22
|
// Bar itself
|
|
24
23
|
// -------------------------
|
|
25
24
|
|
|
@@ -29,7 +28,7 @@
|
|
|
29
28
|
height: $line-height-computed;
|
|
30
29
|
margin-bottom: $line-height-computed;
|
|
31
30
|
background-color: $progress-bg;
|
|
32
|
-
border-radius: $border-radius
|
|
31
|
+
border-radius: $progress-border-radius;
|
|
33
32
|
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
|
|
34
33
|
}
|
|
35
34
|
|
|
@@ -54,7 +53,7 @@
|
|
|
54
53
|
// `.progress-bar`.
|
|
55
54
|
.progress-striped .progress-bar,
|
|
56
55
|
.progress-bar-striped {
|
|
57
|
-
@include gradient-striped
|
|
56
|
+
@include gradient-striped;
|
|
58
57
|
background-size: 40px 40px;
|
|
59
58
|
}
|
|
60
59
|
|
|
@@ -67,23 +66,6 @@
|
|
|
67
66
|
@include animation(progress-bar-stripes 2s linear infinite);
|
|
68
67
|
}
|
|
69
68
|
|
|
70
|
-
// Account for lower percentages
|
|
71
|
-
.progress-bar {
|
|
72
|
-
&[aria-valuenow="1"],
|
|
73
|
-
&[aria-valuenow="2"] {
|
|
74
|
-
min-width: 30px;
|
|
75
|
-
}
|
|
76
|
-
|
|
77
|
-
&[aria-valuenow="0"] {
|
|
78
|
-
color: $gray-light;
|
|
79
|
-
min-width: 30px;
|
|
80
|
-
background-color: transparent;
|
|
81
|
-
background-image: none;
|
|
82
|
-
box-shadow: none;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
|
|
87
69
|
|
|
88
70
|
// Variations
|
|
89
71
|
// -------------------------
|
|
File without changes
|
|
@@ -52,11 +52,11 @@ a {
|
|
|
52
52
|
&:hover,
|
|
53
53
|
&:focus {
|
|
54
54
|
color: $link-hover-color;
|
|
55
|
-
text-decoration:
|
|
55
|
+
text-decoration: $link-hover-decoration;
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
&:focus {
|
|
59
|
-
@include tab-focus
|
|
59
|
+
@include tab-focus;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
|
|
@@ -79,7 +79,7 @@ img {
|
|
|
79
79
|
|
|
80
80
|
// Responsive images (ensure images don't scale beyond their parents)
|
|
81
81
|
.img-responsive {
|
|
82
|
-
@include img-responsive
|
|
82
|
+
@include img-responsive;
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
// Rounded corners
|
|
@@ -6,6 +6,12 @@
|
|
|
6
6
|
table {
|
|
7
7
|
background-color: $table-bg;
|
|
8
8
|
}
|
|
9
|
+
caption {
|
|
10
|
+
padding-top: $table-cell-padding;
|
|
11
|
+
padding-bottom: $table-cell-padding;
|
|
12
|
+
color: $text-muted;
|
|
13
|
+
text-align: left;
|
|
14
|
+
}
|
|
9
15
|
th {
|
|
10
16
|
text-align: left;
|
|
11
17
|
}
|
|
@@ -106,10 +112,7 @@ th {
|
|
|
106
112
|
|
|
107
113
|
.table-striped {
|
|
108
114
|
> tbody > tr:nth-child(odd) {
|
|
109
|
-
|
|
110
|
-
> th {
|
|
111
|
-
background-color: $table-bg-accent;
|
|
112
|
-
}
|
|
115
|
+
background-color: $table-bg-accent;
|
|
113
116
|
}
|
|
114
117
|
}
|
|
115
118
|
|
|
@@ -120,10 +123,7 @@ th {
|
|
|
120
123
|
|
|
121
124
|
.table-hover {
|
|
122
125
|
> tbody > tr:hover {
|
|
123
|
-
|
|
124
|
-
> th {
|
|
125
|
-
background-color: $table-bg-hover;
|
|
126
|
-
}
|
|
126
|
+
background-color: $table-bg-hover;
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
|
|
@@ -169,14 +169,15 @@ table {
|
|
|
169
169
|
// will display normally.
|
|
170
170
|
|
|
171
171
|
.table-responsive {
|
|
172
|
+
overflow-x: auto;
|
|
173
|
+
min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
|
|
174
|
+
|
|
172
175
|
@media screen and (max-width: $screen-xs-max) {
|
|
173
176
|
width: 100%;
|
|
174
177
|
margin-bottom: ($line-height-computed * 0.75);
|
|
175
178
|
overflow-y: hidden;
|
|
176
|
-
overflow-x: auto;
|
|
177
179
|
-ms-overflow-style: -ms-autohiding-scrollbar;
|
|
178
180
|
border: 1px solid $table-border-color;
|
|
179
|
-
-webkit-overflow-scrolling: touch;
|
|
180
181
|
|
|
181
182
|
// Tighten up spacing
|
|
182
183
|
> .table {
|
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
@import "mixins";
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
|
|
11
10
|
//
|
|
12
11
|
// Buttons
|
|
13
12
|
// --------------------------------------------------
|
|
@@ -28,12 +27,16 @@
|
|
|
28
27
|
&.active {
|
|
29
28
|
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
|
|
30
29
|
}
|
|
30
|
+
|
|
31
|
+
.badge {
|
|
32
|
+
text-shadow: none;
|
|
33
|
+
}
|
|
31
34
|
}
|
|
32
35
|
|
|
33
36
|
// Mixin for generating new styles
|
|
34
37
|
@mixin btn-styles($btn-color: #555) {
|
|
35
38
|
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
|
|
36
|
-
@include reset-filter
|
|
39
|
+
@include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners
|
|
37
40
|
background-repeat: repeat-x;
|
|
38
41
|
border-color: darken($btn-color, 14%);
|
|
39
42
|
|
|
@@ -74,7 +77,6 @@
|
|
|
74
77
|
.btn-danger { @include btn-styles($btn-danger-bg); }
|
|
75
78
|
|
|
76
79
|
|
|
77
|
-
|
|
78
80
|
//
|
|
79
81
|
// Images
|
|
80
82
|
// --------------------------------------------------
|
|
@@ -85,7 +87,6 @@
|
|
|
85
87
|
}
|
|
86
88
|
|
|
87
89
|
|
|
88
|
-
|
|
89
90
|
//
|
|
90
91
|
// Dropdowns
|
|
91
92
|
// --------------------------------------------------
|
|
@@ -103,7 +104,6 @@
|
|
|
103
104
|
}
|
|
104
105
|
|
|
105
106
|
|
|
106
|
-
|
|
107
107
|
//
|
|
108
108
|
// Navbar
|
|
109
109
|
// --------------------------------------------------
|
|
@@ -111,13 +111,14 @@
|
|
|
111
111
|
// Default navbar
|
|
112
112
|
.navbar-default {
|
|
113
113
|
@include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
|
|
114
|
-
@include reset-filter
|
|
114
|
+
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
|
|
115
115
|
border-radius: $navbar-border-radius;
|
|
116
116
|
$shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
|
|
117
117
|
@include box-shadow($shadow);
|
|
118
118
|
|
|
119
|
+
.navbar-nav > .open > a,
|
|
119
120
|
.navbar-nav > .active > a {
|
|
120
|
-
@include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
|
|
121
|
+
@include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
|
|
121
122
|
@include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
|
|
122
123
|
}
|
|
123
124
|
}
|
|
@@ -129,10 +130,11 @@
|
|
|
129
130
|
// Inverted navbar
|
|
130
131
|
.navbar-inverse {
|
|
131
132
|
@include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
|
|
132
|
-
@include reset-filter
|
|
133
|
+
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
|
|
133
134
|
|
|
135
|
+
.navbar-nav > .open > a,
|
|
134
136
|
.navbar-nav > .active > a {
|
|
135
|
-
@include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
|
|
137
|
+
@include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
|
|
136
138
|
@include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
|
|
137
139
|
}
|
|
138
140
|
|
|
@@ -149,6 +151,17 @@
|
|
|
149
151
|
border-radius: 0;
|
|
150
152
|
}
|
|
151
153
|
|
|
154
|
+
// Fix active state of dropdown items in collapsed mode
|
|
155
|
+
@media (max-width: $grid-float-breakpoint-max) {
|
|
156
|
+
.navbar .navbar-nav .open .dropdown-menu > .active > a {
|
|
157
|
+
&,
|
|
158
|
+
&:hover,
|
|
159
|
+
&:focus {
|
|
160
|
+
color: #fff;
|
|
161
|
+
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
152
165
|
|
|
153
166
|
|
|
154
167
|
//
|
|
@@ -175,7 +188,6 @@
|
|
|
175
188
|
.alert-danger { @include alert-styles($alert-danger-bg); }
|
|
176
189
|
|
|
177
190
|
|
|
178
|
-
|
|
179
191
|
//
|
|
180
192
|
// Progress bars
|
|
181
193
|
// --------------------------------------------------
|
|
@@ -200,7 +212,7 @@
|
|
|
200
212
|
// Reset the striped class because our mixins don't do multiple gradients and
|
|
201
213
|
// the above custom styles override the new `.progress-bar-striped` in v3.2.0.
|
|
202
214
|
.progress-bar-striped {
|
|
203
|
-
@include gradient-striped
|
|
215
|
+
@include gradient-striped;
|
|
204
216
|
}
|
|
205
217
|
|
|
206
218
|
|
|
@@ -218,8 +230,11 @@
|
|
|
218
230
|
text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
|
|
219
231
|
@include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
|
|
220
232
|
border-color: darken($list-group-active-border, 7.5%);
|
|
221
|
-
}
|
|
222
233
|
|
|
234
|
+
.badge {
|
|
235
|
+
text-shadow: none;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
223
238
|
|
|
224
239
|
|
|
225
240
|
//
|
|
@@ -245,7 +260,6 @@
|
|
|
245
260
|
.panel-danger > .panel-heading { @include panel-heading-styles($panel-danger-heading-bg); }
|
|
246
261
|
|
|
247
262
|
|
|
248
|
-
|
|
249
263
|
//
|
|
250
264
|
// Wells
|
|
251
265
|
// --------------------------------------------------
|
|
@@ -12,11 +12,11 @@
|
|
|
12
12
|
background-color: $thumbnail-bg;
|
|
13
13
|
border: 1px solid $thumbnail-border;
|
|
14
14
|
border-radius: $thumbnail-border-radius;
|
|
15
|
-
@include transition(
|
|
15
|
+
@include transition(border .2s ease-in-out);
|
|
16
16
|
|
|
17
17
|
> img,
|
|
18
18
|
a > img {
|
|
19
|
-
@include img-responsive
|
|
19
|
+
@include img-responsive;
|
|
20
20
|
margin-left: auto;
|
|
21
21
|
margin-right: auto;
|
|
22
22
|
}
|
|
@@ -9,7 +9,10 @@
|
|
|
9
9
|
z-index: $zindex-tooltip;
|
|
10
10
|
display: block;
|
|
11
11
|
visibility: visible;
|
|
12
|
+
// Reset font and text propertes given new insertion method
|
|
13
|
+
font-family: $font-family-base;
|
|
12
14
|
font-size: $font-size-small;
|
|
15
|
+
font-weight: normal;
|
|
13
16
|
line-height: 1.4;
|
|
14
17
|
@include opacity(0);
|
|
15
18
|
|
|
@@ -39,6 +42,7 @@
|
|
|
39
42
|
border-color: transparent;
|
|
40
43
|
border-style: solid;
|
|
41
44
|
}
|
|
45
|
+
// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
|
|
42
46
|
.tooltip {
|
|
43
47
|
&.top .tooltip-arrow {
|
|
44
48
|
bottom: 0;
|
|
@@ -49,13 +53,15 @@
|
|
|
49
53
|
}
|
|
50
54
|
&.top-left .tooltip-arrow {
|
|
51
55
|
bottom: 0;
|
|
52
|
-
|
|
56
|
+
right: $tooltip-arrow-width;
|
|
57
|
+
margin-bottom: -$tooltip-arrow-width;
|
|
53
58
|
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
|
|
54
59
|
border-top-color: $tooltip-arrow-color;
|
|
55
60
|
}
|
|
56
61
|
&.top-right .tooltip-arrow {
|
|
57
62
|
bottom: 0;
|
|
58
|
-
|
|
63
|
+
left: $tooltip-arrow-width;
|
|
64
|
+
margin-bottom: -$tooltip-arrow-width;
|
|
59
65
|
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
|
|
60
66
|
border-top-color: $tooltip-arrow-color;
|
|
61
67
|
}
|
|
@@ -82,13 +88,15 @@
|
|
|
82
88
|
}
|
|
83
89
|
&.bottom-left .tooltip-arrow {
|
|
84
90
|
top: 0;
|
|
85
|
-
|
|
91
|
+
right: $tooltip-arrow-width;
|
|
92
|
+
margin-top: -$tooltip-arrow-width;
|
|
86
93
|
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
|
|
87
94
|
border-bottom-color: $tooltip-arrow-color;
|
|
88
95
|
}
|
|
89
96
|
&.bottom-right .tooltip-arrow {
|
|
90
97
|
top: 0;
|
|
91
|
-
|
|
98
|
+
left: $tooltip-arrow-width;
|
|
99
|
+
margin-top: -$tooltip-arrow-width;
|
|
92
100
|
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
|
|
93
101
|
border-bottom-color: $tooltip-arrow-color;
|
|
94
102
|
}
|
|
@@ -80,11 +80,6 @@ small,
|
|
|
80
80
|
font-size: floor((100% * $font-size-small / $font-size-base));
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
// Undo browser default styling
|
|
84
|
-
cite {
|
|
85
|
-
font-style: normal;
|
|
86
|
-
}
|
|
87
|
-
|
|
88
83
|
mark,
|
|
89
84
|
.mark {
|
|
90
85
|
background-color: $state-warning-bg;
|
|
@@ -163,15 +158,20 @@ ol {
|
|
|
163
158
|
|
|
164
159
|
// List options
|
|
165
160
|
|
|
166
|
-
//
|
|
167
|
-
|
|
161
|
+
// [converter] extracted from `.list-unstyled` for libsass compatibility
|
|
162
|
+
@mixin list-unstyled {
|
|
168
163
|
padding-left: 0;
|
|
169
164
|
list-style: none;
|
|
170
165
|
}
|
|
166
|
+
// [converter] extracted as `@mixin list-unstyled` for libsass compatibility
|
|
167
|
+
.list-unstyled {
|
|
168
|
+
@include list-unstyled;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
171
|
|
|
172
172
|
// Inline turns list items into inline-block
|
|
173
173
|
.list-inline {
|
|
174
|
-
@
|
|
174
|
+
@include list-unstyled;
|
|
175
175
|
margin-left: -5px;
|
|
176
176
|
|
|
177
177
|
> li {
|
|
@@ -204,7 +204,7 @@ dd {
|
|
|
204
204
|
|
|
205
205
|
.dl-horizontal {
|
|
206
206
|
dd {
|
|
207
|
-
@include clearfix
|
|
207
|
+
@include clearfix; // Clear the floated `dt` if an empty `dd` is present
|
|
208
208
|
}
|
|
209
209
|
|
|
210
210
|
@media (min-width: $grid-float-breakpoint) {
|
|
@@ -213,7 +213,7 @@ dd {
|
|
|
213
213
|
width: ($dl-horizontal-offset - 20);
|
|
214
214
|
clear: left;
|
|
215
215
|
text-align: right;
|
|
216
|
-
@include text-overflow
|
|
216
|
+
@include text-overflow;
|
|
217
217
|
}
|
|
218
218
|
dd {
|
|
219
219
|
margin-left: $dl-horizontal-offset;
|
|
@@ -290,12 +290,6 @@ blockquote.pull-right {
|
|
|
290
290
|
}
|
|
291
291
|
}
|
|
292
292
|
|
|
293
|
-
// Quotes
|
|
294
|
-
blockquote:before,
|
|
295
|
-
blockquote:after {
|
|
296
|
-
content: "";
|
|
297
|
-
}
|
|
298
|
-
|
|
299
293
|
// Addresses
|
|
300
294
|
address {
|
|
301
295
|
margin-bottom: $line-height-computed;
|