middleman-swift 0.1.0 → 0.2.0

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.
Files changed (29) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +2 -0
  3. data/lib/middleman-swift/template.rb +16 -9
  4. data/lib/middleman-swift/template/shared/Gemfile.tt +11 -0
  5. data/lib/middleman-swift/template/shared/config.tt +48 -17
  6. data/lib/middleman-swift/template/source/css/fonts/{.gitkeep → _fonts.scss} +0 -0
  7. data/lib/middleman-swift/template/source/css/{partials → framework}/_reset.scss +0 -0
  8. data/lib/middleman-swift/template/source/css/framework/_swift-framework.scss +249 -0
  9. data/lib/middleman-swift/template/source/css/framework/_typography.scss +135 -0
  10. data/lib/middleman-swift/template/source/css/{partials/_page-about-us.scss → global/_global.scss} +0 -0
  11. data/lib/middleman-swift/template/source/css/ie.css.scss +3 -3
  12. data/lib/middleman-swift/template/source/{js → css/modules}/.gitkeep +0 -0
  13. data/lib/middleman-swift/template/source/{layouts → css/overrides}/.gitkeep +0 -0
  14. data/lib/middleman-swift/template/source/css/{partials → pages}/_page-home.scss +0 -0
  15. data/lib/middleman-swift/template/source/css/screen.css.scss +15 -35
  16. data/lib/middleman-swift/template/source/css/{partials/_page-contact-us.scss → vendors/.gitkeep} +0 -0
  17. data/lib/middleman-swift/template/source/js/framework/.gitkeep +0 -0
  18. data/lib/middleman-swift/template/source/js/modules/.gitkeep +0 -0
  19. data/lib/middleman-swift/template/source/js/overrides/.gitkeep +0 -0
  20. data/lib/middleman-swift/template/source/js/pages/.gitkeep +0 -0
  21. data/lib/middleman-swift/template/source/js/script.js +5 -0
  22. data/lib/middleman-swift/template/source/js/vendors/.gitkeep +0 -0
  23. data/lib/middleman-swift/version.rb +1 -1
  24. metadata +24 -21
  25. data/lib/middleman-swift/template/source/css/partials/_font-styles.scss +0 -45
  26. data/lib/middleman-swift/template/source/css/partials/_swift-framework.scss +0 -186
  27. data/lib/middleman-swift/template/source/img/.DS_Store +0 -0
  28. data/lib/middleman-swift/template/source/js/.DS_Store +0 -0
  29. data/lib/middleman-swift/template/source/layouts/.DS_Store +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fda693979bb2941a292026c526a508d4bbfbbe1a
4
- data.tar.gz: f94a53e4a6b09d834cea10f2223720ee6cc34846
3
+ metadata.gz: 16dfba5aa138c15674cc3ec75c9441b88fa10ad2
4
+ data.tar.gz: 94868dd017d09f0699b8a0717e8f5c791217215a
5
5
  SHA512:
6
- metadata.gz: 8c7b5e4e4d844a7252dc6d7ab9793644b64fd5a8747fb5e7417d4efb11ea12a107748be87673394ccf5319942ade4c867bc1a85efb31fa3d0ad43f90e96dd06d
7
- data.tar.gz: fa3a8d3b174648935d83f2d2f52dab49a79a9bbdf7b5bb2676be6501f13655840b007514c722e94f239502b77c06f32f4ac3a463564276b61fcf5316242853f7
6
+ metadata.gz: 09934d2cd0ffec9fdef68a44a219592bb5c97cd8c32705c6361f678e66de045398812637ad116ed06d7fb12898b6c2a52be61a4b847415affcc7f7422b508bfd
7
+ data.tar.gz: 7bcb3211a9104ef47bac152387efa89987c46df3436175095ab799bad4bcbb4b4045ba53874c6f62e6075cda7b1ecba14ad3df4d4033cc432eaa3b8b8f74378a
data/.gitignore ADDED
@@ -0,0 +1,2 @@
1
+ .DS_Store
2
+ middleman-swift-*
@@ -30,24 +30,31 @@ module Middleman
30
30
 
31
31
  empty_directory File.join(location, 'source', options[:css_dir])
32
32
  copy_file 'source/css/screen.css.scss', File.join(location, 'source', options[:css_dir], 'screen.css.scss')
33
- copy_file 'source/css/partials/_font-styles.scss', File.join(location, 'source', options[:css_dir], 'partials/_font-styles.scss')
34
- copy_file 'source/css/partials/_swift-framework.scss', File.join(location, 'source', options[:css_dir], 'partials/_swift-framework.scss')
35
- copy_file 'source/css/partials/_page-about-us.scss', File.join(location, 'source', options[:css_dir], 'partials/_page-about.scss')
36
- copy_file 'source/css/partials/_page-contact-us.scss', File.join(location, 'source', options[:css_dir], 'partials/_page-contact.scss')
37
- copy_file 'source/css/partials/_page-home.scss', File.join(location, 'source', options[:css_dir], 'partials/_page-home.scss')
38
- copy_file 'source/css/partials/_reset.scss', File.join(location, 'source', options[:css_dir], 'partials/_reset.scss')
33
+ copy_file 'source/css/framework/_swift-framework.scss', File.join(location, 'source', options[:css_dir], 'framework/_swift-framework.scss')
34
+ copy_file 'source/css/framework/_reset.scss', File.join(location, 'source', options[:css_dir], 'framework/_reset.scss')
35
+ copy_file 'source/css/framework/_typography.scss', File.join(location, 'source', options[:css_dir], 'framework/_typography.scss')
36
+ copy_file 'source/css/modules/.gitkeep', File.join(location, 'source', options[:css_dir], 'modules/.gitkeep')
37
+ copy_file 'source/css/global/_global.scss', File.join(location, 'source', options[:css_dir], 'global/_global.scss')
38
+ copy_file 'source/css/pages/_page-home.scss', File.join(location, 'source', options[:css_dir], 'pages/_page-home.scss')
39
39
  copy_file 'source/css/partials/_sidebar.scss', File.join(location, 'source', options[:css_dir], 'partials/_sidebar.scss')
40
+ copy_file 'source/css/overrides/.gitkeep', File.join(location, 'source', options[:css_dir], 'overrides/.gitkeep')
41
+ copy_file 'source/css/vendors/.gitkeep', File.join(location, 'source', options[:css_dir], 'vendors/.gitkeep')
42
+ copy_file 'source/css/fonts/_fonts.scss', File.join(location, 'source', options[:css_dir], 'fonts/_fonts.scss')
40
43
  copy_file 'source/css/ie.css.scss', File.join(location, 'source', options[:css_dir], 'ie.css.scss')
41
44
  copy_file 'source/css/print.css.scss', File.join(location, 'source', options[:css_dir], 'print.css.scss')
42
- copy_file 'source/css/fonts/.gitkeep', File.join(location, 'source', options[:css_dir], 'fonts/.gitkeep')
43
45
 
44
46
  empty_directory File.join(location, 'source', options[:js_dir])
45
- copy_file 'source/js/script.js', File.join(location, 'source', options[:js_dir], 'script.js')
47
+ copy_file 'source/js/framework/.gitkeep', File.join(location, 'source', options[:js_dir], 'framework/.gitkeep')
48
+ copy_file 'source/js/modules/.gitkeep', File.join(location, 'source', options[:js_dir], 'modules/.gitkeep')
49
+ copy_file 'source/js/vendors/.gitkeep', File.join(location, 'source', options[:js_dir], 'vendors/.gitkeep')
50
+ copy_file 'source/js/overrides/.gitkeep', File.join(location, 'source', options[:js_dir], 'overrides/.gitkeep')
51
+ copy_file 'source/js/pages/.gitkeep', File.join(location, 'source', options[:js_dir], 'pages/.gitkeep')
46
52
  copy_file 'source/js/boxsizing.htc', File.join(location, 'source', options[:js_dir], 'boxsizing.htc')
47
- copy_file 'source/js/ie.js', File.join(location, 'source', options[:js_dir], 'ie.js')
48
53
  copy_file 'source/js/PIE.htc', File.join(location, 'source', options[:js_dir], 'PIE.htc')
49
54
  copy_file 'source/js/PIE.php', File.join(location, 'source', options[:js_dir], 'PIE.php')
50
55
  copy_file 'source/js/respond.min.js', File.join(location, 'source', options[:js_dir], 'respond.min.js')
56
+ copy_file 'source/js/script.js', File.join(location, 'source', options[:js_dir], 'script.js')
57
+ copy_file 'source/js/ie.js', File.join(location, 'source', options[:js_dir], 'ie.js')
51
58
 
52
59
  empty_directory File.join(location, 'source', options[:images_dir])
53
60
  copy_file 'source/img/icon/.gitkeep', File.join(location, 'source', options[:images_dir], 'icon/.gitkeep')
@@ -3,6 +3,8 @@
3
3
  source 'http://rubygems.org'
4
4
 
5
5
  gem "middleman", "~><%= Middleman::VERSION %>"
6
+
7
+ # Adds Slim support for rapid development
6
8
  gem "slim", "~> 2.0.0"
7
9
 
8
10
  # Live-reloading plugin
@@ -11,6 +13,15 @@ gem "middleman-livereload", "~> 3.1.0"
11
13
  # Favicon maker
12
14
  gem "middleman-favicon-maker"
13
15
 
16
+ # Fmport entire sass folders
17
+ gem 'sass-globbing', '~> 1.1.0'
18
+
19
+ # Deploy
20
+ gem "middleman-deploy"
21
+
22
+ # Runs image optim on images on build
23
+ gem "middleman-imageoptim", "~> 0.1.4"
24
+
14
25
  # For faster file watcher updates:
15
26
  # gem "wdm", "~> 0.1.0") # Windows
16
27
 
@@ -1,12 +1,3 @@
1
- ###
2
- # Compass
3
- ###
4
-
5
- # Change Compass configuration
6
- # compass_config do |config|
7
- # config.output_style = :compact
8
- # end
9
-
10
1
  ###
11
2
  # Page options, layouts, aliases and proxies
12
3
  ###
@@ -28,22 +19,40 @@
28
19
  # proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
29
20
  # :which_fake_page => "Rendering a fake page with a local variable" }
30
21
 
22
+ # variables
23
+ @image_dir = 'img'
24
+ @css_dir = 'css'
25
+ @js_dir = 'js'
26
+
27
+
31
28
  ###
32
29
  # Helpers
33
30
  ###
34
31
 
32
+
35
33
  # Automatic image dimensions on image_tag helper
36
34
  # activate :automatic_image_sizes
37
35
 
38
36
  # Reload the browser automatically whenever files change
39
37
  activate :livereload
40
38
 
39
+ set :relative_links, true
40
+
41
+ # remove file extensions from url
42
+ activate :directory_indexes
43
+
41
44
  # Methods defined in the helpers block are available in templates
42
- # helpers do
43
- # def some_helper
44
- # "Helping"
45
- # end
46
- # end
45
+ helpers do
46
+ def is_page page_classes
47
+ if page_classes != 'index'
48
+ return 'page'
49
+ end
50
+ end
51
+
52
+ def img
53
+ return "../#{@image_dir}"
54
+ end
55
+ end
47
56
 
48
57
 
49
58
  # Enable Slim support
@@ -74,19 +83,41 @@ set :images_dir, '<%= options[:images_dir] -%>'
74
83
  # Example: bower install jquery
75
84
  sprockets.append_path '../bower_components/'
76
85
 
86
+ # Compress images
87
+ activate :imageoptim do |image_optim|
88
+ image_optim.pngout_options = false # Should disable pngout
89
+ end
90
+
91
+ # activate :deploy do |deploy|
92
+ # deploy.method = :rsync
93
+ # deploy.host = ""
94
+ # deploy.path = "/var/www/vhosts/..."
95
+ # # Optional Settings
96
+ # # deploy.user = "tvaughan" # no default
97
+ # # deploy.port = 5309 # ssh port, default: 22
98
+ # # deploy.clean = true # remove orphaned files on remote host, default: false
99
+ # deploy.flags = "-rltgoDvzO --no-p --del" # add custom flags, default: -avz
100
+ # deploy.build_before = true # default: false
101
+ # end
102
+
77
103
  # Build-specific configuration
78
104
  configure :build do
79
105
  # For example, change the Compass output style for deployment
80
- # activate :minify_css
106
+
107
+ activate :minify_html
108
+
109
+ activate :minify_css
81
110
 
82
111
  # Minify Javascript on build
83
- # activate :minify_javascript
112
+ activate :minify_javascript
113
+
114
+ activate :gzip
84
115
 
85
116
  # Enable cache buster
86
117
  # activate :asset_hash
87
118
 
88
119
  # Use relative URLs
89
- # activate :relative_assets
120
+ activate :relative_assets
90
121
 
91
122
  # Or use a different image path
92
123
  # set :http_path, "/Content/images/"
@@ -0,0 +1,249 @@
1
+ // -------------------------------------------------
2
+ // Swift Compass Imports
3
+ // ---------------------------------------------- */
4
+ @import "framework/reset";
5
+ @import "compass/css3/border-radius";
6
+ @import "compass/css3/box-shadow";
7
+ @import "compass/css3/box-sizing";
8
+ @import "compass/css3/images";
9
+ @import "compass/css3/opacity";
10
+ @import "compass/css3/transform";
11
+ @import "compass/css3/transition";
12
+ @import "compass/typography/lists/inline-block-list";
13
+ @import "compass/typography/text/replacement";
14
+ @import "compass/utilities/general/clearfix";
15
+ @import "compass/utilities/sprites";
16
+
17
+
18
+ // -------------------------------------------------
19
+ // Swift Variables
20
+ // ---------------------------------------------- */
21
+ $page-width: 1024px;
22
+ $ani-speed: 250ms;
23
+
24
+ // -------------------------------------------------
25
+ // Media Query Break Points
26
+ // ---------------------------------------------- */
27
+ $mobile: 420px;
28
+ $tablet: 768px;
29
+ $desktop: 1000px;
30
+
31
+ // -------------------------------------------------
32
+ // Fixes
33
+ // ---------------------------------------------- */
34
+
35
+ * { @include box-sizing('border-box'); }
36
+
37
+ /* iOS fixes */
38
+ html { -webkit-text-size-adjust: none; }
39
+ input[type=submit] { -webkit-appearance: none; -moz-appearance: none; }
40
+
41
+ /* Media Queries for determining javascript events, via http://adactio.com/journal/5429/ */
42
+ // body:after { content: 'mobile'; display: none; }
43
+ // @media only screen and (min-width: $desktop) {
44
+ // body:after { content: 'desktop'; }
45
+ // }
46
+
47
+ // -------------------------------------------------
48
+ // Swift Mixins
49
+ // ---------------------------------------------- */
50
+
51
+ // media query
52
+ @mixin breakpoint($min-point: 0, $max-point: $desktop) {
53
+ @media (min-width: $min-point) and (max-width: $max-point) { @content; }
54
+ }
55
+
56
+ @mixin mobile($operator: eq) {
57
+
58
+ @if $operator == gt {
59
+ @media (min-width: $tablet) { @content; }
60
+ }
61
+ @else if ( $operator == eq ) {
62
+ @media (max-width: $tablet - 1){ @content; }
63
+ }
64
+ }
65
+
66
+ @mixin tablet($operator: eq) {
67
+
68
+ @if ( $operator == gt ) {
69
+ @media (min-width: $desktop){ @content; }
70
+ }
71
+ @else if ( $operator == lt ) {
72
+ @media (max-width: $tablet - 1){ @content; }
73
+ }
74
+ @else if ( $operator == eq ) {
75
+ @media (min-width: $tablet) and (max-width: $desktop - 1 ) { @content; }
76
+ }
77
+ @else if ( $operator == ge ) {
78
+ @media (min-width: $tablet){ @content; }
79
+ }
80
+ @else if ( $operator == le ) {
81
+ @media (max-width: $tablet - 1){ @content; }
82
+ }
83
+ }
84
+
85
+ @mixin desktop($operator: eq) {
86
+
87
+ @if ( $operator == lt ) {
88
+ @media (max-width: $desktop - 1){ @content; }
89
+ }
90
+ @else if ( $operator == eq ) {
91
+ @media (min-width: $desktop) { @content; }
92
+ }
93
+ }
94
+
95
+ @mixin input-placeholder() {
96
+ ::-webkit-input-placeholder { @content; }
97
+ :-moz-placeholder { @content; }
98
+ ::-moz-placeholder { @content; }
99
+ :-ms-input-placeholder { @content; }
100
+ }
101
+
102
+ // custom text selection treatment, developed from http://stackoverflow.com/a/10372599/136018
103
+ @mixin selection($color, $background) {
104
+ $prefixes: ("-webkit-","-moz-", "-o-", "");
105
+ @each $prefix in $prefixes {
106
+ ::#{$prefix}selection {
107
+ color: $color;
108
+ background: $background;
109
+ text-shadow:none; // remove any text shadows:twitter.com/miketaylr/status/12228805301)
110
+ }
111
+ }
112
+ /* j.mp/webkit-tap-highlight-color */
113
+ a:link{-webkit-tap-highlight-color:$background;}
114
+ ins{background-color:$background;color:$color;text-decoration:none;}
115
+ }
116
+
117
+ @mixin font-smoothing($value: on) {
118
+ @if $value == on {
119
+ -webkit-font-smoothing: antialiased;
120
+ -moz-osx-font-smoothing: grayscale;
121
+ }
122
+ @else {
123
+ -webkit-font-smoothing: subpixel-antialiased;
124
+ -moz-osx-font-smoothing: auto;
125
+ }
126
+ }
127
+
128
+ @mixin inline-block($percent: auto) {
129
+ display: inline-block;
130
+ width: $percent;
131
+ padding-right: 2%;
132
+ box-sizing: border-box;
133
+ vertical-align: top;
134
+ zoom: 1;
135
+
136
+ .lt-ie8 & {
137
+ display: inline;
138
+ }
139
+
140
+ &.last {
141
+ padding-right: 0;
142
+ }
143
+ }
144
+
145
+ // Remove UL Styling
146
+ @mixin ul-reset {
147
+ list-style: none;
148
+ margin: 0;
149
+ padding-bottom: 0;
150
+ }
151
+
152
+ @mixin areas-text-style-nav {
153
+ font-size: .875em;
154
+ text-transform: uppercase;
155
+ letter-spacing: .15em;
156
+ }
157
+
158
+ @mixin hyphenate {
159
+ -ms-word-break: break-all;
160
+ word-break: break-all;
161
+ // Non standard for webkit
162
+ word-break: break-word;
163
+ -webkit-hyphens: auto;
164
+ -moz-hyphens: auto;
165
+ hyphens: auto;
166
+ }
167
+
168
+ @mixin trans-fade-hidden {
169
+ @include transition(opacity $ani_speed linear 0ms, visibility $ani_speed linear 0ms);
170
+ visibility: hidden;
171
+ opacity: 0;
172
+ }
173
+
174
+ @mixin trans-fade-visible {
175
+ visibility: visible;
176
+ opacity: 1;
177
+ }
178
+
179
+ /*-----------------------------------*\
180
+ $GRID
181
+ \*-----------------------------------*/
182
+ .region {
183
+ overflow: hidden;
184
+ }
185
+ .container,
186
+ .grid {
187
+ margin-left: 0;
188
+ max-width: none;
189
+ -webkit-transition: 0.5s;
190
+ transition: 0.5s;
191
+ -webkit-transition-delay: 0.7s;
192
+ transition-delay: 0.7s;
193
+ @include tablet(ge) {
194
+ margin-left: -2.5%;
195
+ max-width: 105%;
196
+ }
197
+ }
198
+
199
+ .wrapper,
200
+ .unit,
201
+ .item {
202
+ display: block;
203
+ *display: inline;
204
+ vertical-align: top;
205
+ width: 100%;
206
+ margin-left: 0;
207
+ *zoom: 1;
208
+ /* Clearfix */
209
+ /*overflow: hidden;*/
210
+ *overflow: visible;
211
+ -webkit-transition: width 0.5s;
212
+ transition: width 0.5s;
213
+ -webkit-transition-delay: 0.7s;
214
+ transition-delay: 0.7s;
215
+ @include tablet(ge) {
216
+ display: inline-block;
217
+ margin-left: 2.5%;
218
+ &.one-of-one {
219
+ width: 97.5%;
220
+ }
221
+ &.one-of-two {
222
+ width: 47.5%;
223
+ }
224
+ &.one-of-three {
225
+ width: 30.8333333%;
226
+ }
227
+ &.two-of-three {
228
+ width: 64.1666666%;
229
+ }
230
+ &.one-of-four {
231
+ width: 22.5%;
232
+ }
233
+ &.three-of-four {
234
+ width: 72.5%;
235
+ }
236
+ &.one-of-five {
237
+ width: 17.44%;
238
+ }
239
+ &.two-of-five {
240
+ width: 37.44%;
241
+ }
242
+ &.three-of-five {
243
+ width: 57.44%;
244
+ }
245
+ &.four-of-five {
246
+ width: 77.44%;
247
+ }
248
+ }
249
+ }
@@ -0,0 +1,135 @@
1
+
2
+ @mixin font-size-rem($size: 1.6){
3
+ font-size: ($size * 10 + 5) + px;
4
+ font-size: $size + rem;
5
+ }
6
+
7
+ @mixin line-height-rem($size: 1.6){
8
+ line-height: ($size * 10 + 5) + px;
9
+ line-height: $size + rem;
10
+ }
11
+
12
+ body,select,input,textarea{color:#333;}
13
+
14
+ $heading-font: 'Helvetica', Arial, sans-serif;
15
+ $body-font: 'Helvetica', Arial, sans-serif;
16
+
17
+ $body-color: #666666;
18
+ $heading-color: #666666;
19
+ $link-color: #4c7cd3;
20
+ $link-hover: #7ca2df;
21
+
22
+ body {
23
+ color: $body-color;
24
+ font-size: 100%;
25
+ font-weight: normal;
26
+ line-height: 150%;
27
+ font-family: $body-font;
28
+ }
29
+ a {
30
+ color: $link-color;
31
+ font-size: 1em; /* 16x1=16 */
32
+ font-family: $body-font;
33
+ text-decoration: none;
34
+ &:hover{
35
+ color: $link-hover;
36
+ }
37
+ }
38
+ h1 {
39
+ margin-bottom: 5px;
40
+ color: $heading-color;
41
+ font-family: $heading-font;
42
+ font-weight: 700;
43
+ // @include font-smoothing(on);
44
+ @include font-size-rem(.8);
45
+ @include line-height-rem(1.1);
46
+ @include breakpoint(tablet) {
47
+ margin-bottom: 18px;
48
+ @include font-size-rem(1.2);
49
+ @include line-height-rem(1.2);
50
+ }
51
+ @include breakpoint(desktop) {
52
+ @include font-size-rem(1.2);
53
+ @include line-height-rem(1.2);
54
+ }
55
+ }
56
+ h2 {
57
+ margin-bottom: 5px;
58
+ color: $heading-color;
59
+ font-family: $body-font;
60
+ font-weight: 300;
61
+ @include font-size-rem(1.4);
62
+ @include line-height-rem(1.4);
63
+ @include breakpoint(tablet) {
64
+
65
+ }
66
+ @include breakpoint(desktop) {
67
+ @include font-size-rem(1.8);
68
+ @include line-height-rem(1.8);
69
+ }
70
+ }
71
+ h3 {
72
+ color: $heading-color;
73
+ font-weight: 400;
74
+ @include font-size-rem(.8);
75
+ @include line-height-rem(1);
76
+ @include breakpoint(tablet) {
77
+ @include font-size-rem(1);
78
+ @include line-height-rem(1.2);
79
+ }
80
+ @include breakpoint(desktop) {
81
+ @include font-size-rem(1.1);
82
+ @include line-height-rem(1.3);
83
+ }
84
+ }
85
+ h4 {
86
+ margin-bottom: 12px;
87
+ font-size: 1.2em; /* 16x0.875=19.2 */
88
+ line-height: 1em; /* 24px */
89
+ color: $heading-color;
90
+ }
91
+ p {
92
+ font-weight: 300;
93
+ padding-bottom: 1em;
94
+ @include font-size-rem(1.2);
95
+ @include line-height-rem(1.7);
96
+ @include breakpoint( tablet ) {
97
+ padding-bottom: 1.3em;
98
+ }
99
+ @include breakpoint(desktop) {
100
+ padding-bottom: 1.3em;
101
+ @include font-size-rem(1.4);
102
+ @include line-height-rem(1.9);
103
+ }
104
+ }
105
+ ul {
106
+ list-style: disc;
107
+ margin: 0 0 0 1.1em;
108
+ padding-bottom: 1em;
109
+ li {
110
+ font-weight: 300;
111
+ }
112
+ nav & { // remove styling for nav ul's
113
+ list-style: none;
114
+ margin: 0;
115
+ padding-bottom: 0;
116
+ a { text-decoration: none; }
117
+ }
118
+ }
119
+ ol {
120
+ list-style: decimal;
121
+ margin: 0 0 1em 2em;
122
+ li { margin: .5em 0; }
123
+ ol { list-style: lower-alpha; }
124
+ }
125
+ blockquote {
126
+ padding-bottom: 1.3em;
127
+ @include font-size-rem(1.9);
128
+ @include line-height-rem(2.4);
129
+ .credit {
130
+ margin-top: 20px;
131
+ padding-left: 170px;
132
+ @include font-size-rem(1.1);
133
+ @include line-height-rem(1.1);
134
+ }
135
+ }
@@ -1,5 +1,5 @@
1
1
  /* IE<9 Overrides */
2
- @import "partials/swift-framework";
2
+ @import "framework/swift-framework";
3
3
  @import "compass/css3/pie";
4
4
 
5
5
 
@@ -7,7 +7,7 @@
7
7
  // SASS-y IE Specific
8
8
  // ---------------------------------------------- */
9
9
  $shadow_alt: #333;
10
- $pie-behavior: url(/js/PIE.php); // BE SURE TO UPDATE THIS PATH
10
+ $pie-behavior: url(/js/framework/PIE.php); // BE SURE TO UPDATE THIS PATH
11
11
 
12
12
  @mixin shadow-replace {
13
13
  border-bottom: 1px solid $shadow_alt;
@@ -27,5 +27,5 @@ $pie-behavior: url(/js/PIE.php); // BE SURE TO UPDATE THIS PATH
27
27
  ** ---------------------------------------------- */
28
28
  .lt-ie8 {
29
29
  //Hack for IE7 and lower box-sizing
30
- * { box-sizing: border-box; *behavior: url(/js/boxsizing.htc); }
30
+ * { box-sizing: border-box; *behavior: url(/js/framework/boxsizing.htc); }
31
31
  } //end .lt-ie8
@@ -1,5 +1,4 @@
1
- @import "partials/swift-framework";
2
- @import "partials/font-styles";
1
+
3
2
  // @import "icon/*.png";
4
3
  // @include all-icon-sprites;
5
4
 
@@ -13,22 +12,6 @@
13
12
  /* -------------------------------------------------
14
13
  ** TEMPLATE
15
14
  ** ---------------------------------------------- */
16
- * { @include box-sizing('border-box'); }
17
-
18
- /* iOS fixes */
19
- html { -webkit-text-size-adjust: none; }
20
- input[type=submit] { -webkit-appearance: none; -moz-appearance: none; }
21
-
22
- /* Media Queries for determining javascript events, via http://adactio.com/journal/5429/ */
23
- body:after { content: 'mobile'; display: none; }
24
- @media only screen and (min-width: $mq-desktop) {
25
- body:after { content: 'desktop'; }
26
- }
27
- // STANDARD MEDIA QUERY EXAMPLE
28
-
29
- // @media screen and (min-width: $mq-desktop) {
30
- // /* styles here */
31
- // } // END @media: $mq-desktop
32
15
 
33
16
  // SLECTOR SPECIFIC MEDIA QUERY EXAMPLE
34
17
  // .example-selector
@@ -41,40 +24,37 @@ body:after { content: 'mobile'; display: none; }
41
24
  // }
42
25
  // }
43
26
 
44
-
45
- /*--------------START BASE STRUCTURE-------------- */
46
27
  /* -------------------------------------------------
47
- ** Body
28
+ ** Framework
48
29
  ** ---------------------------------------------- */
30
+ @import "framework/*";
49
31
 
50
32
  /* -------------------------------------------------
51
- ** Wrapper
33
+ ** Global
52
34
  ** ---------------------------------------------- */
35
+ @import "global/*";
53
36
 
54
37
  /* -------------------------------------------------
55
- ** Header
38
+ ** Vendor
56
39
  ** ---------------------------------------------- */
40
+ @import "vendors/*";
57
41
 
58
42
  /* -------------------------------------------------
59
- ** Section
43
+ ** overrides
60
44
  ** ---------------------------------------------- */
45
+ @import "overrides/*";
61
46
 
62
47
  /* -------------------------------------------------
63
- ** Sidebar
48
+ ** partials
64
49
  ** ---------------------------------------------- */
50
+ @import "partials/*";
65
51
 
66
52
  /* -------------------------------------------------
67
- ** Footer
53
+ ** modules
68
54
  ** ---------------------------------------------- */
55
+ @import "modules/*";
69
56
 
70
-
71
-
72
- /*--------------END BASE STRUCTURE--------------- */
73
57
  /* -------------------------------------------------
74
- ** SITE SPECIFIC IMPORTS AND MODULES
58
+ ** pages
75
59
  ** ---------------------------------------------- */
76
-
77
- // @import "partials/page-home";
78
- // @import "partials/page-about-us";
79
- // @import "partials/page-contact-us";
80
- // @import "partials/sidebar";
60
+ @import "pages/*";
@@ -1 +1,6 @@
1
+ //= require_directory "./vendors"
2
+ //= require_directory "./overrides"
3
+ //= require_directory "./framework"
4
+ //= require_directory "./modules"
5
+ //= require_directory "./pages"
1
6
 
@@ -1,5 +1,5 @@
1
1
  module Middleman
2
2
  module Swift
3
- VERSION = "0.1.0"
3
+ VERSION = "0.2.0"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,41 +1,41 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: middleman-swift
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - micalexander
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-18 00:00:00.000000000 Z
11
+ date: 2014-11-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: slim
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 2.0.0
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 2.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: middleman-core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 3.1.0
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 3.1.0
41
41
  description: middleman-swift is a Middleman static site generator Template that has
@@ -46,6 +46,7 @@ executables: []
46
46
  extensions: []
47
47
  extra_rdoc_files: []
48
48
  files:
49
+ - ".gitignore"
49
50
  - Gemfile
50
51
  - Gemfile.lock
51
52
  - LICENSE.txt
@@ -59,31 +60,33 @@ files:
59
60
  - lib/middleman-swift/template/source/404.html.slim
60
61
  - lib/middleman-swift/template/source/crossdomain.xml
61
62
  - lib/middleman-swift/template/source/css/.gitkeep
62
- - lib/middleman-swift/template/source/css/fonts/.gitkeep
63
+ - lib/middleman-swift/template/source/css/fonts/_fonts.scss
64
+ - lib/middleman-swift/template/source/css/framework/_reset.scss
65
+ - lib/middleman-swift/template/source/css/framework/_swift-framework.scss
66
+ - lib/middleman-swift/template/source/css/framework/_typography.scss
67
+ - lib/middleman-swift/template/source/css/global/_global.scss
63
68
  - lib/middleman-swift/template/source/css/ie.css.scss
64
- - lib/middleman-swift/template/source/css/partials/_font-styles.scss
65
- - lib/middleman-swift/template/source/css/partials/_page-about-us.scss
66
- - lib/middleman-swift/template/source/css/partials/_page-contact-us.scss
67
- - lib/middleman-swift/template/source/css/partials/_page-home.scss
68
- - lib/middleman-swift/template/source/css/partials/_reset.scss
69
+ - lib/middleman-swift/template/source/css/modules/.gitkeep
70
+ - lib/middleman-swift/template/source/css/overrides/.gitkeep
71
+ - lib/middleman-swift/template/source/css/pages/_page-home.scss
69
72
  - lib/middleman-swift/template/source/css/partials/_sidebar.scss
70
- - lib/middleman-swift/template/source/css/partials/_swift-framework.scss
71
73
  - lib/middleman-swift/template/source/css/print.css.scss
72
74
  - lib/middleman-swift/template/source/css/screen.css.scss
75
+ - lib/middleman-swift/template/source/css/vendors/.gitkeep
73
76
  - lib/middleman-swift/template/source/humans.txt
74
- - lib/middleman-swift/template/source/img/.DS_Store
75
77
  - lib/middleman-swift/template/source/img/icon/.gitkeep
76
78
  - lib/middleman-swift/template/source/index.html.slim
77
- - lib/middleman-swift/template/source/js/.DS_Store
78
- - lib/middleman-swift/template/source/js/.gitkeep
79
79
  - lib/middleman-swift/template/source/js/PIE.htc
80
80
  - lib/middleman-swift/template/source/js/PIE.php
81
81
  - lib/middleman-swift/template/source/js/boxsizing.htc
82
+ - lib/middleman-swift/template/source/js/framework/.gitkeep
82
83
  - lib/middleman-swift/template/source/js/ie.js
84
+ - lib/middleman-swift/template/source/js/modules/.gitkeep
85
+ - lib/middleman-swift/template/source/js/overrides/.gitkeep
86
+ - lib/middleman-swift/template/source/js/pages/.gitkeep
83
87
  - lib/middleman-swift/template/source/js/respond.min.js
84
88
  - lib/middleman-swift/template/source/js/script.js
85
- - lib/middleman-swift/template/source/layouts/.DS_Store
86
- - lib/middleman-swift/template/source/layouts/.gitkeep
89
+ - lib/middleman-swift/template/source/js/vendors/.gitkeep
87
90
  - lib/middleman-swift/template/source/layouts/layout.slim
88
91
  - lib/middleman-swift/template/source/robots.txt
89
92
  - lib/middleman-swift/version.rb
@@ -99,17 +102,17 @@ require_paths:
99
102
  - lib
100
103
  required_ruby_version: !ruby/object:Gem::Requirement
101
104
  requirements:
102
- - - '>='
105
+ - - ">="
103
106
  - !ruby/object:Gem::Version
104
107
  version: '0'
105
108
  required_rubygems_version: !ruby/object:Gem::Requirement
106
109
  requirements:
107
- - - '>='
110
+ - - ">="
108
111
  - !ruby/object:Gem::Version
109
112
  version: '0'
110
113
  requirements: []
111
114
  rubyforge_project:
112
- rubygems_version: 2.1.3
115
+ rubygems_version: 2.2.2
113
116
  signing_key:
114
117
  specification_version: 4
115
118
  summary: A Middleman template using Slim Sass and HTML5 Boilerplate.
@@ -1,45 +0,0 @@
1
- body {
2
- color: $body-color;
3
- font-size: 100%;
4
- font-weight: normal;
5
- line-height: 150%;
6
- font-family: $body-font;
7
- }
8
- a {
9
- color: $link-color;
10
- &:hover{
11
- color: $link-hover;
12
- }
13
- }
14
- h1 {
15
- font-size: 2.25em; /* 16x2.25=36 */
16
- line-height: 1.33333333333333em; /* 48px */
17
- color: $heading-color;
18
- }
19
- h2 {
20
- font-size: 1.5em; /* 16x1.5=24 */
21
- color: $heading-color; /* 24px */
22
- }
23
- h3 {
24
- font-size: 1.125em; /* 16x1.125=18 */
25
- line-height: 1.33333333333333em; /* 24px */
26
- color: $heading-color;
27
- }
28
- h4 {
29
- font-size: 0.875em; /* 16x0.875=14 */
30
- line-height: 1.71428571428571em; /* 24px */
31
- color: $heading-color;
32
- }
33
- p {
34
- font-size: 1em; /* 16x1=16 */
35
- padding-bottom: 1em;
36
- }
37
- ul {
38
- list-style: disc;
39
- margin: 0 0 0 1.1em;
40
- padding-bottom: 1em;
41
- nav & { // remove styling for nav ul's
42
- @include ul-reset;
43
- a { text-decoration: none; }
44
- }
45
- }
@@ -1,186 +0,0 @@
1
- // -------------------------------------------------
2
- // Slim Compass Imports
3
- // ---------------------------------------------- */
4
- @import "partials/reset";
5
- @import "compass/css3/border-radius";
6
- @import "compass/css3/box-shadow";
7
- @import "compass/css3/box-sizing";
8
- @import "compass/css3/images";
9
- @import "compass/css3/opacity";
10
- @import "compass/css3/transform";
11
- @import "compass/css3/transition";
12
- @import "compass/typography/lists/inline-block-list";
13
- @import "compass/typography/text/replacement";
14
- @import "compass/utilities/general/clearfix";
15
-
16
-
17
- // -------------------------------------------------
18
- // Slim Variables
19
- // ---------------------------------------------- */
20
- $heading-font: Helvetica, Arial, sans-serif;
21
- $body-font: Helvetica, Arial, sans-serif;
22
-
23
- $body-color: #555;
24
- $heading-color: #333;
25
- $link-color: #000;
26
- $link-hover: #555;
27
-
28
- $page-width: 1280px;
29
-
30
- $ani-speed: 250ms;
31
-
32
-
33
- // -------------------------------------------------
34
- // Media Query Break Points
35
- // ---------------------------------------------- */
36
- $mq-mobile: 420px;
37
- $mq-mob-tab: 520px;
38
- $mq-tablet: 620px;
39
- $mq-tab-desk: 820px;
40
- $mq-desktop: 920px;
41
-
42
-
43
- // -------------------------------------------------
44
- // Basic Styles
45
- // ---------------------------------------------- */
46
-
47
- body,select,input,textarea{color:#333;}
48
-
49
- // -------------------------------------------------
50
- // Slim Mixins
51
- // ---------------------------------------------- */
52
-
53
-
54
- // media query
55
- @mixin breakpoint($point) {
56
- @if $point == mobile {
57
- @media (min-width: $mq-mobile) { @content; }
58
- }
59
- @else if $point == mob-tab {
60
- @media (min-width: $mq-mob-tab) { @content; }
61
- }
62
- @else if $point == tablet {
63
- @media (min-width: $mq-tablet) { @content; }
64
- }
65
- @else if $point == tab-desk {
66
- @media (min-width: $mq-tab-desk) { @content; }
67
- }
68
- @else if $point == desktop {
69
- @media (min-width: $mq-desktop) { @content; }
70
- }
71
- }
72
- // custom text selection treatment, developed from http://stackoverflow.com/a/10372599/136018
73
- @mixin selection($color, $background) {
74
- $prefixes: ("-webkit-","-moz-", "-o-", "");
75
- @each $prefix in $prefixes {
76
- ::#{$prefix}selection {
77
- color: $color;
78
- background: $background;
79
- text-shadow:none; // remove any text shadows:twitter.com/miketaylr/status/12228805301)
80
- }
81
- }
82
- /* j.mp/webkit-tap-highlight-color */
83
- a:link{-webkit-tap-highlight-color:$background;}
84
- ins{background-color:$background;color:$color;text-decoration:none;}
85
- }
86
-
87
- // Remove UL Styling
88
- @mixin ul-reset {
89
- list-style: none;
90
- margin: 0;
91
- padding-bottom: 0;
92
- }
93
-
94
- // Rem Font Sizing
95
- @mixin font-size-rem($size: 1.6){
96
- font-size: ($size * 10 + 5) + px;
97
- font-size: $size + rem;
98
- }
99
-
100
- @mixin line-height-rem($size: 1.6){
101
- line-height: ($size * 10 + 5) + px;
102
- line-height: $size + rem;
103
- }
104
-
105
- @mixin areas-text-style-nav {
106
- font-size: .875em;
107
- text-transform: uppercase;
108
- letter-spacing: .15em;
109
- }
110
-
111
- @mixin a-white-to-black {
112
- color: white;
113
- &:hover { color: black; }
114
- }
115
-
116
- @mixin header-box($w) {
117
- $header_width: $w;
118
- position: relative;
119
- width: $header_width;
120
- padding: 11em 1.7em 1.1em;
121
- //display: table-cell;
122
- vertical-align: bottom;
123
- margin: 0 0 1.1em;
124
- overflow: hidden;
125
-
126
- &:after {
127
- position: absolute;
128
- width: 50.4em;
129
- height: 44em;
130
- bottom: -6.8em;
131
- right: -7.4em;
132
- content: '';
133
- background-color: $gold_alt;
134
- @include rotate(-45deg);
135
- }
136
-
137
- h2 {
138
- position: relative;
139
- z-index: 2;
140
- margin: 0;
141
- }
142
- }
143
-
144
- @mixin column-50-pct {
145
- width: 50%;
146
- float: left;
147
-
148
- p {
149
- padding: 0 2em 1em;
150
- }
151
- }
152
-
153
- @mixin column-33-pct {
154
- width: (($page_width - 40 - 20*2) / 3);
155
- float: left;
156
- margin-left: 20px;
157
-
158
- &.first { margin-left: 0; }
159
-
160
- p {
161
- padding: 0 0 1em;
162
- }
163
- }
164
-
165
- @mixin column-66-pct {
166
- width: (($page_width - 40 - 10) / 3 * 2);
167
- float: left;
168
- margin-left: 20px;
169
-
170
- &.first { margin-left: 0; }
171
-
172
- p {
173
- padding: 0 2em 1em;
174
- }
175
- }
176
-
177
- @mixin trans-fade-hidden {
178
- @include transition(opacity $ani_speed linear 0ms, visibility $ani_speed linear 0ms);
179
- visibility: hidden;
180
- opacity: 0;
181
- }
182
-
183
- @mixin trans-fade-visible {
184
- visibility: visible;
185
- opacity: 1;
186
- }