bootstrap-generators 2.0.1 → 2.0.4
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.
- data/README.md +258 -33
- data/Rakefile +0 -59
- data/lib/bootstrap/generators/engine.rb +6 -1
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/install_generator.rb +10 -2
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +120 -15
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +206 -0
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css +2 -0
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.less +5 -4
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss +3 -2
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css +2 -0
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.less +5 -4
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +3 -2
- data/lib/generators/bootstrap/install/templates/config/initializers/simple_form.rb +3 -0
- 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 +2 -2
- data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb +1 -1
- data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml +1 -1
- data/test/fixtures/application.js +3 -0
- data/test/lib/generators/bootstrap/install_generator_test.rb +4 -3
- data/test/test_helper.rb +8 -1
- data/vendor/assets/images/glyphicons-halflings-white.png +0 -0
- data/vendor/assets/images/glyphicons-halflings.png +0 -0
- data/vendor/assets/javascripts/bootstrap-alert.js +28 -32
- data/vendor/assets/javascripts/bootstrap-button.js +29 -33
- data/vendor/assets/javascripts/bootstrap-carousel.js +33 -21
- data/vendor/assets/javascripts/bootstrap-collapse.js +47 -26
- data/vendor/assets/javascripts/bootstrap-dropdown.js +18 -10
- data/vendor/assets/javascripts/bootstrap-modal.js +25 -17
- data/vendor/assets/javascripts/bootstrap-popover.js +13 -10
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +44 -18
- data/vendor/assets/javascripts/bootstrap-tab.js +12 -7
- data/vendor/assets/javascripts/bootstrap-tooltip.js +40 -35
- data/vendor/assets/javascripts/bootstrap-transition.js +30 -20
- data/vendor/assets/javascripts/bootstrap-typeahead.js +29 -15
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/accordion.less +5 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/alerts.less +2 -14
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/bootstrap.less +2 -2
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/breadcrumbs.less +2 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/button-groups.less +76 -33
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/buttons.less +32 -24
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/carousel.less +0 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/close.less +12 -1
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/code.less +6 -6
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/component-animations.less +7 -5
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/dropdowns.less +58 -45
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/forms.less +205 -144
- data/vendor/twitter/bootstrap/less/grid.less +5 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/hero-unit.less +3 -1
- data/vendor/twitter/bootstrap/less/labels-badges.less +55 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/layouts.less +1 -1
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/mixins.less +235 -179
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/modals.less +13 -6
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/navbar.less +131 -72
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/navs.less +53 -43
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/pager.less +6 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/pagination.less +1 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/popovers.less +0 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/progress-bars.less +27 -5
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/reset.less +8 -3
- data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +26 -0
- data/vendor/twitter/bootstrap/less/responsive-767px-max.less +149 -0
- data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +17 -0
- data/vendor/twitter/bootstrap/less/responsive-navbar.less +153 -0
- data/vendor/twitter/bootstrap/less/responsive-utilities.less +41 -0
- data/vendor/twitter/bootstrap/less/responsive.less +48 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/scaffolding.less +4 -4
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/sprites.less +42 -9
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/tables.less +46 -20
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/thumbnails.less +14 -2
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/tooltip.less +0 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/type.less +27 -13
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/utilities.less +0 -0
- data/vendor/twitter/bootstrap/less/variables.less +206 -0
- data/vendor/{assets/stylesheets → twitter/bootstrap}/less/wells.less +10 -0
- data/vendor/{assets/stylesheets/scss/accordion.scss → twitter/bootstrap/sass/_accordion.scss} +5 -0
- data/vendor/{assets/stylesheets/scss/alerts.scss → twitter/bootstrap/sass/_alerts.scss} +3 -15
- data/vendor/{assets/stylesheets/scss/breadcrumbs.scss → twitter/bootstrap/sass/_breadcrumbs.scss} +2 -0
- data/vendor/{assets/stylesheets/scss/button-groups.scss → twitter/bootstrap/sass/_button-groups.scss} +76 -33
- data/vendor/{assets/stylesheets/scss/buttons.scss → twitter/bootstrap/sass/_buttons.scss} +33 -25
- data/vendor/{assets/stylesheets/scss/carousel.scss → twitter/bootstrap/sass/_carousel.scss} +1 -1
- data/vendor/{assets/stylesheets/scss/close.scss → twitter/bootstrap/sass/_close.scss} +12 -1
- data/vendor/{assets/stylesheets/scss/code.scss → twitter/bootstrap/sass/_code.scss} +7 -7
- data/vendor/{assets/stylesheets/scss/component-animations.scss → twitter/bootstrap/sass/_component-animations.scss} +9 -7
- data/vendor/{assets/stylesheets/scss/dropdowns.scss → twitter/bootstrap/sass/_dropdowns.scss} +58 -45
- data/vendor/{assets/stylesheets/scss/forms.scss → twitter/bootstrap/sass/_forms.scss} +205 -145
- data/vendor/twitter/bootstrap/sass/_grid.scss +5 -0
- data/vendor/{assets/stylesheets/scss/hero-unit.scss → twitter/bootstrap/sass/_hero-unit.scss} +3 -1
- data/vendor/twitter/bootstrap/sass/_labels-badges.scss +52 -0
- data/vendor/{assets/stylesheets/scss/layouts.scss → twitter/bootstrap/sass/_layouts.scss} +2 -2
- data/vendor/{assets/stylesheets/scss/mixins.scss → twitter/bootstrap/sass/_mixins.scss} +246 -182
- data/vendor/{assets/stylesheets/scss/modals.scss → twitter/bootstrap/sass/_modals.scss} +14 -7
- data/vendor/{assets/stylesheets/scss/navbar.scss → twitter/bootstrap/sass/_navbar.scss} +132 -73
- data/vendor/{assets/stylesheets/scss/navs.scss → twitter/bootstrap/sass/_navs.scss} +53 -43
- data/vendor/{assets/stylesheets/scss/pager.scss → twitter/bootstrap/sass/_pager.scss} +6 -0
- data/vendor/{assets/stylesheets/scss/pagination.scss → twitter/bootstrap/sass/_pagination.scss} +1 -0
- data/vendor/{assets/stylesheets/scss/popovers.scss → twitter/bootstrap/sass/_popovers.scss} +0 -0
- data/vendor/{assets/stylesheets/scss/progress-bars.scss → twitter/bootstrap/sass/_progress-bars.scss} +27 -5
- data/vendor/{assets/stylesheets/scss/reset.scss → twitter/bootstrap/sass/_reset.scss} +8 -3
- data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +26 -0
- data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +149 -0
- data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +17 -0
- data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +153 -0
- data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +41 -0
- data/vendor/{assets/stylesheets/scss/scaffolding.scss → twitter/bootstrap/sass/_scaffolding.scss} +4 -4
- data/vendor/{assets/stylesheets/scss/sprites.scss → twitter/bootstrap/sass/_sprites.scss} +40 -7
- data/vendor/{assets/stylesheets/scss/tables.scss → twitter/bootstrap/sass/_tables.scss} +37 -32
- data/vendor/{assets/stylesheets/scss/thumbnails.scss → twitter/bootstrap/sass/_thumbnails.scss} +14 -2
- data/vendor/{assets/stylesheets/scss/tooltip.scss → twitter/bootstrap/sass/_tooltip.scss} +1 -1
- data/vendor/{assets/stylesheets/scss/type.scss → twitter/bootstrap/sass/_type.scss} +27 -13
- data/vendor/{assets/stylesheets/scss/utilities.scss → twitter/bootstrap/sass/_utilities.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/_variables.scss +204 -0
- data/vendor/{assets/stylesheets/scss/wells.scss → twitter/bootstrap/sass/_wells.scss} +10 -0
- data/vendor/{assets/stylesheets/scss → twitter/bootstrap/sass}/bootstrap.scss +3 -3
- data/vendor/twitter/bootstrap/sass/responsive.scss +48 -0
- metadata +93 -84
- data/lib/generators/bootstrap/install/templates/assets/javascripts/bootstrap-generators.js +0 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.less +0 -98
- data/vendor/assets/stylesheets/bootstrap.css +0 -3363
- data/vendor/assets/stylesheets/less/grid.less +0 -8
- data/vendor/assets/stylesheets/less/labels.less +0 -32
- data/vendor/assets/stylesheets/less/responsive.less +0 -327
- data/vendor/assets/stylesheets/less/variables.less +0 -107
- data/vendor/assets/stylesheets/scss/grid.scss +0 -8
- data/vendor/assets/stylesheets/scss/labels.scss +0 -32
- data/vendor/assets/stylesheets/scss/responsive.scss +0 -327
- data/vendor/assets/stylesheets/scss/variables.scss +0 -107
|
File without changes
|
|
@@ -7,20 +7,32 @@
|
|
|
7
7
|
|
|
8
8
|
// Webkit
|
|
9
9
|
@-webkit-keyframes progress-bar-stripes {
|
|
10
|
-
from { background-position:
|
|
11
|
-
to { background-position:
|
|
10
|
+
from { background-position: 40px 0; }
|
|
11
|
+
to { background-position: 0 0; }
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
// Firefox
|
|
15
15
|
@-moz-keyframes progress-bar-stripes {
|
|
16
|
+
from { background-position: 40px 0; }
|
|
17
|
+
to { background-position: 0 0; }
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
// IE9
|
|
21
|
+
@-ms-keyframes progress-bar-stripes {
|
|
22
|
+
from { background-position: 40px 0; }
|
|
23
|
+
to { background-position: 0 0; }
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
// Opera
|
|
27
|
+
@-o-keyframes progress-bar-stripes {
|
|
16
28
|
from { background-position: 0 0; }
|
|
17
29
|
to { background-position: 40px 0; }
|
|
18
30
|
}
|
|
19
31
|
|
|
20
32
|
// Spec
|
|
21
33
|
@keyframes progress-bar-stripes {
|
|
22
|
-
from { background-position:
|
|
23
|
-
to { background-position:
|
|
34
|
+
from { background-position: 40px 0; }
|
|
35
|
+
to { background-position: 0 0; }
|
|
24
36
|
}
|
|
25
37
|
|
|
26
38
|
|
|
@@ -54,7 +66,7 @@
|
|
|
54
66
|
|
|
55
67
|
// Striped bars
|
|
56
68
|
.progress-striped .bar {
|
|
57
|
-
@include gradient-striped(#
|
|
69
|
+
@include gradient-striped(#149bdf);
|
|
58
70
|
@include background-size(40px 40px);
|
|
59
71
|
}
|
|
60
72
|
|
|
@@ -62,6 +74,8 @@
|
|
|
62
74
|
.progress.active .bar {
|
|
63
75
|
-webkit-animation: progress-bar-stripes 2s linear infinite;
|
|
64
76
|
-moz-animation: progress-bar-stripes 2s linear infinite;
|
|
77
|
+
-ms-animation: progress-bar-stripes 2s linear infinite;
|
|
78
|
+
-o-animation: progress-bar-stripes 2s linear infinite;
|
|
65
79
|
animation: progress-bar-stripes 2s linear infinite;
|
|
66
80
|
}
|
|
67
81
|
|
|
@@ -93,3 +107,11 @@
|
|
|
93
107
|
.progress-info.progress-striped .bar {
|
|
94
108
|
@include gradient-striped(#5bc0de);
|
|
95
109
|
}
|
|
110
|
+
|
|
111
|
+
// Warning (orange)
|
|
112
|
+
.progress-warning .bar {
|
|
113
|
+
@include gradient-vertical(lighten($orange, 15%), $orange);
|
|
114
|
+
}
|
|
115
|
+
.progress-warning.progress-striped .bar {
|
|
116
|
+
@include gradient-striped(lighten($orange, 15%));
|
|
117
|
+
}
|
|
@@ -75,12 +75,17 @@ sub {
|
|
|
75
75
|
// -------------------------
|
|
76
76
|
|
|
77
77
|
img {
|
|
78
|
-
max-width: 100%;
|
|
79
|
-
|
|
78
|
+
max-width: 100%; // Make images inherently responsive
|
|
79
|
+
vertical-align: middle;
|
|
80
80
|
border: 0;
|
|
81
81
|
-ms-interpolation-mode: bicubic;
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
+
// Prevent max-width from affecting Google Maps
|
|
85
|
+
#map_canvas img {
|
|
86
|
+
max-width: none;
|
|
87
|
+
}
|
|
88
|
+
|
|
84
89
|
// Forms
|
|
85
90
|
// -------------------------
|
|
86
91
|
|
|
@@ -111,10 +116,10 @@ input[type="submit"] {
|
|
|
111
116
|
-webkit-appearance: button; // Style clickable inputs in iOS
|
|
112
117
|
}
|
|
113
118
|
input[type="search"] { // Appearance in Safari/Chrome
|
|
114
|
-
-webkit-appearance: textfield;
|
|
115
119
|
-webkit-box-sizing: content-box;
|
|
116
120
|
-moz-box-sizing: content-box;
|
|
117
121
|
box-sizing: content-box;
|
|
122
|
+
-webkit-appearance: textfield;
|
|
118
123
|
}
|
|
119
124
|
input[type="search"]::-webkit-search-decoration,
|
|
120
125
|
input[type="search"]::-webkit-search-cancel-button {
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
// LARGE DESKTOP & UP
|
|
2
|
+
// ------------------
|
|
3
|
+
|
|
4
|
+
@media (min-width: 1200px) {
|
|
5
|
+
|
|
6
|
+
// Fixed grid
|
|
7
|
+
@include grid-core(70px, 30px);
|
|
8
|
+
|
|
9
|
+
// Fluid grid
|
|
10
|
+
@include grid-fluid(5.982905983%, 2.564102564%);
|
|
11
|
+
|
|
12
|
+
// Input grid
|
|
13
|
+
@include grid-input(70px, 30px);
|
|
14
|
+
|
|
15
|
+
// Thumbnails
|
|
16
|
+
.thumbnails {
|
|
17
|
+
margin-left: -30px;
|
|
18
|
+
}
|
|
19
|
+
.thumbnails > li {
|
|
20
|
+
margin-left: 30px;
|
|
21
|
+
}
|
|
22
|
+
.row-fluid .thumbnails {
|
|
23
|
+
margin-left: 0;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
}
|
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
// UP TO LANDSCAPE PHONE
|
|
2
|
+
// ---------------------
|
|
3
|
+
|
|
4
|
+
@media (max-width: 480px) {
|
|
5
|
+
|
|
6
|
+
// Smooth out the collapsing/expanding nav
|
|
7
|
+
.nav-collapse {
|
|
8
|
+
-webkit-transform: translate3d(0, 0, 0); // activate the GPU
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
// Block level the page header small tag for readability
|
|
12
|
+
.page-header h1 small {
|
|
13
|
+
display: block;
|
|
14
|
+
line-height: $baseLineHeight;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
// Update checkboxes for iOS
|
|
18
|
+
input[type="checkbox"],
|
|
19
|
+
input[type="radio"] {
|
|
20
|
+
border: 1px solid #ccc;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
// Remove the horizontal form styles
|
|
24
|
+
.form-horizontal .control-group > label {
|
|
25
|
+
float: none;
|
|
26
|
+
width: auto;
|
|
27
|
+
padding-top: 0;
|
|
28
|
+
text-align: left;
|
|
29
|
+
}
|
|
30
|
+
// Move over all input controls and content
|
|
31
|
+
.form-horizontal .controls {
|
|
32
|
+
margin-left: 0;
|
|
33
|
+
}
|
|
34
|
+
// Move the options list down to align with labels
|
|
35
|
+
.form-horizontal .control-list {
|
|
36
|
+
padding-top: 0; // has to be padding because margin collaspes
|
|
37
|
+
}
|
|
38
|
+
// Move over buttons in .form-actions to align with .controls
|
|
39
|
+
.form-horizontal .form-actions {
|
|
40
|
+
padding-left: 10px;
|
|
41
|
+
padding-right: 10px;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// Modals
|
|
45
|
+
.modal {
|
|
46
|
+
position: absolute;
|
|
47
|
+
top: 10px;
|
|
48
|
+
left: 10px;
|
|
49
|
+
right: 10px;
|
|
50
|
+
width: auto;
|
|
51
|
+
margin: 0;
|
|
52
|
+
&.fade.in { top: auto; }
|
|
53
|
+
}
|
|
54
|
+
.modal-header .close {
|
|
55
|
+
padding: 10px;
|
|
56
|
+
margin: -10px;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
// Carousel
|
|
60
|
+
.carousel-caption {
|
|
61
|
+
position: static;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
|
|
69
|
+
// --------------------------------------------------
|
|
70
|
+
|
|
71
|
+
@media (max-width: 767px) {
|
|
72
|
+
|
|
73
|
+
// Padding to set content in a bit
|
|
74
|
+
body {
|
|
75
|
+
padding-left: 20px;
|
|
76
|
+
padding-right: 20px;
|
|
77
|
+
}
|
|
78
|
+
// Negative indent the now static "fixed" navbar
|
|
79
|
+
.navbar-fixed-top,
|
|
80
|
+
.navbar-fixed-bottom {
|
|
81
|
+
margin-left: -20px;
|
|
82
|
+
margin-right: -20px;
|
|
83
|
+
}
|
|
84
|
+
// Remove padding on container given explicit padding set on body
|
|
85
|
+
.container-fluid {
|
|
86
|
+
padding: 0;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
// TYPOGRAPHY
|
|
90
|
+
// ----------
|
|
91
|
+
// Reset horizontal dl
|
|
92
|
+
.dl-horizontal {
|
|
93
|
+
dt {
|
|
94
|
+
float: none;
|
|
95
|
+
clear: none;
|
|
96
|
+
width: auto;
|
|
97
|
+
text-align: left;
|
|
98
|
+
}
|
|
99
|
+
dd {
|
|
100
|
+
margin-left: 0;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
// GRID & CONTAINERS
|
|
105
|
+
// -----------------
|
|
106
|
+
// Remove width from containers
|
|
107
|
+
.container {
|
|
108
|
+
width: auto;
|
|
109
|
+
}
|
|
110
|
+
// Fluid rows
|
|
111
|
+
.row-fluid {
|
|
112
|
+
width: 100%;
|
|
113
|
+
}
|
|
114
|
+
// Undo negative margin on rows and thumbnails
|
|
115
|
+
.row,
|
|
116
|
+
.thumbnails {
|
|
117
|
+
margin-left: 0;
|
|
118
|
+
}
|
|
119
|
+
// Make all grid-sized elements block level again
|
|
120
|
+
[class*="span"],
|
|
121
|
+
.row-fluid [class*="span"] {
|
|
122
|
+
float: none;
|
|
123
|
+
display: block;
|
|
124
|
+
width: auto;
|
|
125
|
+
margin-left: 0;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
// FORM FIELDS
|
|
129
|
+
// -----------
|
|
130
|
+
// Make span* classes full width
|
|
131
|
+
.input-large,
|
|
132
|
+
.input-xlarge,
|
|
133
|
+
.input-xxlarge,
|
|
134
|
+
input[class*="span"],
|
|
135
|
+
select[class*="span"],
|
|
136
|
+
textarea[class*="span"],
|
|
137
|
+
.uneditable-input {
|
|
138
|
+
@include input-block-level();
|
|
139
|
+
}
|
|
140
|
+
// But don't let it screw up prepend/append inputs
|
|
141
|
+
.input-prepend input,
|
|
142
|
+
.input-append input,
|
|
143
|
+
.input-prepend input[class*="span"],
|
|
144
|
+
.input-append input[class*="span"] {
|
|
145
|
+
display: inline-block; // redeclare so they don't wrap to new lines
|
|
146
|
+
width: auto;
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
// PORTRAIT TABLET TO DEFAULT DESKTOP
|
|
2
|
+
// ----------------------------------
|
|
3
|
+
|
|
4
|
+
@media (min-width: 768px) and (max-width: 979px) {
|
|
5
|
+
|
|
6
|
+
// Fixed grid
|
|
7
|
+
@include grid-core(42px, 20px);
|
|
8
|
+
|
|
9
|
+
// Fluid grid
|
|
10
|
+
@include grid-fluid(5.801104972%, 2.762430939%);
|
|
11
|
+
|
|
12
|
+
// Input grid
|
|
13
|
+
@include grid-input(42px, 20px);
|
|
14
|
+
|
|
15
|
+
// No need to reset .thumbnails here since it's the same @gridGutterWidth
|
|
16
|
+
|
|
17
|
+
}
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
// TABLETS AND BELOW
|
|
2
|
+
// -----------------
|
|
3
|
+
@media (max-width: 979px) {
|
|
4
|
+
|
|
5
|
+
// UNFIX THE TOPBAR
|
|
6
|
+
// ----------------
|
|
7
|
+
// Remove any padding from the body
|
|
8
|
+
body {
|
|
9
|
+
padding-top: 0;
|
|
10
|
+
}
|
|
11
|
+
// Unfix the navbar
|
|
12
|
+
.navbar-fixed-top,
|
|
13
|
+
.navbar-fixed-bottom {
|
|
14
|
+
position: static;
|
|
15
|
+
}
|
|
16
|
+
.navbar-fixed-top {
|
|
17
|
+
margin-bottom: $baseLineHeight;
|
|
18
|
+
}
|
|
19
|
+
.navbar-fixed-bottom {
|
|
20
|
+
margin-top: $baseLineHeight;
|
|
21
|
+
}
|
|
22
|
+
.navbar-fixed-top .navbar-inner,
|
|
23
|
+
.navbar-fixed-bottom .navbar-inner {
|
|
24
|
+
padding: 5px;
|
|
25
|
+
}
|
|
26
|
+
.navbar .container {
|
|
27
|
+
width: auto;
|
|
28
|
+
padding: 0;
|
|
29
|
+
}
|
|
30
|
+
// Account for brand name
|
|
31
|
+
.navbar .brand {
|
|
32
|
+
padding-left: 10px;
|
|
33
|
+
padding-right: 10px;
|
|
34
|
+
margin: 0 0 0 -5px;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// COLLAPSIBLE NAVBAR
|
|
38
|
+
// ------------------
|
|
39
|
+
// Nav collapse clears brand
|
|
40
|
+
.nav-collapse {
|
|
41
|
+
clear: both;
|
|
42
|
+
}
|
|
43
|
+
// Block-level the nav
|
|
44
|
+
.nav-collapse .nav {
|
|
45
|
+
float: none;
|
|
46
|
+
margin: 0 0 ($baseLineHeight / 2);
|
|
47
|
+
}
|
|
48
|
+
.nav-collapse .nav > li {
|
|
49
|
+
float: none;
|
|
50
|
+
}
|
|
51
|
+
.nav-collapse .nav > li > a {
|
|
52
|
+
margin-bottom: 2px;
|
|
53
|
+
}
|
|
54
|
+
.nav-collapse .nav > .divider-vertical {
|
|
55
|
+
display: none;
|
|
56
|
+
}
|
|
57
|
+
.nav-collapse .nav .nav-header {
|
|
58
|
+
color: $navbarText;
|
|
59
|
+
text-shadow: none;
|
|
60
|
+
}
|
|
61
|
+
// Nav and dropdown links in navbar
|
|
62
|
+
.nav-collapse .nav > li > a,
|
|
63
|
+
.nav-collapse .dropdown-menu a {
|
|
64
|
+
padding: 6px 15px;
|
|
65
|
+
font-weight: bold;
|
|
66
|
+
color: $navbarLinkColor;
|
|
67
|
+
@include border-radius(3px);
|
|
68
|
+
}
|
|
69
|
+
// Buttons
|
|
70
|
+
.nav-collapse .btn {
|
|
71
|
+
padding: 4px 10px 4px;
|
|
72
|
+
font-weight: normal;
|
|
73
|
+
@include border-radius(4px);
|
|
74
|
+
}
|
|
75
|
+
.nav-collapse .dropdown-menu li + li a {
|
|
76
|
+
margin-bottom: 2px;
|
|
77
|
+
}
|
|
78
|
+
.nav-collapse .nav > li > a:hover,
|
|
79
|
+
.nav-collapse .dropdown-menu a:hover {
|
|
80
|
+
background-color: $navbarBackground;
|
|
81
|
+
}
|
|
82
|
+
// Buttons in the navbar
|
|
83
|
+
.nav-collapse.in .btn-group {
|
|
84
|
+
margin-top: 5px;
|
|
85
|
+
padding: 0;
|
|
86
|
+
}
|
|
87
|
+
// Dropdowns in the navbar
|
|
88
|
+
.nav-collapse .dropdown-menu {
|
|
89
|
+
position: static;
|
|
90
|
+
top: auto;
|
|
91
|
+
left: auto;
|
|
92
|
+
float: none;
|
|
93
|
+
display: block;
|
|
94
|
+
max-width: none;
|
|
95
|
+
margin: 0 15px;
|
|
96
|
+
padding: 0;
|
|
97
|
+
background-color: transparent;
|
|
98
|
+
border: none;
|
|
99
|
+
@include border-radius(0);
|
|
100
|
+
@include box-shadow(none);
|
|
101
|
+
}
|
|
102
|
+
.nav-collapse .dropdown-menu:before,
|
|
103
|
+
.nav-collapse .dropdown-menu:after {
|
|
104
|
+
display: none;
|
|
105
|
+
}
|
|
106
|
+
.nav-collapse .dropdown-menu .divider {
|
|
107
|
+
display: none;
|
|
108
|
+
}
|
|
109
|
+
// Forms in navbar
|
|
110
|
+
.nav-collapse .navbar-form,
|
|
111
|
+
.nav-collapse .navbar-search {
|
|
112
|
+
float: none;
|
|
113
|
+
padding: ($baseLineHeight / 2) 15px;
|
|
114
|
+
margin: ($baseLineHeight / 2) 0;
|
|
115
|
+
border-top: 1px solid $navbarBackground;
|
|
116
|
+
border-bottom: 1px solid $navbarBackground;
|
|
117
|
+
@include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)});
|
|
118
|
+
}
|
|
119
|
+
// Pull right (secondary) nav content
|
|
120
|
+
.navbar .nav-collapse .nav.pull-right {
|
|
121
|
+
float: none;
|
|
122
|
+
margin-left: 0;
|
|
123
|
+
}
|
|
124
|
+
// Hide everything in the navbar save .brand and toggle button */
|
|
125
|
+
.nav-collapse,
|
|
126
|
+
.nav-collapse.collapse {
|
|
127
|
+
overflow: hidden;
|
|
128
|
+
height: 0;
|
|
129
|
+
}
|
|
130
|
+
// Navbar button
|
|
131
|
+
.navbar .btn-navbar {
|
|
132
|
+
display: block;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
// STATIC NAVBAR
|
|
136
|
+
// -------------
|
|
137
|
+
.navbar-static .navbar-inner {
|
|
138
|
+
padding-left: 10px;
|
|
139
|
+
padding-right: 10px;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
|
|
144
|
+
// DEFAULT DESKTOP
|
|
145
|
+
// ---------------
|
|
146
|
+
|
|
147
|
+
// Required to make the collapsing navbar work on regular desktops
|
|
148
|
+
@media (min-width: 980px) {
|
|
149
|
+
.nav-collapse.collapse {
|
|
150
|
+
height: auto !important;
|
|
151
|
+
overflow: visible !important;
|
|
152
|
+
}
|
|
153
|
+
}
|