compass_twitter_bootstrap 0.1.7 → 0.1.8
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/CHANGELOG.md +11 -1
- data/README.md +25 -3
- data/Rakefile +5 -0
- data/{lib → build}/convert.rb +55 -4
- data/init.rb +1 -0
- data/lib/compass_twitter_bootstrap.rb +5 -0
- data/lib/compass_twitter_bootstrap/engine.rb +4 -0
- data/lib/compass_twitter_bootstrap/version.rb +1 -1
- data/stylesheets/compass_twitter_bootstrap/_forms.scss +49 -35
- data/stylesheets/compass_twitter_bootstrap/_mixins.scss +5 -2
- data/stylesheets/compass_twitter_bootstrap/_patterns.scss +100 -45
- data/stylesheets/compass_twitter_bootstrap/_reset.scss +1 -1
- data/stylesheets/compass_twitter_bootstrap/_scaffolding.scss +24 -20
- data/stylesheets/compass_twitter_bootstrap/_tables.scss +68 -15
- data/stylesheets_sass/_compass_twitter_bootstrap.sass +27 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_forms.sass +451 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_mixins.sass +159 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_patterns.sass +923 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_reset.sass +164 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_scaffolding.sass +187 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_tables.sass +198 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_type.sass +162 -0
- data/stylesheets_sass/compass_twitter_bootstrap/_variables.sass +71 -0
- data/vendor/assets/javascripts/bootstrap-alerts.js +124 -0
- data/vendor/assets/javascripts/bootstrap-buttons.js +64 -0
- data/vendor/assets/javascripts/bootstrap-dropdown.js +55 -0
- data/vendor/assets/javascripts/bootstrap-modal.js +260 -0
- data/vendor/assets/javascripts/bootstrap-popover.js +90 -0
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +107 -0
- data/vendor/assets/javascripts/bootstrap-tabs.js +80 -0
- data/vendor/assets/javascripts/bootstrap-twipsy.js +321 -0
- metadata +27 -8
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,15 @@
|
|
1
1
|
# Overview
|
2
2
|
|
3
|
+
## 0.1.8
|
4
|
+
* Upgraded to twitter bootstrap version 1.4
|
5
|
+
* Add Javascript files to vendors directory (thanks to tmaier)
|
6
|
+
* Add Rails engine to tell Rails to look into vendor/assets (tmaier)
|
7
|
+
* rails 3.1.1 plugin install support (tjgfernandes)
|
8
|
+
|
9
|
+
|
10
|
+
## 0.1.7
|
11
|
+
Compass opacity fix (thanks to dnedbaylo)
|
12
|
+
|
3
13
|
## 0.1.6
|
4
14
|
* Start of a less to scss converter
|
5
15
|
* Added change log
|
@@ -19,4 +29,4 @@ Upgraded to twitter bootstrap version 1.2
|
|
19
29
|
* Updated app name
|
20
30
|
|
21
31
|
## 0.1.1
|
22
|
-
initial version
|
32
|
+
initial version
|
data/README.md
CHANGED
@@ -20,7 +20,7 @@ Compass Twitter Bootstrap is Twitter's toolkit converted for Compass.
|
|
20
20
|
|
21
21
|
require 'compass_twitter_bootstrap'
|
22
22
|
|
23
|
-
**Import it into your SCSS file
|
23
|
+
**Import it into your SCSS file**
|
24
24
|
|
25
25
|
@import "compass_twitter_bootstrap";
|
26
26
|
|
@@ -46,7 +46,29 @@ Compass Twitter Bootstrap is Twitter's toolkit converted for Compass.
|
|
46
46
|
**Import it into your SCSS file**
|
47
47
|
|
48
48
|
@import "compass_twitter_bootstrap"
|
49
|
-
|
49
|
+
|
50
|
+
|
51
|
+
## Usage with Rails 3.1.1 (via plugin)
|
52
|
+
|
53
|
+
**Install plugin**
|
54
|
+
|
55
|
+
rails plugin install git://github.com/vwall/compass-twitter-bootstrap.git
|
56
|
+
|
57
|
+
**Add it to your config/initializers/sass.rb**
|
58
|
+
|
59
|
+
Rails.configuration.sass.tap do |config|
|
60
|
+
...
|
61
|
+
|
62
|
+
# twitter bootstrap
|
63
|
+
config.load_paths << Compass::Frameworks['twitter_bootstrap'].stylesheets_directory
|
64
|
+
|
65
|
+
...
|
66
|
+
end
|
67
|
+
|
68
|
+
**Import it into your SCSS file**
|
69
|
+
|
70
|
+
@import "compass_twitter_bootstrap"
|
71
|
+
|
50
72
|
|
51
73
|
## TWITTER BOOTSTRAP
|
52
74
|
|
@@ -81,4 +103,4 @@ Unless required by applicable law or agreed to in writing, software
|
|
81
103
|
distributed under the License is distributed on an "AS IS" BASIS,
|
82
104
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
83
105
|
See the License for the specific language governing permissions and
|
84
|
-
limitations under the License.
|
106
|
+
limitations under the License.
|
data/Rakefile
CHANGED
data/{lib → build}/convert.rb
RENAMED
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'open-uri'
|
2
|
+
|
1
3
|
class Convert
|
2
4
|
def process
|
3
5
|
less_files.each do |name, file|
|
@@ -5,6 +7,43 @@ class Convert
|
|
5
7
|
file = convert(file)
|
6
8
|
save_file(name, file)
|
7
9
|
end
|
10
|
+
|
11
|
+
self.fix_opacity
|
12
|
+
|
13
|
+
self.create_sass_files
|
14
|
+
end
|
15
|
+
|
16
|
+
def process_mixins
|
17
|
+
file = 'https://raw.github.com/twitter/bootstrap/master/lib/mixins.less'
|
18
|
+
file = open_git_file(file)
|
19
|
+
file = replace_mixins(file)
|
20
|
+
save_file('_mixins', file)
|
21
|
+
end
|
22
|
+
|
23
|
+
|
24
|
+
def create_sass_files
|
25
|
+
scss_files = 'stylesheets'
|
26
|
+
|
27
|
+
Dir.glob(scss_files+'/*').each do |dir|
|
28
|
+
file_or_dir = File.open dir
|
29
|
+
|
30
|
+
if File.file? file_or_dir
|
31
|
+
convert_scss(file_or_dir)
|
32
|
+
else
|
33
|
+
Dir.open(file_or_dir).each do |filename|
|
34
|
+
file = File.open("#{file_or_dir.path}/#{filename}")
|
35
|
+
next unless File.fnmatch? '**.scss', file
|
36
|
+
convert_scss(file, 'compass_twitter_bootstrap/')
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
def fix_opacity
|
43
|
+
loc = "stylesheets/compass_twitter_bootstrap/_patterns.scss"
|
44
|
+
scss = File.open(loc, "r").read
|
45
|
+
scss = replace_opacity(scss)
|
46
|
+
save_file('_patterns', scss)
|
8
47
|
end
|
9
48
|
|
10
49
|
private
|
@@ -14,10 +53,10 @@ private
|
|
14
53
|
'_reset' => 'https://raw.github.com/twitter/bootstrap/master/lib/reset.less',
|
15
54
|
'_variables' => 'https://raw.github.com/twitter/bootstrap/master/lib/variables.less',
|
16
55
|
'_scaffolding' => 'https://raw.github.com/twitter/bootstrap/master/lib/scaffolding.less',
|
17
|
-
'_type' => 'https://raw.github.com/twitter/bootstrap/
|
56
|
+
'_type' => 'https://raw.github.com/twitter/bootstrap/master/lib/type.less',
|
18
57
|
'_forms' => 'https://raw.github.com/twitter/bootstrap/master/lib/forms.less',
|
19
58
|
'_tables' => 'https://raw.github.com/twitter/bootstrap/master/lib/tables.less',
|
20
|
-
'_patterns' => 'https://raw.github.com/twitter/bootstrap/
|
59
|
+
'_patterns' => 'https://raw.github.com/twitter/bootstrap/master/lib/patterns.less'
|
21
60
|
}
|
22
61
|
end
|
23
62
|
|
@@ -33,13 +72,14 @@ private
|
|
33
72
|
end
|
34
73
|
|
35
74
|
def open_git_file(file)
|
36
|
-
|
75
|
+
open(file).read
|
37
76
|
end
|
38
77
|
|
39
78
|
def save_file(name, content)
|
40
|
-
f = File.
|
79
|
+
f = File.open("stylesheets/compass_twitter_bootstrap/#{name}.scss", "w+")
|
41
80
|
f.write(content)
|
42
81
|
f.close
|
82
|
+
puts "Converted#{name}\n"
|
43
83
|
end
|
44
84
|
|
45
85
|
def replace_vars(less)
|
@@ -66,4 +106,15 @@ private
|
|
66
106
|
less.gsub(/spin/, 'adjust-hue')
|
67
107
|
end
|
68
108
|
|
109
|
+
def replace_opacity(scss)
|
110
|
+
scss.gsub(/\@include opacity\((\d+)\)/) {|s| "@include opacity(#{$1.to_f / 100})"}
|
111
|
+
end
|
112
|
+
|
113
|
+
def convert_scss(file, folder='')
|
114
|
+
sass_files = 'stylesheets_sass'
|
115
|
+
system("sass-convert #{file.path} #{sass_files}/#{folder}#{File.basename(file, 'scss')}sass")
|
116
|
+
end
|
117
|
+
|
69
118
|
end
|
119
|
+
|
120
|
+
Convert.new.process
|
data/init.rb
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
require 'compass_twitter_bootstrap.rb'
|
@@ -77,7 +77,12 @@ select,
|
|
77
77
|
@include border-radius(3px);
|
78
78
|
}
|
79
79
|
|
80
|
-
|
80
|
+
// remove padding from select
|
81
|
+
select {
|
82
|
+
padding: initial;
|
83
|
+
}
|
84
|
+
|
85
|
+
// mini reset for non-html5 file types
|
81
86
|
input[type=checkbox],
|
82
87
|
input[type=radio] {
|
83
88
|
width: auto;
|
@@ -107,6 +112,7 @@ input[type=submit] {
|
|
107
112
|
select,
|
108
113
|
input[type=file] {
|
109
114
|
height: $baseline * 1.5; // In IE7, the height of the select element cannot be changed by height, only font-size
|
115
|
+
*height: auto; // Reset for IE7
|
110
116
|
line-height: $baseline * 1.5;
|
111
117
|
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
|
112
118
|
}
|
@@ -114,6 +120,7 @@ input[type=file] {
|
|
114
120
|
// Make multiple select elements height not fixed
|
115
121
|
select[multiple] {
|
116
122
|
height: inherit;
|
123
|
+
background-color: $white; // Fixes Chromium bug of unreadable items
|
117
124
|
}
|
118
125
|
|
119
126
|
textarea {
|
@@ -158,36 +165,49 @@ select:focus {
|
|
158
165
|
outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
|
159
166
|
}
|
160
167
|
|
161
|
-
|
162
|
-
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
+
|
169
|
+
// FORM FIELD FEEDBACK STATES
|
170
|
+
// --------------------------
|
171
|
+
|
172
|
+
// Mixin for form field states
|
173
|
+
@mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
|
174
|
+
// Set the text color
|
168
175
|
> label,
|
169
|
-
|
170
|
-
|
171
|
-
color: $
|
176
|
+
.help-block,
|
177
|
+
.help-inline {
|
178
|
+
color: $textColor;
|
172
179
|
}
|
180
|
+
// Style inputs accordingly
|
173
181
|
input,
|
174
182
|
textarea {
|
175
|
-
|
176
|
-
|
183
|
+
color: $textColor;
|
184
|
+
border-color: $borderColor;
|
177
185
|
&:focus {
|
178
|
-
border-color: darken($
|
179
|
-
@include box-shadow(0 0 6px
|
186
|
+
border-color: darken($borderColor, 10%);
|
187
|
+
@include box-shadow(0 0 6px lighten($borderColor, 20%));
|
180
188
|
}
|
181
189
|
}
|
182
|
-
|
183
|
-
.input-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
}
|
190
|
+
// Give a small background color for input-prepend/-append
|
191
|
+
.input-prepend .add-on,
|
192
|
+
.input-append .add-on {
|
193
|
+
color: $textColor;
|
194
|
+
background-color: $backgroundColor;
|
195
|
+
border-color: $textColor;
|
189
196
|
}
|
190
197
|
}
|
198
|
+
// Error
|
199
|
+
form .clearfix.error {
|
200
|
+
@include formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%));
|
201
|
+
}
|
202
|
+
// Warning
|
203
|
+
form .clearfix.warning {
|
204
|
+
@include formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%));
|
205
|
+
}
|
206
|
+
// Success
|
207
|
+
form .clearfix.success {
|
208
|
+
@include formFieldState(#468847, #57a957, lighten(#57a957, 30%));
|
209
|
+
}
|
210
|
+
|
191
211
|
|
192
212
|
// Form element sizes
|
193
213
|
// TODO v2: remove duplication here and just stick to .input-[size] in light of adding .spanN sizes
|
@@ -236,12 +256,11 @@ textarea.xxlarge {
|
|
236
256
|
@mixin formColumns($columnSpan: 1) {
|
237
257
|
display: inline-block;
|
238
258
|
float: none;
|
239
|
-
width: (($gridColumnWidth
|
259
|
+
width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 10;
|
240
260
|
margin-left: 0;
|
241
261
|
}
|
242
262
|
input,
|
243
|
-
textarea
|
244
|
-
select {
|
263
|
+
textarea {
|
245
264
|
// Default columns
|
246
265
|
&.span1 { @include formColumns(1); }
|
247
266
|
&.span2 { @include formColumns(2); }
|
@@ -293,9 +312,10 @@ textarea[readonly] {
|
|
293
312
|
}
|
294
313
|
|
295
314
|
// Help Text
|
315
|
+
// TODO: Do we need to set basefont and baseline here?
|
296
316
|
.help-inline,
|
297
317
|
.help-block {
|
298
|
-
font-size: $basefont
|
318
|
+
font-size: $basefont;
|
299
319
|
line-height: $baseline;
|
300
320
|
color: $grayLight;
|
301
321
|
}
|
@@ -314,15 +334,6 @@ textarea[readonly] {
|
|
314
334
|
// Inline Fields (input fields that appear as inline objects
|
315
335
|
.inline-inputs {
|
316
336
|
color: $gray;
|
317
|
-
span, input {
|
318
|
-
display: inline-block;
|
319
|
-
}
|
320
|
-
input.mini {
|
321
|
-
width: 60px;
|
322
|
-
}
|
323
|
-
input.small {
|
324
|
-
width: 90px;
|
325
|
-
}
|
326
337
|
span {
|
327
338
|
padding: 0 2px 0 1px;
|
328
339
|
}
|
@@ -389,6 +400,7 @@ textarea[readonly] {
|
|
389
400
|
float: none;
|
390
401
|
width: auto;
|
391
402
|
padding: 0;
|
403
|
+
margin-left: 20px;
|
392
404
|
line-height: $baseline;
|
393
405
|
text-align: left;
|
394
406
|
white-space: normal;
|
@@ -414,6 +426,8 @@ textarea[readonly] {
|
|
414
426
|
input[type=radio],
|
415
427
|
input[type=checkbox] {
|
416
428
|
margin-bottom: 0;
|
429
|
+
margin-left: -20px;
|
430
|
+
float: left;
|
417
431
|
}
|
418
432
|
}
|
419
433
|
|
@@ -6,9 +6,11 @@
|
|
6
6
|
// Clearfix for clearing floats like a boss h5bp.com/q
|
7
7
|
@mixin clearfix {
|
8
8
|
zoom: 1;
|
9
|
-
&:before,
|
9
|
+
&:before,
|
10
|
+
&:after {
|
10
11
|
display: table;
|
11
12
|
content: "";
|
13
|
+
zoom: 1;
|
12
14
|
}
|
13
15
|
&:after {
|
14
16
|
clear: both;
|
@@ -18,7 +20,8 @@
|
|
18
20
|
// Center-align a block level element
|
19
21
|
@mixin center-block {
|
20
22
|
display: block;
|
21
|
-
margin:
|
23
|
+
margin-left: auto;
|
24
|
+
margin-right: auto;
|
22
25
|
}
|
23
26
|
|
24
27
|
// Sizing shortcuts
|
@@ -25,7 +25,7 @@
|
|
25
25
|
// Hover and active states
|
26
26
|
// h3 for backwards compatibility
|
27
27
|
h3 a:hover,
|
28
|
-
.brand
|
28
|
+
.brand:hover,
|
29
29
|
ul .active > a {
|
30
30
|
background-color: #333;
|
31
31
|
background-color: rgba(255,255,255,.05);
|
@@ -65,7 +65,7 @@
|
|
65
65
|
float: left;
|
66
66
|
margin: 5px 0 0 0;
|
67
67
|
position: relative;
|
68
|
-
@include opacity(1);
|
68
|
+
@include opacity(1.0);
|
69
69
|
}
|
70
70
|
// Todo: remove from v2.0 when ready, added for legacy
|
71
71
|
form.pull-right {
|
@@ -278,7 +278,8 @@ a.menu:after,
|
|
278
278
|
}
|
279
279
|
}
|
280
280
|
|
281
|
-
.topbar .dropdown-menu,
|
281
|
+
.topbar .dropdown-menu,
|
282
|
+
.dropdown-menu {
|
282
283
|
// Links within the dropdown menu
|
283
284
|
a {
|
284
285
|
display: block;
|
@@ -289,7 +290,8 @@ a.menu:after,
|
|
289
290
|
color: $gray;
|
290
291
|
text-shadow: 0 1px 0 $white;
|
291
292
|
// Hover state
|
292
|
-
&:hover
|
293
|
+
&:hover,
|
294
|
+
&.hover {
|
293
295
|
@include gradient-vertical(#eeeeee, #dddddd);
|
294
296
|
color: $grayDark;
|
295
297
|
text-decoration: none;
|
@@ -318,10 +320,13 @@ a.menu:after,
|
|
318
320
|
}
|
319
321
|
|
320
322
|
|
321
|
-
//
|
323
|
+
// TABS AND PILLS
|
324
|
+
// --------------
|
325
|
+
|
326
|
+
// Common styles
|
322
327
|
.tabs,
|
323
328
|
.pills {
|
324
|
-
margin: 0 0
|
329
|
+
margin: 0 0 $baseline;
|
325
330
|
padding: 0;
|
326
331
|
list-style: none;
|
327
332
|
@include clearfix();
|
@@ -333,18 +338,18 @@ a.menu:after,
|
|
333
338
|
}
|
334
339
|
}
|
335
340
|
|
336
|
-
//
|
341
|
+
// Tabs
|
337
342
|
.tabs {
|
338
|
-
|
339
|
-
|
340
|
-
border-
|
343
|
+
border-color: #ddd;
|
344
|
+
border-style: solid;
|
345
|
+
border-width: 0 0 1px;
|
341
346
|
> li {
|
342
347
|
position: relative; // For the dropdowns mostly
|
343
|
-
|
348
|
+
margin-bottom: -1px;
|
344
349
|
> a {
|
345
350
|
padding: 0 15px;
|
346
351
|
margin-right: 2px;
|
347
|
-
line-height: $baseline * 2;
|
352
|
+
line-height: ($baseline * 2) - 2;
|
348
353
|
border: 1px solid transparent;
|
349
354
|
@include border-radius(4px 4px 0 0);
|
350
355
|
&:hover {
|
@@ -353,13 +358,20 @@ a.menu:after,
|
|
353
358
|
border-color: #eee #eee #ddd;
|
354
359
|
}
|
355
360
|
}
|
356
|
-
&.active > a {
|
357
|
-
color: $gray;
|
358
|
-
background-color: $white;
|
359
|
-
border: 1px solid #ddd;
|
360
|
-
border-bottom-color: transparent;
|
361
|
-
}
|
362
361
|
}
|
362
|
+
// Active state, and it's :hover to override normal :hover
|
363
|
+
.active > a,
|
364
|
+
.active > a:hover {
|
365
|
+
color: $gray;
|
366
|
+
background-color: $white;
|
367
|
+
border: 1px solid #ddd;
|
368
|
+
border-bottom-color: transparent;
|
369
|
+
cursor: default;
|
370
|
+
}
|
371
|
+
}
|
372
|
+
|
373
|
+
// Dropdowns in tabs
|
374
|
+
.tabs {
|
363
375
|
// first one for backwards compatibility
|
364
376
|
.menu-dropdown,
|
365
377
|
.dropdown-menu {
|
@@ -385,40 +397,47 @@ a.menu:after,
|
|
385
397
|
border-top-color: #555;
|
386
398
|
}
|
387
399
|
}
|
388
|
-
.tab-content {
|
389
|
-
clear: both;
|
390
|
-
}
|
391
400
|
|
392
|
-
//
|
401
|
+
// Pills
|
393
402
|
.pills {
|
394
403
|
a {
|
395
|
-
|
404
|
+
margin: 5px 3px 5px 0;
|
396
405
|
padding: 0 15px;
|
397
|
-
text-shadow: 0 1px 1px $white;
|
398
406
|
line-height: 30px;
|
407
|
+
text-shadow: 0 1px 1px $white;
|
399
408
|
@include border-radius(15px);
|
400
409
|
&:hover {
|
401
|
-
background: $linkColorHover;
|
402
410
|
color: $white;
|
403
411
|
text-decoration: none;
|
404
412
|
text-shadow: 0 1px 1px rgba(0,0,0,.25);
|
413
|
+
background-color: $linkColorHover;
|
405
414
|
}
|
406
415
|
}
|
407
416
|
.active a {
|
408
|
-
background: $linkColor;
|
409
417
|
color: $white;
|
410
418
|
text-shadow: 0 1px 1px rgba(0,0,0,.25);
|
419
|
+
background-color: $linkColor;
|
411
420
|
}
|
412
421
|
}
|
413
422
|
|
414
|
-
|
415
|
-
.
|
416
|
-
|
423
|
+
// Stacked pills
|
424
|
+
.pills-vertical > li {
|
425
|
+
float: none;
|
417
426
|
}
|
418
427
|
|
428
|
+
// Tabbable areas
|
429
|
+
.tab-content,
|
430
|
+
.pill-content {
|
431
|
+
}
|
432
|
+
.tab-content > .tab-pane,
|
433
|
+
.pill-content > .pill-pane,
|
434
|
+
.tab-content > div,
|
435
|
+
.pill-content > div {
|
436
|
+
display: none;
|
437
|
+
}
|
419
438
|
.tab-content > .active,
|
420
439
|
.pill-content > .active {
|
421
|
-
display:block;
|
440
|
+
display: block;
|
422
441
|
}
|
423
442
|
|
424
443
|
|
@@ -426,8 +445,8 @@ a.menu:after,
|
|
426
445
|
// -----------
|
427
446
|
|
428
447
|
.breadcrumb {
|
429
|
-
margin: 0 0 $baseline;
|
430
448
|
padding: 7px 14px;
|
449
|
+
margin: 0 0 $baseline;
|
431
450
|
@include gradient-vertical(#ffffff, #f5f5f5);
|
432
451
|
border: 1px solid #ddd;
|
433
452
|
@include border-radius(3px);
|
@@ -440,8 +459,6 @@ a.menu:after,
|
|
440
459
|
padding: 0 5px;
|
441
460
|
color: $grayLight;
|
442
461
|
}
|
443
|
-
a {
|
444
|
-
}
|
445
462
|
.active a {
|
446
463
|
color: $grayDark;
|
447
464
|
}
|
@@ -505,6 +522,11 @@ footer {
|
|
505
522
|
&.info:hover {
|
506
523
|
color: $white
|
507
524
|
}
|
525
|
+
// Sets the close button to the middle of message
|
526
|
+
.close{
|
527
|
+
font-family: Arial, sans-serif;
|
528
|
+
line-height: 18px;
|
529
|
+
}
|
508
530
|
// Danger and error appear as red
|
509
531
|
&.danger,
|
510
532
|
&.error {
|
@@ -558,6 +580,7 @@ footer {
|
|
558
580
|
@include transition(.1s linear all);
|
559
581
|
|
560
582
|
// Active and Disabled states
|
583
|
+
&.active,
|
561
584
|
&:active {
|
562
585
|
$shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
|
563
586
|
@include box-shadow($shadow);
|
@@ -601,8 +624,8 @@ footer {
|
|
601
624
|
button.btn,
|
602
625
|
input[type=submit].btn {
|
603
626
|
&::-moz-focus-inner {
|
604
|
-
|
605
|
-
|
627
|
+
padding: 0;
|
628
|
+
border: 0;
|
606
629
|
}
|
607
630
|
}
|
608
631
|
|
@@ -616,7 +639,7 @@ input[type=submit].btn {
|
|
616
639
|
font-weight: bold;
|
617
640
|
line-height: $baseline * .75;
|
618
641
|
text-shadow: 0 1px 0 rgba(255,255,255,1);
|
619
|
-
@include opacity(0.
|
642
|
+
@include opacity(0.25);
|
620
643
|
&:hover {
|
621
644
|
color: $black;
|
622
645
|
text-decoration: none;
|
@@ -643,7 +666,20 @@ input[type=submit].btn {
|
|
643
666
|
|
644
667
|
// Adjust close icon
|
645
668
|
.close {
|
646
|
-
|
669
|
+
margin-top: 1px;
|
670
|
+
*margin-top: 0; // For IE7
|
671
|
+
}
|
672
|
+
|
673
|
+
// Make links same color as text and stand out more
|
674
|
+
a {
|
675
|
+
font-weight: bold;
|
676
|
+
color: $grayDark;
|
677
|
+
}
|
678
|
+
&.danger p a,
|
679
|
+
&.error p a,
|
680
|
+
&.success p a,
|
681
|
+
&.info p a {
|
682
|
+
color: $white;
|
647
683
|
}
|
648
684
|
|
649
685
|
// Remove extra margin from content
|
@@ -700,6 +736,14 @@ input[type=submit].btn {
|
|
700
736
|
background-color: lighten(#6bd0ee, 25%);
|
701
737
|
border-color: lighten(#6bd0ee, 20%);
|
702
738
|
}
|
739
|
+
// Change link color back
|
740
|
+
&.danger p a,
|
741
|
+
&.error p a,
|
742
|
+
&.success p a,
|
743
|
+
&.info p a {
|
744
|
+
color: $grayDark;
|
745
|
+
}
|
746
|
+
|
703
747
|
}
|
704
748
|
}
|
705
749
|
|
@@ -780,7 +824,8 @@ input[type=submit].btn {
|
|
780
824
|
&.fade { opacity: 0; }
|
781
825
|
}
|
782
826
|
|
783
|
-
.modal-backdrop,
|
827
|
+
.modal-backdrop,
|
828
|
+
.modal-backdrop.fade.in {
|
784
829
|
@include opacity(0.8);
|
785
830
|
}
|
786
831
|
|
@@ -790,7 +835,7 @@ input[type=submit].btn {
|
|
790
835
|
left: 50%;
|
791
836
|
z-index: 11000;
|
792
837
|
width: 560px;
|
793
|
-
margin: -250px 0 0 -
|
838
|
+
margin: -250px 0 0 -280px;
|
794
839
|
background-color: $white;
|
795
840
|
border: 1px solid #999;
|
796
841
|
border: 1px solid rgba(0,0,0,.3);
|
@@ -800,7 +845,7 @@ input[type=submit].btn {
|
|
800
845
|
@include background-clip(padding-box);
|
801
846
|
.close { margin-top: 7px; }
|
802
847
|
&.fade {
|
803
|
-
@include transition(
|
848
|
+
@include transition(unquote('opacity .3s linear, top .3s ease-out'));
|
804
849
|
top: -25%;
|
805
850
|
}
|
806
851
|
&.fade.in { top: 50%; }
|
@@ -812,6 +857,9 @@ input[type=submit].btn {
|
|
812
857
|
.modal-body {
|
813
858
|
padding: 15px;
|
814
859
|
}
|
860
|
+
.modal-body form {
|
861
|
+
margin-bottom: 0;
|
862
|
+
}
|
815
863
|
.modal-footer {
|
816
864
|
background-color: #f5f5f5;
|
817
865
|
padding: 14px 15px 15px;
|
@@ -826,6 +874,12 @@ input[type=submit].btn {
|
|
826
874
|
}
|
827
875
|
}
|
828
876
|
|
877
|
+
// Fix the stacking of these components when in modals
|
878
|
+
.modal .popover,
|
879
|
+
.modal .twipsy {
|
880
|
+
z-index: 12000;
|
881
|
+
}
|
882
|
+
|
829
883
|
|
830
884
|
// POPOVER ARROWS
|
831
885
|
// --------------
|
@@ -918,8 +972,8 @@ input[type=submit].btn {
|
|
918
972
|
height: 0;
|
919
973
|
}
|
920
974
|
.inner {
|
921
|
-
background
|
922
|
-
background
|
975
|
+
background: $black;
|
976
|
+
background: rgba(0,0,0,.8);
|
923
977
|
padding: 3px;
|
924
978
|
overflow: hidden;
|
925
979
|
width: 280px;
|
@@ -962,11 +1016,12 @@ input[type=submit].btn {
|
|
962
1016
|
|
963
1017
|
.label {
|
964
1018
|
padding: 1px 3px 2px;
|
965
|
-
background-color: $grayLight;
|
966
1019
|
font-size: $basefont * .75;
|
967
1020
|
font-weight: bold;
|
968
1021
|
color: $white;
|
969
1022
|
text-transform: uppercase;
|
1023
|
+
white-space: nowrap;
|
1024
|
+
background-color: $grayLight;
|
970
1025
|
@include border-radius(3px);
|
971
1026
|
&.important { background-color: #c43c35; }
|
972
1027
|
&.warning { background-color: $orange; }
|
@@ -979,7 +1034,7 @@ input[type=submit].btn {
|
|
979
1034
|
// -----------
|
980
1035
|
|
981
1036
|
.media-grid {
|
982
|
-
margin-left:
|
1037
|
+
margin-left: -$gridGutterWidth;
|
983
1038
|
margin-bottom: 0;
|
984
1039
|
@include clearfix();
|
985
1040
|
li {
|
@@ -988,7 +1043,7 @@ input[type=submit].btn {
|
|
988
1043
|
a {
|
989
1044
|
float: left;
|
990
1045
|
padding: 4px;
|
991
|
-
margin: 0 0
|
1046
|
+
margin: 0 0 $baseline $gridGutterWidth;
|
992
1047
|
border: 1px solid #ddd;
|
993
1048
|
@include border-radius(4px);
|
994
1049
|
@include box-shadow(0 1px 1px rgba(0,0,0,.075));
|