zurb-foundation 3.0.7 → 3.0.8.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +2 -0
- data/CONTRIBUTING.md +43 -0
- data/Gemfile.lock +2 -27
- data/README.md +2 -2
- data/foundation.gemspec +1 -3
- data/index.html +12 -6
- data/lib/foundation/version.rb +1 -1
- data/lib/zurb-foundation.rb +11 -4
- data/{stylesheets → scss}/foundation/_settings.scss +17 -2
- data/{stylesheets → scss}/foundation/common/_base.scss +0 -0
- data/{stylesheets → scss}/foundation/common/_forms.scss +2 -2
- data/{stylesheets → scss}/foundation/common/_globals.scss +3 -0
- data/{stylesheets → scss}/foundation/common/_typography.scss +7 -5
- data/{stylesheets → scss}/foundation/components/_grid.scss +34 -19
- data/{stylesheets → scss}/foundation/components/modules/_all.scss +1 -1
- data/{stylesheets → scss}/foundation/components/modules/_buttons.scss +14 -12
- data/{stylesheets → scss}/foundation/components/modules/_navbar.scss +0 -0
- data/{stylesheets → scss}/foundation/components/modules/_offcanvas.scss +0 -0
- data/{stylesheets → scss}/foundation/components/modules/_orbit.scss +0 -0
- data/{stylesheets → scss}/foundation/components/modules/_reveal.scss +1 -0
- data/{stylesheets → scss}/foundation/components/modules/_tabs.scss +6 -4
- data/{stylesheets → scss}/foundation/components/modules/_ui.scss +19 -29
- data/{stylesheets → scss}/foundation/functions/_all.scss +0 -0
- data/{stylesheets → scss}/foundation/functions/_convert-number-to-word.scss +0 -0
- data/{stylesheets → scss}/foundation/functions/_grid-calc.scss +0 -0
- data/{stylesheets → scss}/foundation/functions/_modular-scale.sass +0 -0
- data/{stylesheets → scss}/foundation/mixins/_all.scss +0 -0
- data/{stylesheets → scss}/foundation/mixins/_clearfix.scss +0 -0
- data/{stylesheets → scss}/foundation/mixins/_css-triangle.scss +0 -0
- data/{stylesheets → scss}/foundation/mixins/_font-size.scss +2 -0
- data/{stylesheets → scss}/foundation/mixins/_respond-to.scss +0 -0
- data/{stylesheets → scss}/foundation/mixins/_semantic-grid.scss +28 -8
- data/{stylesheets → scss}/foundation.scss +2 -2
- data/templates/project/index.html +12 -12
- data/templates/project/manifest.rb +27 -42
- data/templates/project/{sass → scss}/_settings.scss +17 -0
- data/templates/project/{sass → scss}/app.scss +4 -4
- data/templates/upgrade/manifest.rb +39 -0
- data/test/buttons.html +184 -0
- data/test/config.rb +11 -0
- data/test/elements.html +339 -0
- data/test/forms.html +376 -0
- data/test/grid.html +560 -0
- data/test/images/orbit-demo/demo1.jpeg +0 -0
- data/test/images/orbit-demo/demo2.jpeg +0 -0
- data/test/images/orbit-demo/demo3.jpeg +0 -0
- data/test/images/orbit-demo/slider-background.jpeg +0 -0
- data/test/index.html +84 -0
- data/test/navigation.html +239 -0
- data/test/orbit.html +106 -0
- data/test/reveal.html +78 -0
- data/test/scss/_settings.scss +75 -0
- data/test/scss/styles.scss +2 -0
- data/test/tabs.html +184 -0
- data/test/template.html +60 -0
- data/test/type.html +194 -0
- data/vendor/assets/javascripts/foundation/app.js +5 -4
- data/vendor/assets/javascripts/foundation/index.js +1 -0
- data/vendor/assets/javascripts/foundation/jquery.foundation.buttons.js +6 -2
- data/vendor/assets/javascripts/foundation/jquery.foundation.forms.js +7 -7
- data/vendor/assets/javascripts/foundation/jquery.foundation.mediaQueryToggle.js +21 -0
- data/vendor/assets/javascripts/foundation/jquery.foundation.orbit.js +2 -1
- metadata +73 -75
- data/config/assets.yml +0 -58
- data/public/assets/foundation.js +0 -11
- data/public/assets/jquery.js +0 -23
- data/test.html +0 -232
- data/test2.html +0 -320
- data/type.html +0 -134
data/.gitignore
CHANGED
data/CONTRIBUTING.md
ADDED
@@ -0,0 +1,43 @@
|
|
1
|
+
# Foundation
|
2
|
+
|
3
|
+
This is the Foundation project. We love making super awesome stuff, but even more we like to empower people to make changes on their own. Feel free to fork and improve Foundation.
|
4
|
+
|
5
|
+
## Testing
|
6
|
+
|
7
|
+
Go into the test/ directory. Run `bundle exec compass compile` or `bundle exec compass watch` if you're making changes and want to see them reflected on-the-fly.
|
8
|
+
|
9
|
+
Want to add a feature to Foundation? Either update one of the test/*.html files or copy `test/template.html` to a new file, add your markup to it and check it in.
|
10
|
+
|
11
|
+
## Compass Project
|
12
|
+
|
13
|
+
If you have a compass project and would like updated assets you can run the following command at any given time from within your project directory:
|
14
|
+
|
15
|
+
compass create -r zurb-foundation --using foundation
|
16
|
+
|
17
|
+
## Development
|
18
|
+
|
19
|
+
Want to test out the Compass templates. Don't recompile the gem every time, use `bundler` like so:
|
20
|
+
|
21
|
+
```bash
|
22
|
+
mkdir demo1
|
23
|
+
cd demo1
|
24
|
+
echo -e 'source :rubygems\n
|
25
|
+
gem "zurb-foundation", :path => "/path/to/foundation/repo"\n
|
26
|
+
gem "compass"\n' > Gemfile
|
27
|
+
bundle exec compass create -r zurb-foundation --using foundation
|
28
|
+
```
|
29
|
+
|
30
|
+
On subsequent template updates use:
|
31
|
+
|
32
|
+
```bash
|
33
|
+
bundle exec compass create -r zurb-foundation --using foundation --force
|
34
|
+
```
|
35
|
+
|
36
|
+
## Contributing
|
37
|
+
|
38
|
+
1. Fork it
|
39
|
+
2. Create your feature branch (`git checkout -b my-new-feature`)
|
40
|
+
3. Test your changes to the best of your ability. We've provided a test/ folder, feel free to add to it as necessary.
|
41
|
+
4. Commit your changes (`git commit -am 'Added some feature'`)
|
42
|
+
5. Push to the branch (`git push origin my-new-feature`)
|
43
|
+
6. Create new Pull Request
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
zurb-foundation (3.0.
|
4
|
+
zurb-foundation (3.0.8.rc1)
|
5
5
|
compass (>= 0.12.2)
|
6
6
|
rake
|
7
7
|
sass (>= 3.2.0.alpha.244)
|
@@ -9,42 +9,17 @@ PATH
|
|
9
9
|
GEM
|
10
10
|
remote: https://rubygems.org/
|
11
11
|
specs:
|
12
|
-
POpen4 (0.1.4)
|
13
|
-
Platform (>= 0.4.0)
|
14
|
-
open4
|
15
|
-
Platform (0.4.0)
|
16
|
-
capistrano (2.12.0)
|
17
|
-
highline
|
18
|
-
net-scp (>= 1.0.0)
|
19
|
-
net-sftp (>= 2.0.0)
|
20
|
-
net-ssh (>= 2.0.14)
|
21
|
-
net-ssh-gateway (>= 1.1.0)
|
22
12
|
chunky_png (1.2.5)
|
23
13
|
compass (0.12.2)
|
24
14
|
chunky_png (~> 1.2)
|
25
15
|
fssm (>= 0.2.7)
|
26
16
|
sass (~> 3.1)
|
27
17
|
fssm (0.2.9)
|
28
|
-
highline (1.6.12)
|
29
|
-
jammit (0.6.5)
|
30
|
-
yui-compressor (>= 0.9.3)
|
31
|
-
net-scp (1.0.4)
|
32
|
-
net-ssh (>= 1.99.1)
|
33
|
-
net-sftp (2.0.5)
|
34
|
-
net-ssh (>= 2.0.9)
|
35
|
-
net-ssh (2.5.2)
|
36
|
-
net-ssh-gateway (1.1.0)
|
37
|
-
net-ssh (>= 1.99.1)
|
38
|
-
open4 (1.3.0)
|
39
18
|
rake (0.9.2.2)
|
40
|
-
sass (3.2.0.alpha.
|
41
|
-
yui-compressor (0.9.6)
|
42
|
-
POpen4 (>= 0.1.4)
|
19
|
+
sass (3.2.0.alpha.277)
|
43
20
|
|
44
21
|
PLATFORMS
|
45
22
|
ruby
|
46
23
|
|
47
24
|
DEPENDENCIES
|
48
|
-
capistrano
|
49
|
-
jammit
|
50
25
|
zurb-foundation!
|
data/README.md
CHANGED
@@ -20,7 +20,7 @@ Repo Contents
|
|
20
20
|
ZURB
|
21
21
|
====
|
22
22
|
|
23
|
-
Foundation was made by [ZURB](http://www.zurb.com),
|
23
|
+
Foundation was made by [ZURB](http://www.zurb.com), a product design company in Campbell, CA.
|
24
24
|
|
25
25
|
If Foundation knocks your socks off the way we hope it does and you want more, why not check out [our jobs](http://www.zurb.com/talent)?
|
26
26
|
|
@@ -92,4 +92,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
92
92
|
|
93
93
|
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
94
94
|
|
95
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
95
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
data/foundation.gemspec
CHANGED
@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
|
|
8
8
|
gem.summary = %q{ZURB Foundation on SASS/Compass}
|
9
9
|
gem.homepage = "http://foundation.zurb.com"
|
10
10
|
|
11
|
-
gem.files = `git ls-files`.split($\)
|
11
|
+
gem.files = `git ls-files`.split($\)
|
12
12
|
gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
|
13
13
|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
|
14
14
|
gem.name = "zurb-foundation"
|
@@ -18,6 +18,4 @@ Gem::Specification.new do |gem|
|
|
18
18
|
gem.add_dependency "compass", [">= 0.12.2"]
|
19
19
|
gem.add_dependency "sass", [">= 3.2.0.alpha.244"]
|
20
20
|
gem.add_dependency "rake"
|
21
|
-
gem.add_development_dependency "capistrano"
|
22
|
-
gem.add_development_dependency "jammit"
|
23
21
|
end
|
data/index.html
CHANGED
@@ -122,12 +122,18 @@
|
|
122
122
|
|
123
123
|
|
124
124
|
<!-- Included JS Files -->
|
125
|
-
<script src="vendor/assets/javascripts/foundation/jquery.
|
126
|
-
<script src="vendor/assets/javascripts/foundation/jquery.reveal.js"></script>
|
127
|
-
<script src="vendor/assets/javascripts/foundation/jquery.orbit
|
128
|
-
<script src="vendor/assets/javascripts/foundation/jquery.
|
129
|
-
<script src="vendor/assets/javascripts/foundation/jquery.placeholder.
|
130
|
-
<script src="vendor/assets/javascripts/foundation/jquery.tooltips.js"></script>
|
125
|
+
<script src="vendor/assets/javascripts/foundation/jquery.js"></script>
|
126
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.reveal.js"></script>
|
127
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.orbit.js"></script>
|
128
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.forms.js"></script>
|
129
|
+
<script src="vendor/assets/javascripts/foundation/jquery.placeholder.js"></script>
|
130
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.tooltips.js"></script>
|
131
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.alerts.js"></script>
|
132
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.buttons.js"></script>
|
133
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.accordion.js"></script>
|
134
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.navigation.js"></script>
|
135
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.mediaQueryToggle.js"></script>
|
136
|
+
<script src="vendor/assets/javascripts/foundation/jquery.foundation.tabs.js"></script>
|
131
137
|
<script src="vendor/assets/javascripts/foundation/app.js"></script>
|
132
138
|
|
133
139
|
</body>
|
data/lib/foundation/version.rb
CHANGED
data/lib/zurb-foundation.rb
CHANGED
@@ -1,11 +1,18 @@
|
|
1
|
-
|
1
|
+
root = File.join(File.dirname(__FILE__), "..")
|
2
|
+
require "foundation/version"
|
3
|
+
require "compass"
|
4
|
+
# require "modular-scale"
|
5
|
+
|
6
|
+
Compass::Frameworks.register("foundation",
|
7
|
+
:stylesheets_directory => File.join(root,"scss"),
|
8
|
+
:templates_directory => File.join(root,"templates"),
|
9
|
+
:images_dir => File.join(root,"vendor","assets","images","foundation")
|
10
|
+
)
|
11
|
+
|
2
12
|
if defined?(Rails)
|
3
13
|
require "foundation/generators/layout_generator"
|
4
14
|
require "foundation/generators/install_generator"
|
5
15
|
end
|
6
|
-
require 'compass'
|
7
|
-
extension_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
|
8
|
-
Compass::Frameworks.register('foundation', :path => extension_path)
|
9
16
|
|
10
17
|
module Foundation
|
11
18
|
require "foundation/engine" if defined?(Rails)
|
@@ -28,7 +28,6 @@ $bodyFontFamily: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !de
|
|
28
28
|
$bodyFontWeight: normal !default;
|
29
29
|
$bodyFontColor: #222 !default;
|
30
30
|
|
31
|
-
|
32
31
|
// Button Settings
|
33
32
|
|
34
33
|
$buttonRadius: 3px !default;
|
@@ -64,13 +63,29 @@ $base-size: 14px 44px !default;
|
|
64
63
|
// http://www.modularscale.com by Tim Brown
|
65
64
|
// https://github.com/scottkellum/modular-scale by scottkellum
|
66
65
|
|
66
|
+
// Tooltip Settings
|
67
|
+
$hasTipBorderBottom: dotted 1px #ccc !default;
|
68
|
+
$hasTipFontWeight: bold !default;
|
69
|
+
$hasTipFontColor: #333 !default;
|
70
|
+
$hasTipBorderBottomHover: dotted 1px darken($mainColor, 20%) !default;
|
71
|
+
$hasTipFontColorHover: $mainColor !default;
|
72
|
+
$tooltipBackgroundColor: #000 !default;
|
73
|
+
$tooltipBackgroundOpacity: 0.85 !default;
|
74
|
+
$tooltipFontSize: 12 !default;
|
75
|
+
$tooltipFontWeight: bold !default;
|
76
|
+
$tooltipFontColor: #fff !default;
|
77
|
+
$tapToCloseFontSize: 10 !default;
|
78
|
+
$tapToCloseFontWeight: normal !default;
|
79
|
+
$tapToCloseFontColor: #888 !default;
|
80
|
+
$tooltipFontSizeScreenSmall: 14 !default;
|
81
|
+
$tooltipBackgroundOpacityScreenSmall: 0.85 !default;
|
82
|
+
|
67
83
|
// Media Queries
|
68
84
|
|
69
85
|
$screenSmall: 768px !default;
|
70
86
|
$screenMedium: 1279px !default;
|
71
87
|
$screenXlarge: 1441px !default;
|
72
88
|
|
73
|
-
|
74
89
|
// Saving for better em-based testing
|
75
90
|
// $screenSmall: 44em !default;
|
76
91
|
// $screenMedium: 77em !default;
|
File without changes
|
@@ -33,7 +33,7 @@
|
|
33
33
|
|
34
34
|
input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], textarea { border: 1px solid darken($white, 20%); @include border-radius(2px); @include box-shadow(inset 0 1px 2px rgba(0,0,0,0.1)); color: rgba(0,0,0,0.75); display: block; font-size: ms(0); margin: 0 0 $formSpacing 0; padding: ($formSpacing / 2); height: (ms(0) + ($formSpacing * 1.5)); width: 100%; @include transition(all 0.15s linear);
|
35
35
|
|
36
|
-
&.oversize {
|
36
|
+
&.oversize { font-size: ms(1); padding: (($formSpacing - 4) / 2) ($formSpacing / 2); }
|
37
37
|
|
38
38
|
&:focus { background: darken($white, 2%); outline: none !important; border-color: darken($white, 30%); }
|
39
39
|
&[disabled] { background-color: #ddd; }
|
@@ -50,7 +50,7 @@
|
|
50
50
|
}
|
51
51
|
|
52
52
|
/* Errors */
|
53
|
-
.error input, input.error { border-color: $alertColor; background-color: rgba($alertColor, 0.1); }
|
53
|
+
.error input, input.error, .error textarea, textarea.error { border-color: $alertColor; background-color: rgba($alertColor, 0.1); }
|
54
54
|
.error label, label.error { color: $alertColor; }
|
55
55
|
.error small, small.error { display: block; padding: 6px 4px; margin-top: -($formSpacing) - 1; margin-bottom: $formSpacing; background: $alertColor; color: #fff; @include font-size(12); font-weight: bold; @include border-bottom-left-radius(2px); @include border-bottom-right-radius(2px); }
|
56
56
|
|
@@ -8,8 +8,6 @@
|
|
8
8
|
|
9
9
|
p { font-family: $bodyFontFamily; font-weight: $bodyFontWeight; font-size: ms(0); line-height: 1.6; margin-bottom: ms(1);
|
10
10
|
&.lead { font-size: ms(0) * 1.25; line-height: 1.6; margin-bottom: ms(1); }
|
11
|
-
img.left, img { margin: ms(1); margin-left: 0; }
|
12
|
-
img.right { margin: ms(1); margin-right: 0; }
|
13
11
|
}
|
14
12
|
aside p { font-size: ms(0) - 1; line-height: 1.35; font-style: italic; }
|
15
13
|
|
@@ -40,10 +38,10 @@
|
|
40
38
|
code { font-weight: bold; background: $highlightColor; }
|
41
39
|
|
42
40
|
/* Lists ---------------------- */
|
43
|
-
ul, ol { font-size: ms(0); line-height: 1.6; margin-bottom: ms(1); list-style-position:
|
41
|
+
ul, ol { font-size: ms(0); line-height: 1.6; margin-bottom: ms(1); list-style-position: inside; }
|
44
42
|
ul {
|
45
43
|
li {
|
46
|
-
ul { margin-left: 20px; margin-bottom: 0;
|
44
|
+
ul, ol { margin-left: 20px; margin-bottom: 0; }
|
47
45
|
}
|
48
46
|
&.square, &.circle, &.disc { margin-left: ms(1); }
|
49
47
|
&.square { list-style-type: square;
|
@@ -58,7 +56,11 @@
|
|
58
56
|
&.no-bullet { list-style: none; }
|
59
57
|
&.large li { line-height: 21px; }
|
60
58
|
}
|
61
|
-
|
59
|
+
ol {
|
60
|
+
li {
|
61
|
+
ul, ol { margin-left: 20px; margin-bottom: 0; }
|
62
|
+
}
|
63
|
+
}
|
62
64
|
|
63
65
|
/* Blockquotes ---------------------- */
|
64
66
|
blockquote, blockquote p { line-height: 1.5; color: lighten($headerFontColor, 30%); }
|
@@ -18,10 +18,15 @@
|
|
18
18
|
[class*="column"] + [class*="column"]:last-child { float: right; }
|
19
19
|
[class*="column"] + [class*="column"].end { float: left; }
|
20
20
|
|
21
|
+
// Creating column classes
|
22
|
+
@for $i from 1 through $totalColumns {
|
23
|
+
.#{convert-number-to-word($i)} { width: gridCalc($i, $totalColumns); }
|
24
|
+
}
|
25
|
+
|
21
26
|
// Creating .row-# classes
|
22
27
|
@for $i from 1 through $totalColumns {
|
23
28
|
.row {
|
24
|
-
.#{convert-number-to-word($i)} {
|
29
|
+
.#{convert-number-to-word($i)} { @extend .#{convert-number-to-word($i)}; }
|
25
30
|
}
|
26
31
|
}
|
27
32
|
|
@@ -39,6 +44,7 @@
|
|
39
44
|
}
|
40
45
|
|
41
46
|
img, object, embed { max-width: 100%; height: auto; }
|
47
|
+
object, embed { height: 100%; }
|
42
48
|
img { -ms-interpolation-mode: bicubic; }
|
43
49
|
#map_canvas img, .map_canvas img {max-width: none!important;}
|
44
50
|
|
@@ -103,29 +109,38 @@ that IE7/8 do not support :nth-child.
|
|
103
109
|
.block-grid { display: block; overflow: hidden; padding: 0;
|
104
110
|
|
105
111
|
&>li { display: block; height: auto; float: left; }
|
106
|
-
|
112
|
+
&.one-up { margin: 0;
|
113
|
+
&>li { width: 100%; padding: 0 0 15px; }
|
114
|
+
}
|
107
115
|
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
/* .block-grid.two-up>li:nth-child(2n+1) {clear: left;} */
|
116
|
+
&.two-up { margin: 0 -15px;
|
117
|
+
&>li { width: 50%; padding: 0 15px 15px;
|
118
|
+
&:nth-child(2n+1) { clear: both; }
|
119
|
+
}
|
120
|
+
}
|
114
121
|
|
115
|
-
|
116
|
-
|
117
|
-
|
122
|
+
&.three-up { margin: 0 -12px;
|
123
|
+
&>li { width: 33.33%; padding: 0 12px 12px;
|
124
|
+
&:nth-child(3n+1) { clear: both; }
|
125
|
+
}
|
126
|
+
}
|
118
127
|
|
119
|
-
|
120
|
-
|
121
|
-
|
128
|
+
&.four-up { margin: 0 -10px;
|
129
|
+
&>li { width: 25%; padding: 0 10px 10px;
|
130
|
+
&:nth-child(4n+1) { clear: both; }
|
131
|
+
}
|
132
|
+
}
|
122
133
|
|
123
|
-
|
124
|
-
|
125
|
-
|
134
|
+
&.five-up { margin: 0 -8px;
|
135
|
+
&>li { width: 20%; padding: 0 8px 8px;
|
136
|
+
&:nth-child(5n+1) { clear: both; }
|
137
|
+
}
|
138
|
+
}
|
139
|
+
}
|
126
140
|
|
127
141
|
/* Mobile Block Grids */
|
128
142
|
@media only screen and (max-width: $screenSmall - 1) {
|
129
|
-
.block-grid.mobile { margin-left: 0;
|
130
|
-
|
143
|
+
.block-grid.mobile { margin-left: 0;
|
144
|
+
&>li { float: none; width: 100%; margin-left: 0; }
|
145
|
+
}
|
131
146
|
}
|
@@ -40,7 +40,7 @@
|
|
40
40
|
&.round { @include border-radius(1000px); }
|
41
41
|
|
42
42
|
/* Layout */
|
43
|
-
&.full-width { width: 100%; text-align: center; padding-left:
|
43
|
+
&.full-width { width: 100%; text-align: center; padding-left: 0px !important; padding-right: 0px !important; }
|
44
44
|
&.left-align { text-align: left; text-indent: 12px; }
|
45
45
|
|
46
46
|
/* Disabled ---------- */
|
@@ -94,7 +94,7 @@
|
|
94
94
|
/* Flyout List */
|
95
95
|
&>ul { @include box-sizing(content-box); display: none; position: absolute; left: -1px; background: #fff; background: rgba(#fff,0.95); list-style: none; margin: 0; padding: 0; border: 1px solid darken($white, 20%); border-top: none; min-width: 100%; z-index: 40;
|
96
96
|
|
97
|
-
li { cursor: pointer; padding: 0; min-height: 18px; line-height: 18px; margin: 0; white-space: nowrap; list-style: none;
|
97
|
+
li { width: 100%; cursor: pointer; padding: 0; min-height: 18px; line-height: 18px; margin: 0; white-space: nowrap; list-style: none;
|
98
98
|
a { display: block; color: #555; font-size: ms(0) - 1; font-weight: $bodyFontWeight; padding: 6px 14px; text-align: left; }
|
99
99
|
&:hover { background-color: lighten($mainColor, 45%); color: #222; }
|
100
100
|
&.divider { min-height: 0; padding: 0; height: 1px; margin: 4px 0; background: darken($white, 7%); }
|
@@ -162,16 +162,18 @@
|
|
162
162
|
&:first-child { margin-left: 0; }
|
163
163
|
}
|
164
164
|
|
165
|
-
&.radius {
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
165
|
+
&.radius li {
|
166
|
+
a {
|
167
|
+
&.button, &.button.radius, &.button-rounded { @include border-radius(0px); }
|
168
|
+
}
|
169
|
+
&:first-child a {
|
170
|
+
&.button, &.button.radius { @include border-left-radius($buttonRadius); }
|
171
|
+
&.button.rounded { @include border-left-radius(1000px); }
|
172
|
+
}
|
173
|
+
&:last-child a {
|
174
|
+
&.button, &.button.radius { @include border-right-radius($buttonRadius); }
|
175
|
+
&.button.rounded { @include border-right-radius(1000px); }
|
176
|
+
}
|
175
177
|
}
|
176
178
|
|
177
179
|
&.even {
|
File without changes
|
File without changes
|
File without changes
|
@@ -25,6 +25,7 @@
|
|
25
25
|
&.small { width: 30%; margin-left: -10%; }
|
26
26
|
&.medium { width: 40%; margin-left: -20%; }
|
27
27
|
&.large { width: 60%; margin-left: -30%; }
|
28
|
+
&.xlarge { width: 70%; margin-left: -35%; }
|
28
29
|
&.expand { width: 90%; margin-left: -45%; }
|
29
30
|
.row { min-width: 0; }
|
30
31
|
}
|
@@ -12,7 +12,9 @@
|
|
12
12
|
}
|
13
13
|
|
14
14
|
dd { display: block; float: left; padding: 0; margin: 0;
|
15
|
-
a { color: lighten($txtColor, 30%); display: block; font-size: ms(0); height: $tabHeight; line-height: $tabHeight; padding: 0px ms(1) * 1.4;
|
15
|
+
a { color: lighten($txtColor, 30%); display: block; font-size: ms(0); height: $tabHeight; line-height: $tabHeight; padding: 0px ms(1) * 1.4;
|
16
|
+
&:focus { font-weight: bold; color: $mainColor; }
|
17
|
+
}
|
16
18
|
&.active { border-top: 3px solid $mainColor; margin-top: -3px;
|
17
19
|
a { cursor: default; color: lighten($txtColor, 10%); background: #fff; border-left: 1px solid darken($white, 10%); border-right: 1px solid darken($white, 10%); font-weight: bold; }
|
18
20
|
}
|
@@ -66,8 +68,8 @@
|
|
66
68
|
.no-js ul.tabs-content>li { display: block; }
|
67
69
|
|
68
70
|
@media only screen and (max-width: $screenSmall - 1) {
|
69
|
-
dl.tabs.mobile
|
70
|
-
dl.tabs.mobile dt, dl.tabs.mobile dd
|
71
|
+
dl.tabs.mobile { width: auto; margin: 20px -20px 40px; height: auto; }
|
72
|
+
dl.tabs.mobile dt, dl.tabs.mobile dd { float: none; height: auto; }
|
71
73
|
|
72
74
|
dl.tabs.mobile dd a { display: block; width: auto; height: auto; padding: 18px 20px; line-height: 1; border: solid 0 #ccc; border-width: 1px 0 0; margin: 0; color: #555; background: #eee; @include font-size(15); }
|
73
75
|
dl.tabs.mobile dd a.active { height: auto; margin: 0; border-width: 1px 0 0; }
|
@@ -80,7 +82,7 @@
|
|
80
82
|
dd:first-child a.active { margin: 0; }
|
81
83
|
}
|
82
84
|
|
83
|
-
dl.contained.mobile
|
85
|
+
dl.contained.mobile { margin-bottom: 0; }
|
84
86
|
dl.contained.tabs.mobile dd a { padding: 18px 20px; }
|
85
87
|
|
86
88
|
dl.tabs.mobile + ul.contained { margin-left: -20px; margin-right: -20px; border-width: 0 0 1px 0; }
|
@@ -23,7 +23,7 @@
|
|
23
23
|
*/
|
24
24
|
|
25
25
|
/* Visibility Classes ---------------------- */
|
26
|
-
|
26
|
+
|
27
27
|
/* Standard (large) display targeting */
|
28
28
|
.show-for-small,
|
29
29
|
.show-for-medium,
|
@@ -76,15 +76,15 @@
|
|
76
76
|
/* Small display targeting */
|
77
77
|
@media only screen and (max-width: $screenSmall - 1) {
|
78
78
|
.show-for-small,
|
79
|
-
.show-for-medium-down,
|
80
79
|
.hide-for-medium,
|
80
|
+
.show-for-medium-down,
|
81
81
|
.hide-for-large,
|
82
82
|
.hide-for-large-up,
|
83
83
|
.hide-for-xlarge { display: block !important; }
|
84
84
|
|
85
85
|
.hide-for-small,
|
86
86
|
.show-for-medium,
|
87
|
-
.
|
87
|
+
.hide-for-medium-down,
|
88
88
|
.show-for-large,
|
89
89
|
.show-for-large-up,
|
90
90
|
.show-for-xlarge { display: none !important; }
|
@@ -166,40 +166,40 @@
|
|
166
166
|
|
167
167
|
/* Tooltips ---------------------- */
|
168
168
|
|
169
|
-
.has-tip { border-bottom:
|
169
|
+
.has-tip { border-bottom: $hasTipBorderBottom; cursor: help; font-weight: $hasTipFontWeight; color: $hasTipFontColor;
|
170
170
|
|
171
|
-
&:hover { border-bottom:
|
171
|
+
&:hover { border-bottom: $hasTipBorderBottomHover; color: $hasTipFontColorHover; }
|
172
172
|
&.tip-left, &.tip-right { float: none !important; }
|
173
173
|
|
174
174
|
}
|
175
175
|
|
176
|
-
.tooltip { display: none; background:
|
176
|
+
.tooltip { display: none; background: $tooltipBackgroundColor; background: rgba($tooltipBackgroundColor,$tooltipBackgroundOpacity); position: absolute; color: $tooltipFontColor; font-weight: $tooltipFontWeight; @include font-size($tooltipFontSize); padding: 5px; z-index: 999; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; line-height: normal;
|
177
177
|
|
178
|
-
&>.nub { display: block; width: 0; height: 0; border: solid 5px; border-color: transparent transparent
|
179
|
-
&.tip-override>.nub { border-color: transparent transparent
|
180
|
-
&.tip-top>.nub { border-color:
|
178
|
+
&>.nub { display: block; width: 0; height: 0; border: solid 5px; border-color: transparent transparent $tooltipBackgroundColor transparent; border-color: transparent transparent rgba($tooltipBackgroundColor,$tooltipBackgroundOpacity) transparent; position: absolute; top: -10px; left: 10px; }
|
179
|
+
&.tip-override>.nub { border-color: transparent transparent $tooltipBackgroundColor transparent !important; border-color: transparent transparent rgba($tooltipBackgroundColor,$tooltipBackgroundOpacity) transparent !important; top: -10px !important; }
|
180
|
+
&.tip-top>.nub { border-color: $tooltipBackgroundColor transparent transparent transparent; border-color: rgba($tooltipBackgroundColor,$tooltipBackgroundOpacity) transparent transparent transparent; top: auto; bottom: -10px; }
|
181
181
|
|
182
182
|
&.tip-left, &.tip-right { float: none !important; }
|
183
183
|
|
184
|
-
&.tip-left>.nub { border-color: transparent transparent transparent
|
185
|
-
&.tip-right>.nub { border-color: transparent
|
184
|
+
&.tip-left>.nub { border-color: transparent transparent transparent $tooltipBackgroundColor; border-color: transparent transparent transparent rgba($tooltipBackgroundColor,$tooltipBackgroundOpacity); right: -10px; left: auto; }
|
185
|
+
&.tip-right>.nub { border-color: transparent $tooltipBackgroundColor transparent transparent; border-color: transparent rgba($tooltipBackgroundColor,$tooltipBackgroundOpacity) transparent transparent; right: auto; left: -10px; }
|
186
186
|
|
187
187
|
&.noradius { @include border-radius(0); }
|
188
|
-
&.opened { color:
|
188
|
+
&.opened { color: $hasTipFontColorHover !important; border-bottom: $hasTipBorderBottomHover !important; }
|
189
189
|
|
190
190
|
}
|
191
191
|
|
192
|
-
.tap-to-close { display: block; @include font-size(
|
192
|
+
.tap-to-close { display: block; @include font-size($tapToCloseFontSize); color: $tapToCloseFontColor; font-weight: $tapToCloseFontWeight; }
|
193
193
|
|
194
194
|
@media only screen and (max-width: $screenSmall - 1) {
|
195
195
|
.tooltip {
|
196
|
-
@include font-size(
|
196
|
+
@include font-size($tooltipFontSizeScreenSmall);
|
197
197
|
line-height: 1.4;
|
198
198
|
padding: 7px 10px 9px 10px;
|
199
199
|
}
|
200
200
|
.tooltip > .nub, .tooltip.top > .nub, .tooltip.left > .nub, .tooltip.right > .nub {
|
201
|
-
border-color: transparent transparent
|
202
|
-
border-color: transparent transparent rgba(
|
201
|
+
border-color: transparent transparent $tooltipBackgroundColor transparent;
|
202
|
+
border-color: transparent transparent rgba($tooltipBackgroundColor,$tooltipBackgroundOpacityScreenSmall) transparent;
|
203
203
|
top: -12px;
|
204
204
|
left: 10px;
|
205
205
|
}
|
@@ -228,7 +228,7 @@
|
|
228
228
|
|
229
229
|
ul.accordion { margin: 0 0 22px 0; border-bottom: 1px solid $secondaryColor;
|
230
230
|
|
231
|
-
li { list-style: none; margin: 0; padding: 0; border-top: 1px solid $secondaryColor;
|
231
|
+
&>li { list-style: none; margin: 0; padding: 0; border-top: 1px solid $secondaryColor;
|
232
232
|
|
233
233
|
.title { cursor: pointer; background: lighten($secondaryColor, 5%); padding: 15px; margin: 0; position: relative; border-left: 1px solid $secondaryColor; border-right: 1px solid $secondaryColor; @include single-transition(0.15s, background, linear);
|
234
234
|
|
@@ -263,11 +263,11 @@
|
|
263
263
|
}
|
264
264
|
}
|
265
265
|
|
266
|
-
/* Sub Navs http://www.zurb.com/article/292/how-to-create-simple-and-effective-sub-na ---------------------- */
|
266
|
+
/* Sub Navs http://www.zurb.com/article/292/how-to-create-simple-and-effective-sub-na ---------------------- */
|
267
267
|
|
268
268
|
dl.sub-nav { display: block; width: auto; overflow: hidden; margin: -4px 0 18px -9px; padding-top: 4px;
|
269
269
|
|
270
|
-
dt, dd { float: left; display: inline; margin-left: 9px; margin-bottom:
|
270
|
+
dt, dd { float: left; display: inline; margin-left: 9px; margin-bottom: 10px; }
|
271
271
|
dt { color: #999; font-weight: $bodyFontWeight; }
|
272
272
|
dd a { text-decoration: none; @include border-radius(1000px); }
|
273
273
|
dd.active a { font-weight: bold; background: $mainColor; color: #fff; padding: 3px 9px; cursor: default; }
|
@@ -313,15 +313,6 @@
|
|
313
313
|
|
314
314
|
}
|
315
315
|
|
316
|
-
/* Lists ---------------------- */
|
317
|
-
|
318
|
-
ul.nice, ol.nice { list-style: none; margin: 0;
|
319
|
-
|
320
|
-
li { padding-left: 13px; position: relative;
|
321
|
-
span.bullet, span.number { position: absolute; left: 0; top: 0; color: #ccc; }
|
322
|
-
}
|
323
|
-
}
|
324
|
-
|
325
316
|
/* Link List */
|
326
317
|
ul.link-list { margin: 0 0 ms(1) -22px; padding: 0; list-style: none; overflow: hidden;
|
327
318
|
|
@@ -331,7 +322,6 @@
|
|
331
322
|
}
|
332
323
|
}
|
333
324
|
|
334
|
-
|
335
325
|
/* Keytroke Characters ---------------------- */
|
336
326
|
|
337
327
|
.keystroke, kbd { font-family: "Consolas", "Menlo", "Courier", monospace; font-size: ms(0) - 1; padding: 2px 4px 0px; margin: 0; background: darken($white, 7%); border: solid 1px darken($white, 14%); @include border-radius($buttonRadius); }
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|