bootstrap-sass-rails 2.0.1.2 → 2.0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/bootstrap/sass/rails/version.rb +1 -1
- data/test/cases/usage_css_spec.rb +1 -0
- data/test/dummy/log/test.log +76 -0
- data/test/dummy/tmp/cache/assets/C29/E80/sprockets%2F8f076727207424919c7170c7157bbe37 +0 -0
- data/test/dummy/tmp/cache/assets/D04/3C0/sprockets%2F29d763bd40cc25622b1f04b876a5c3e3 +0 -0
- data/test/dummy/tmp/cache/assets/D3F/FA0/sprockets%2F22c8366fdbaaa2872b202dfe7376629f +0 -0
- data/test/dummy/tmp/cache/assets/D7C/3E0/sprockets%2F53c81ab87ec56a748428a59da9a5d5de +0 -0
- data/test/dummy/tmp/cache/assets/E3A/D90/sprockets%2Fce0dbefdb4416ebc42589ecdbf7d7857 +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_accordion.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_alerts.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_badges.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_breadcrumbs.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_button-groups.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_buttons.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_carousel.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_close.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_code.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_component-animations.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_dropdowns.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_forms.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_grid.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_hero-unit.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_labels.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_layouts.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_mixins.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_modals.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_navbar.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_navs.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_pager.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_pagination.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_popovers.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_progress-bars.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_reset.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_scaffolding.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_sprites.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_tables.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_thumbnails.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_tooltip.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_type.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_utilities.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_variables.scssc +0 -0
- data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_wells.scssc +0 -0
- data/test/dummy/tmp/cache/sass/766526f7d87ffdf0401dde0ec8d49f976470392d/bootstrap.css.scssc +0 -0
- data/test/dummy/tmp/cache/sass/95eca8acb76bbb914a4c6988012b73e61e9bcc23/application.css.scssc +0 -0
- data/test/dummy/tmp/cache/sass/95eca8acb76bbb914a4c6988012b73e61e9bcc23/individual.css.scssc +0 -0
- data/vendor/assets/javascripts/twitter/bootstrap/alert.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/button.js +4 -2
- data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +7 -3
- data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +4 -2
- data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/modal.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/popover.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/tab.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/transition.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +7 -7
- data/vendor/assets/stylesheets/twitter/bootstrap.css.scss +2 -1
- data/vendor/assets/stylesheets/twitter/bootstrap/_alerts.scss +2 -13
- data/vendor/assets/stylesheets/twitter/bootstrap/_badges.scss +36 -0
- data/vendor/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +2 -0
- data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss +31 -8
- data/vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss +17 -13
- data/vendor/assets/stylesheets/twitter/bootstrap/_code.scss +3 -3
- data/vendor/assets/stylesheets/twitter/bootstrap/_component-animations.scss +3 -1
- data/vendor/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +45 -28
- data/vendor/assets/stylesheets/twitter/bootstrap/_forms.scss +76 -43
- data/vendor/assets/stylesheets/twitter/bootstrap/_grid.scss +2 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_hero-unit.scss +3 -1
- data/vendor/assets/stylesheets/twitter/bootstrap/_labels.scss +8 -2
- data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss +162 -158
- data/vendor/assets/stylesheets/twitter/bootstrap/_modals.scss +12 -5
- data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss +76 -34
- data/vendor/assets/stylesheets/twitter/bootstrap/_navs.scss +19 -9
- data/vendor/assets/stylesheets/twitter/bootstrap/_pager.scss +6 -0
- data/vendor/assets/stylesheets/twitter/bootstrap/_pagination.scss +1 -0
- data/vendor/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +16 -1
- data/vendor/assets/stylesheets/twitter/bootstrap/_reset.scss +1 -1
- data/vendor/assets/stylesheets/twitter/bootstrap/_responsive.scss +72 -28
- data/vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +3 -3
- data/vendor/assets/stylesheets/twitter/bootstrap/_sprites.scss +1 -1
- data/vendor/assets/stylesheets/twitter/bootstrap/_tables.scss +26 -17
- data/vendor/assets/stylesheets/twitter/bootstrap/_type.scss +21 -5
- data/vendor/assets/stylesheets/twitter/bootstrap/_variables.scss +98 -6
- data/vendor/assets/stylesheets/twitter/bootstrap/_wells.scss +10 -0
- metadata +14 -11
@@ -0,0 +1,36 @@
|
|
1
|
+
// BADGES
|
2
|
+
// ------
|
3
|
+
|
4
|
+
// Base
|
5
|
+
.badge {
|
6
|
+
padding: 1px 9px 2px;
|
7
|
+
font-size: $baseFontSize * .925;
|
8
|
+
font-weight: bold;
|
9
|
+
white-space: nowrap;
|
10
|
+
color: $white;
|
11
|
+
background-color: $grayLight;
|
12
|
+
@include border-radius(9px);
|
13
|
+
}
|
14
|
+
|
15
|
+
// Hover state
|
16
|
+
.badge:hover {
|
17
|
+
color: $white;
|
18
|
+
text-decoration: none;
|
19
|
+
cursor: pointer;
|
20
|
+
}
|
21
|
+
|
22
|
+
// Colors
|
23
|
+
.badge-error { background-color: $errorText; }
|
24
|
+
.badge-error:hover { background-color: darken($errorText, 10%); }
|
25
|
+
|
26
|
+
.badge-warning { background-color: $orange; }
|
27
|
+
.badge-warning:hover { background-color: darken($orange, 10%); }
|
28
|
+
|
29
|
+
.badge-success { background-color: $successText; }
|
30
|
+
.badge-success:hover { background-color: darken($successText, 10%); }
|
31
|
+
|
32
|
+
.badge-info { background-color: $infoText; }
|
33
|
+
.badge-info:hover { background-color: darken($infoText, 10%); }
|
34
|
+
|
35
|
+
.badge-inverse { background-color: $grayDark; }
|
36
|
+
.badge-inverse:hover { background-color: darken($grayDark, 10%); }
|
@@ -4,12 +4,14 @@
|
|
4
4
|
.breadcrumb {
|
5
5
|
padding: 7px 14px;
|
6
6
|
margin: 0 0 $baseLineHeight;
|
7
|
+
list-style: none;
|
7
8
|
@include gradient-vertical($white, #f5f5f5);
|
8
9
|
border: 1px solid #ddd;
|
9
10
|
@include border-radius(3px);
|
10
11
|
@include box-shadow(inset 0 1px 0 $white);
|
11
12
|
li {
|
12
13
|
display: inline-block;
|
14
|
+
@include ie7-inline-block();
|
13
15
|
text-shadow: 0 1px 0 $white;
|
14
16
|
}
|
15
17
|
.divider {
|
@@ -95,8 +95,22 @@
|
|
95
95
|
padding-right: 8px;
|
96
96
|
$shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
|
97
97
|
@include box-shadow($shadow);
|
98
|
-
*padding-top:
|
99
|
-
*padding-bottom:
|
98
|
+
*padding-top: 3px;
|
99
|
+
*padding-bottom: 3px;
|
100
|
+
}
|
101
|
+
.btn-group .btn-mini.dropdown-toggle {
|
102
|
+
padding-left: 5px;
|
103
|
+
padding-right: 5px;
|
104
|
+
*padding-top: 1px;
|
105
|
+
*padding-bottom: 1px;
|
106
|
+
}
|
107
|
+
.btn-group .btn-small.dropdown-toggle {
|
108
|
+
*padding-top: 4px;
|
109
|
+
*padding-bottom: 4px;
|
110
|
+
}
|
111
|
+
.btn-group .btn-large.dropdown-toggle {
|
112
|
+
padding-left: 12px;
|
113
|
+
padding-right: 12px;
|
100
114
|
}
|
101
115
|
|
102
116
|
.btn-group.open {
|
@@ -127,22 +141,31 @@
|
|
127
141
|
.open.btn-group .caret {
|
128
142
|
@include opacity(100);
|
129
143
|
}
|
144
|
+
// Carets in other button sizes
|
145
|
+
.btn-mini .caret {
|
146
|
+
margin-top: 5px;
|
147
|
+
}
|
148
|
+
.btn-small .caret {
|
149
|
+
margin-top: 6px;
|
150
|
+
}
|
151
|
+
.btn-large .caret {
|
152
|
+
margin-top: 6px;
|
153
|
+
border-left: 5px solid transparent;
|
154
|
+
border-right: 5px solid transparent;
|
155
|
+
border-top: 5px solid $black;
|
156
|
+
}
|
130
157
|
|
131
158
|
|
132
159
|
// Account for other colors
|
133
160
|
.btn-primary,
|
161
|
+
.btn-warning,
|
134
162
|
.btn-danger,
|
135
163
|
.btn-info,
|
136
164
|
.btn-success,
|
137
165
|
.btn-inverse {
|
138
166
|
.caret {
|
139
167
|
border-top-color: $white;
|
168
|
+
border-bottom-color: $white;
|
140
169
|
@include opacity(75);
|
141
170
|
}
|
142
171
|
}
|
143
|
-
|
144
|
-
// Small button dropdowns
|
145
|
-
.btn-small .caret {
|
146
|
-
margin-top: 4px;
|
147
|
-
}
|
148
|
-
|
@@ -8,6 +8,7 @@
|
|
8
8
|
// Core
|
9
9
|
.btn {
|
10
10
|
display: inline-block;
|
11
|
+
@include ie7-inline-block();
|
11
12
|
padding: 4px 10px 4px;
|
12
13
|
margin-bottom: 0; // For input.btn
|
13
14
|
font-size: $baseFontSize;
|
@@ -17,16 +18,15 @@
|
|
17
18
|
text-shadow: 0 1px 1px rgba(255,255,255,.75);
|
18
19
|
@include gradient-vertical-three-colors($white, $white, 25%, darken($white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
|
19
20
|
vertical-align: middle;
|
20
|
-
@include buttonBackground($
|
21
|
-
border: 1px solid
|
22
|
-
border-bottom-color:
|
21
|
+
@include buttonBackground($btnBackground, $btnBackgroundHighlight);
|
22
|
+
border: 1px solid $btnBorder;
|
23
|
+
border-bottom-color: darken($btnBorder, 10%);
|
23
24
|
@include border-radius(4px);
|
24
25
|
$shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
|
25
26
|
@include box-shadow($shadow);
|
26
27
|
cursor: pointer;
|
27
28
|
|
28
29
|
// Give IE7 some love
|
29
|
-
@include reset-filter();
|
30
30
|
@include ie7-restore-left-whitespace();
|
31
31
|
}
|
32
32
|
|
@@ -127,34 +127,34 @@
|
|
127
127
|
.btn-danger.active,
|
128
128
|
.btn-success.active,
|
129
129
|
.btn-info.active,
|
130
|
-
.btn-
|
130
|
+
.btn-inverse.active {
|
131
131
|
color: rgba(255,255,255,.75);
|
132
132
|
}
|
133
133
|
|
134
134
|
// Set the backgrounds
|
135
135
|
// -------------------------
|
136
136
|
.btn-primary {
|
137
|
-
@include buttonBackground($
|
137
|
+
@include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
|
138
138
|
}
|
139
139
|
// Warning appears are orange
|
140
140
|
.btn-warning {
|
141
|
-
@include buttonBackground(
|
141
|
+
@include buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
|
142
142
|
}
|
143
143
|
// Danger and error appear as red
|
144
144
|
.btn-danger {
|
145
|
-
@include buttonBackground(
|
145
|
+
@include buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
|
146
146
|
}
|
147
147
|
// Success appears as green
|
148
148
|
.btn-success {
|
149
|
-
@include buttonBackground(
|
149
|
+
@include buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
|
150
150
|
}
|
151
151
|
// Info appears as a neutral blue
|
152
152
|
.btn-info {
|
153
|
-
@include buttonBackground(
|
153
|
+
@include buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
|
154
154
|
}
|
155
155
|
// Inverse appears as dark gray
|
156
156
|
.btn-inverse {
|
157
|
-
@include buttonBackground(
|
157
|
+
@include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
|
158
158
|
}
|
159
159
|
|
160
160
|
|
@@ -173,12 +173,16 @@ input[type="submit"].btn {
|
|
173
173
|
// IE7 has some default padding on button controls
|
174
174
|
*padding-top: 2px;
|
175
175
|
*padding-bottom: 2px;
|
176
|
-
&.large {
|
176
|
+
&.btn-large {
|
177
177
|
*padding-top: 7px;
|
178
178
|
*padding-bottom: 7px;
|
179
179
|
}
|
180
|
-
&.small {
|
180
|
+
&.btn-small {
|
181
181
|
*padding-top: 3px;
|
182
182
|
*padding-bottom: 3px;
|
183
183
|
}
|
184
|
+
&.btn-mini {
|
185
|
+
*padding-top: 1px;
|
186
|
+
*padding-bottom: 1px;
|
187
|
+
}
|
184
188
|
}
|
@@ -14,7 +14,7 @@ pre {
|
|
14
14
|
|
15
15
|
// Inline code
|
16
16
|
code {
|
17
|
-
padding:
|
17
|
+
padding: 2px 4px;
|
18
18
|
color: #d14;
|
19
19
|
background-color: #f7f7f9;
|
20
20
|
border: 1px solid #e1e1e8;
|
@@ -25,7 +25,7 @@ pre {
|
|
25
25
|
display: block;
|
26
26
|
padding: ($baseLineHeight - 1) / 2;
|
27
27
|
margin: 0 0 $baseLineHeight / 2;
|
28
|
-
font-size: 12px
|
28
|
+
font-size: $baseFontSize * .925; // 13px to 12px
|
29
29
|
line-height: $baseLineHeight;
|
30
30
|
background-color: #f5f5f5;
|
31
31
|
border: 1px solid #ccc; // fallback for IE7-8
|
@@ -54,4 +54,4 @@ pre {
|
|
54
54
|
.pre-scrollable {
|
55
55
|
max-height: 340px;
|
56
56
|
overflow-y: scroll;
|
57
|
-
}
|
57
|
+
}
|
@@ -13,22 +13,21 @@
|
|
13
13
|
.open .dropdown-toggle {
|
14
14
|
outline: 0;
|
15
15
|
}
|
16
|
+
|
16
17
|
// Dropdown arrow/caret
|
18
|
+
// --------------------
|
17
19
|
.caret {
|
18
20
|
display: inline-block;
|
19
21
|
width: 0;
|
20
22
|
height: 0;
|
21
|
-
text-indent: -99999px;
|
22
|
-
// IE7 won't do the border trick if there's a text indent, but it doesn't
|
23
|
-
// do the content that text-indent is hiding, either, so we're ok.
|
24
|
-
*text-indent: 0;
|
25
23
|
vertical-align: top;
|
26
24
|
border-left: 4px solid transparent;
|
27
25
|
border-right: 4px solid transparent;
|
28
26
|
border-top: 4px solid $black;
|
29
27
|
@include opacity(30);
|
30
|
-
content: "
|
28
|
+
content: "";
|
31
29
|
}
|
30
|
+
// Place the caret
|
32
31
|
.dropdown .caret {
|
33
32
|
margin-top: 8px;
|
34
33
|
margin-left: 2px;
|
@@ -37,7 +36,9 @@
|
|
37
36
|
.open.dropdown .caret {
|
38
37
|
@include opacity(100);
|
39
38
|
}
|
39
|
+
|
40
40
|
// The dropdown menu (ul)
|
41
|
+
// ----------------------
|
41
42
|
.dropdown-menu {
|
42
43
|
position: absolute;
|
43
44
|
top: 100%;
|
@@ -46,11 +47,10 @@
|
|
46
47
|
float: left;
|
47
48
|
display: none; // none by default, but block on "open" of the menu
|
48
49
|
min-width: 160px;
|
49
|
-
_width: 160px;
|
50
50
|
padding: 4px 0;
|
51
51
|
margin: 0; // override default ul
|
52
52
|
list-style: none;
|
53
|
-
background-color: $
|
53
|
+
background-color: $dropdownBackground;
|
54
54
|
border-color: #ccc;
|
55
55
|
border-color: rgba(0,0,0,.2);
|
56
56
|
border-style: solid;
|
@@ -63,27 +63,15 @@
|
|
63
63
|
*border-right-width: 2px;
|
64
64
|
*border-bottom-width: 2px;
|
65
65
|
|
66
|
-
//
|
67
|
-
&.
|
68
|
-
|
69
|
-
|
70
|
-
margin-bottom: 2px;
|
66
|
+
// Aligns the dropdown menu to right
|
67
|
+
&.pull-right {
|
68
|
+
right: 0;
|
69
|
+
left: auto;
|
71
70
|
}
|
72
71
|
|
73
|
-
|
72
|
+
// Dividers (basically an hr) within the dropdown
|
74
73
|
.divider {
|
75
|
-
|
76
|
-
margin: 5px 1px;
|
77
|
-
overflow: hidden;
|
78
|
-
background-color: #e5e5e5;
|
79
|
-
border-bottom: 1px solid $white;
|
80
|
-
|
81
|
-
// IE7 needs a set width since we gave a height. Restricting just
|
82
|
-
// to IE7 to keep the 1px left/right space in other browsers.
|
83
|
-
// It is unclear where IE is getting the extra space that we need
|
84
|
-
// to negative-margin away, but so it goes.
|
85
|
-
*width: 100%;
|
86
|
-
*margin: -5px 0 5px;
|
74
|
+
@include nav-divider();
|
87
75
|
}
|
88
76
|
|
89
77
|
// Links within the dropdown menu
|
@@ -93,21 +81,23 @@
|
|
93
81
|
clear: both;
|
94
82
|
font-weight: normal;
|
95
83
|
line-height: $baseLineHeight;
|
96
|
-
color: $
|
84
|
+
color: $dropdownLinkColor;
|
97
85
|
white-space: nowrap;
|
98
86
|
}
|
99
87
|
}
|
100
88
|
|
101
89
|
// Hover state
|
90
|
+
// -----------
|
102
91
|
.dropdown-menu li > a:hover,
|
103
92
|
.dropdown-menu .active > a,
|
104
93
|
.dropdown-menu .active > a:hover {
|
105
|
-
color: $
|
94
|
+
color: $dropdownLinkColorHover;
|
106
95
|
text-decoration: none;
|
107
|
-
background-color: $
|
96
|
+
background-color: $dropdownLinkBackgroundHover;
|
108
97
|
}
|
109
98
|
|
110
99
|
// Open state for the dropdown
|
100
|
+
// ---------------------------
|
111
101
|
.dropdown.open {
|
112
102
|
// IE7's z-index only goes to the nearest positioned ancestor, which would
|
113
103
|
// make the menu appear below buttons that appeared later on the page
|
@@ -123,7 +113,34 @@
|
|
123
113
|
}
|
124
114
|
}
|
125
115
|
|
116
|
+
// Right aligned dropdowns
|
117
|
+
.pull-right .dropdown-menu {
|
118
|
+
left: auto;
|
119
|
+
right: 0;
|
120
|
+
}
|
121
|
+
|
122
|
+
// Allow for dropdowns to go bottom up (aka, dropup-menu)
|
123
|
+
// ------------------------------------------------------
|
124
|
+
// Just add .dropup after the standard .dropdown class and you're set, bro.
|
125
|
+
// TODO: abstract this so that the navbar fixed styles are not placed here?
|
126
|
+
.dropup,
|
127
|
+
.navbar-fixed-bottom .dropdown {
|
128
|
+
// Reverse the caret
|
129
|
+
.caret {
|
130
|
+
border-top: 0;
|
131
|
+
border-bottom: 4px solid $black;
|
132
|
+
content: "\2191";
|
133
|
+
}
|
134
|
+
// Different positioning for bottom up menu
|
135
|
+
.dropdown-menu {
|
136
|
+
top: auto;
|
137
|
+
bottom: 100%;
|
138
|
+
margin-bottom: 1px;
|
139
|
+
}
|
140
|
+
}
|
141
|
+
|
126
142
|
// Typeahead
|
143
|
+
// ---------
|
127
144
|
.typeahead {
|
128
145
|
margin-top: 2px; // give it some space to breathe
|
129
146
|
@include border-radius(4px);
|
@@ -48,6 +48,7 @@ input,
|
|
48
48
|
button,
|
49
49
|
select,
|
50
50
|
textarea {
|
51
|
+
// TODO: MOJ - check baseFontFamily
|
51
52
|
@include font-sans-serif($baseFontSize,normal,$baseLineHeight); // And only set font-family here for those that need it (note the missing label element)
|
52
53
|
}
|
53
54
|
|
@@ -71,7 +72,7 @@ select,
|
|
71
72
|
font-size: $baseFontSize;
|
72
73
|
line-height: $baseLineHeight;
|
73
74
|
color: $gray;
|
74
|
-
border: 1px solid
|
75
|
+
border: 1px solid $inputBorder;
|
75
76
|
@include border-radius(3px);
|
76
77
|
}
|
77
78
|
.uneditable-textarea {
|
@@ -110,7 +111,7 @@ input[type="file"] {
|
|
110
111
|
padding: initial;
|
111
112
|
line-height: initial;
|
112
113
|
border: initial;
|
113
|
-
background-color: $
|
114
|
+
background-color: $inputBackground;
|
114
115
|
background-color: initial;
|
115
116
|
@include box-shadow(none);
|
116
117
|
}
|
@@ -139,7 +140,7 @@ input[type="file"] {
|
|
139
140
|
// Chrome on Linux and Mobile Safari need background-color
|
140
141
|
select {
|
141
142
|
width: 220px; // default input width + 10px of padding that doesn't get applied
|
142
|
-
background-color: $
|
143
|
+
background-color: $inputBackground;
|
143
144
|
}
|
144
145
|
|
145
146
|
// Make multiple select elements height not fixed
|
@@ -253,7 +254,7 @@ textarea[class*="span"],
|
|
253
254
|
// GRID SIZING FOR INPUTS
|
254
255
|
// ----------------------
|
255
256
|
|
256
|
-
@include
|
257
|
+
@include grid-input($gridColumnWidth, $gridGutterWidth);
|
257
258
|
|
258
259
|
|
259
260
|
|
@@ -268,7 +269,7 @@ textarea[disabled],
|
|
268
269
|
input[readonly],
|
269
270
|
select[readonly],
|
270
271
|
textarea[readonly] {
|
271
|
-
background-color:
|
272
|
+
background-color: $inputDisabledBackground;
|
272
273
|
border-color: #ddd;
|
273
274
|
cursor: not-allowed;
|
274
275
|
}
|
@@ -314,14 +315,15 @@ select:focus:required:invalid {
|
|
314
315
|
padding: ($baseLineHeight - 1) 20px $baseLineHeight;
|
315
316
|
margin-top: $baseLineHeight;
|
316
317
|
margin-bottom: $baseLineHeight;
|
317
|
-
background-color:
|
318
|
+
background-color: $grayLighter;
|
318
319
|
border-top: 1px solid #ddd;
|
320
|
+
@include clearfix(); // Adding clearfix to allow for .pull-right button containers
|
319
321
|
}
|
320
322
|
|
321
323
|
// For text that needs to appear as an input but should not be an input
|
322
324
|
.uneditable-input {
|
323
325
|
display: block;
|
324
|
-
background-color: $
|
326
|
+
background-color: $inputBackground;
|
325
327
|
border-color: #eee;
|
326
328
|
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
|
327
329
|
cursor: not-allowed;
|
@@ -335,17 +337,19 @@ select:focus:required:invalid {
|
|
335
337
|
// HELP TEXT
|
336
338
|
// ---------
|
337
339
|
|
340
|
+
.help-block,
|
341
|
+
.help-inline {
|
342
|
+
color: $gray; // lighten the text some for contrast
|
343
|
+
}
|
344
|
+
|
338
345
|
.help-block {
|
339
346
|
display: block; // account for any element using help-block
|
340
|
-
margin-
|
341
|
-
margin-bottom: 0;
|
342
|
-
color: $grayLight;
|
347
|
+
margin-bottom: $baseLineHeight / 2;
|
343
348
|
}
|
344
349
|
|
345
350
|
.help-inline {
|
346
351
|
display: inline-block;
|
347
352
|
@include ie7-inline-block();
|
348
|
-
margin-bottom: 9px;
|
349
353
|
vertical-align: middle;
|
350
354
|
padding-left: 5px;
|
351
355
|
}
|
@@ -359,9 +363,10 @@ select:focus:required:invalid {
|
|
359
363
|
.input-prepend,
|
360
364
|
.input-append {
|
361
365
|
margin-bottom: 5px;
|
362
|
-
@include clearfix(); // Clear the float to prevent wrapping
|
363
366
|
input,
|
367
|
+
select,
|
364
368
|
.uneditable-input {
|
369
|
+
*margin-left: 0;
|
365
370
|
@include border-radius(0 3px 3px 0);
|
366
371
|
&:focus {
|
367
372
|
position: relative;
|
@@ -372,20 +377,21 @@ select:focus:required:invalid {
|
|
372
377
|
border-left-color: #ccc;
|
373
378
|
}
|
374
379
|
.add-on {
|
375
|
-
|
376
|
-
display: block;
|
380
|
+
display: inline-block;
|
377
381
|
width: auto;
|
378
382
|
min-width: 16px;
|
379
383
|
height: $baseLineHeight;
|
380
|
-
margin-right: -1px;
|
381
384
|
padding: 4px 5px;
|
382
385
|
font-weight: normal;
|
383
386
|
line-height: $baseLineHeight;
|
384
|
-
color: $grayLight;
|
385
387
|
text-align: center;
|
386
388
|
text-shadow: 0 1px 0 $white;
|
387
|
-
|
389
|
+
vertical-align: middle;
|
390
|
+
background-color: $grayLighter;
|
388
391
|
border: 1px solid #ccc;
|
392
|
+
}
|
393
|
+
.add-on,
|
394
|
+
.btn {
|
389
395
|
@include border-radius(3px 0 0 3px);
|
390
396
|
}
|
391
397
|
.active {
|
@@ -394,38 +400,47 @@ select:focus:required:invalid {
|
|
394
400
|
}
|
395
401
|
}
|
396
402
|
.input-prepend {
|
397
|
-
.add-on
|
398
|
-
|
403
|
+
.add-on,
|
404
|
+
.btn {
|
405
|
+
margin-right: -1px;
|
399
406
|
}
|
400
407
|
}
|
401
408
|
.input-append {
|
402
409
|
input,
|
410
|
+
select,
|
403
411
|
.uneditable-input {
|
404
|
-
float: left;
|
405
412
|
@include border-radius(3px 0 0 3px);
|
406
413
|
}
|
407
414
|
.uneditable-input {
|
408
415
|
border-left-color: #eee;
|
409
416
|
border-right-color: #ccc;
|
410
417
|
}
|
411
|
-
.add-on
|
412
|
-
|
418
|
+
.add-on,
|
419
|
+
.btn {
|
413
420
|
margin-left: -1px;
|
414
421
|
@include border-radius(0 3px 3px 0);
|
415
422
|
}
|
416
|
-
|
417
|
-
|
418
|
-
|
419
|
-
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
423
|
+
}
|
424
|
+
// Remove all border-radius for inputs with both prepend and append
|
425
|
+
.input-prepend.input-append {
|
426
|
+
input,
|
427
|
+
select,
|
428
|
+
.uneditable-input {
|
429
|
+
@include border-radius(0);
|
430
|
+
}
|
431
|
+
.add-on:first-child,
|
432
|
+
.btn:first-child {
|
433
|
+
margin-right: -1px;
|
434
|
+
@include border-radius(3px 0 0 3px);
|
435
|
+
}
|
436
|
+
.add-on:last-child,
|
437
|
+
.btn:last-child {
|
438
|
+
margin-left: -1px;
|
439
|
+
@include border-radius(0 3px 3px 0);
|
424
440
|
}
|
425
441
|
}
|
426
442
|
|
427
443
|
|
428
|
-
|
429
444
|
// SEARCH FORM
|
430
445
|
// -----------
|
431
446
|
|
@@ -451,7 +466,9 @@ select:focus:required:invalid {
|
|
451
466
|
textarea,
|
452
467
|
select,
|
453
468
|
.help-inline,
|
454
|
-
.uneditable-input
|
469
|
+
.uneditable-input,
|
470
|
+
.input-prepend,
|
471
|
+
.input-append {
|
455
472
|
display: inline-block;
|
456
473
|
margin-bottom: 0;
|
457
474
|
}
|
@@ -461,28 +478,35 @@ select:focus:required:invalid {
|
|
461
478
|
}
|
462
479
|
}
|
463
480
|
.form-search label,
|
464
|
-
.form-inline label
|
481
|
+
.form-inline label {
|
482
|
+
display: inline-block;
|
483
|
+
}
|
484
|
+
// Remove margin for input-prepend/-append
|
465
485
|
.form-search .input-append,
|
466
486
|
.form-inline .input-append,
|
467
487
|
.form-search .input-prepend,
|
468
488
|
.form-inline .input-prepend {
|
469
|
-
|
470
|
-
}
|
471
|
-
// Make the prepend and append add-on vertical-align: middle;
|
472
|
-
.form-search .input-append .add-on,
|
473
|
-
.form-inline .input-prepend .add-on,
|
474
|
-
.form-search .input-append .add-on,
|
475
|
-
.form-inline .input-prepend .add-on {
|
476
|
-
vertical-align: middle;
|
489
|
+
margin-bottom: 0;
|
477
490
|
}
|
478
|
-
// Inline checkbox/radio labels
|
491
|
+
// Inline checkbox/radio labels (remove padding on left)
|
479
492
|
.form-search .radio,
|
480
|
-
.form-inline .radio,
|
481
493
|
.form-search .checkbox,
|
494
|
+
.form-inline .radio,
|
482
495
|
.form-inline .checkbox {
|
496
|
+
padding-left: 0;
|
483
497
|
margin-bottom: 0;
|
484
498
|
vertical-align: middle;
|
485
499
|
}
|
500
|
+
// Remove float and margin, set to inline-block
|
501
|
+
.form-search .radio input[type="radio"],
|
502
|
+
.form-search .checkbox input[type="checkbox"],
|
503
|
+
.form-inline .radio input[type="radio"],
|
504
|
+
.form-inline .checkbox input[type="checkbox"] {
|
505
|
+
float: left;
|
506
|
+
margin-left: 0;
|
507
|
+
margin-right: 3px;
|
508
|
+
}
|
509
|
+
|
486
510
|
|
487
511
|
// Margin to space out fieldsets
|
488
512
|
.control-group {
|
@@ -514,6 +538,15 @@ legend + .control-group {
|
|
514
538
|
// Move over all input controls and content
|
515
539
|
.controls {
|
516
540
|
margin-left: 160px;
|
541
|
+
/* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
|
542
|
+
*display: inline-block;
|
543
|
+
*margin-left: 0;
|
544
|
+
*padding-left: 20px;
|
545
|
+
}
|
546
|
+
// Remove bottom margin on block level help text since that's accounted for on .control-group
|
547
|
+
.help-block {
|
548
|
+
margin-top: $baseLineHeight / 2;
|
549
|
+
margin-bottom: 0;
|
517
550
|
}
|
518
551
|
// Move over buttons in .form-actions to align with .controls
|
519
552
|
.form-actions {
|