framous 0.3.1 → 0.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/CHANGELOG.mkdn +5 -0
  2. data/LICENSE.txt +1 -1
  3. data/stylesheets/framous/base/_typography.scss +3 -16
  4. data/stylesheets/framous/utility/_framous-settings.scss +12 -13
  5. data/templates/project/_settings.scss +12 -13
  6. data/templates/project/index.html +12 -3
  7. data/templates/project/screen.scss +4 -0
  8. metadata +4 -4
data/CHANGELOG.mkdn CHANGED
@@ -1,6 +1,11 @@
1
1
  Framous Changelog
2
2
  =================
3
3
 
4
+ v0.3.2 [Jul 23, 2013]
5
+ ---------------------
6
+ * typo & some changes here and there
7
+ * clean up v0.3.1
8
+
4
9
  v0.3.1 [Jul 23, 2013]
5
10
  ---------------------
6
11
  * fixe typo
data/LICENSE.txt CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2012, Alec Hance
1
+ Copyright (c) 2013, Alec Hance (@alechance) & Thomas Hermant (@thomashermant)
2
2
  All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without
data/stylesheets/framous/base/_typography.scss CHANGED
@@ -1,6 +1,5 @@
1
1
  // ---------------------------------------------------------------------------
2
2
  // Typography
3
- // http://drewish.com/tools/vertical-rhythm
4
3
 
5
4
  body,div,dl,dt,dd,ul,ol,li,
6
5
  h1,h2,h3,h4,h5,h6,
@@ -133,10 +132,6 @@ small {
133
132
  line-height: inherit;
134
133
  }
135
134
 
136
- code {
137
- background: $highlight-color;
138
- }
139
-
140
135
  // Lists
141
136
  ul, ol {
142
137
  @include adjust-font-size-to($p);
@@ -146,6 +141,7 @@ ul, ol {
146
141
  ul {
147
142
  list-style-position: outside;
148
143
  list-style-type: disc;
144
+
149
145
  li {
150
146
  ul, ol {
151
147
  margin-#{$default-float}: rhythm(1, $p);
@@ -156,6 +152,7 @@ ul {
156
152
  ol {
157
153
  list-style-position: outside;
158
154
  list-style-type: decimal;
155
+
159
156
  li {
160
157
  ul, ol {
161
158
  margin-#{$default-float}: rhythm(1, $p);
@@ -170,16 +167,6 @@ nav ol {
170
167
  padding: 0;
171
168
  }
172
169
 
173
- // Text Marking
174
- ins, mark {
175
- background-color: $highlight-color;
176
- color: invert($highlight-color);
177
- }
178
-
179
- ins {
180
- text-decoration: none;
181
- }
182
-
183
170
  del {
184
171
  text-decoration: line-through;
185
172
  }
@@ -205,7 +192,7 @@ blockquote {
205
192
  }
206
193
 
207
194
  abbr, acronym {
208
- border-bottom: 1px solid $grey-set;
195
+ border-bottom: 1px solid $border-color;
209
196
  color: $header-font-color;
210
197
  text-transform: uppercase !important;
211
198
  font-size: 90%;
data/stylesheets/framous/utility/_framous-settings.scss CHANGED
@@ -1,7 +1,7 @@
1
1
  // ---------------------------------------------------------------------------
2
2
  // Grid Settings
3
3
 
4
- $grid-system-style: 'fluid';
4
+ $grid-system-style: 'fluid'; // 'fluid' or 'fixed'
5
5
  $nb-columns: 12;
6
6
  $column-width: 60px;
7
7
  $gutter-width: 20px;
@@ -10,8 +10,8 @@ $max-width: 1200px;
10
10
  $border-box-sizing: true;
11
11
 
12
12
  // Breakpoints
13
+ // Mobile First
13
14
 
14
- $phone: 320px;
15
15
  $phone-wide: 480px;
16
16
  $tablet: 768px;
17
17
  $large-screen: 980px;
@@ -24,9 +24,6 @@ $large-screen: 980px;
24
24
  $blue-set: #465aff;
25
25
  $blue-dark-set: #143255;
26
26
  $blue-light-set: #afe1fa;
27
- $yellow-set: #ffc814;
28
- $yellow-light-set: #fff0c8;
29
- $green-set: #78c700;
30
27
 
31
28
  // Colors Set
32
29
 
@@ -34,12 +31,10 @@ $white-set: #fff;
34
31
  $grey-set: #808080;
35
32
  $black-set: #000;
36
33
 
37
- $background-body-color: transparent;
34
+ $background-body-color: $white-set;
38
35
  $txt-color: $blue-dark-set;
39
36
  $body-color: $blue-dark-set;
40
- $highlight-color: $yellow-light-set;
41
37
 
42
- $background-color: lighten($grey-set,45);
43
38
  $border-color: lighten($grey-set,30);
44
39
 
45
40
  $link-color: $blue-set;
@@ -64,15 +59,16 @@ $default-opposite: right;
64
59
 
65
60
  // Font Settings
66
61
 
67
- $adelle-sans: "adelle-sans", sans-serif;
62
+ $font-family: "Open Sans", sans-serif;
68
63
 
69
- $header-font-family: $adelle-sans;
70
- $font-weight-bold: 700;
64
+ $header-font-family: $font-family;
71
65
  $header-font-color: $txt-color;
72
- $body-font-family: $adelle-sans;
66
+ $body-font-family: $font-family;
67
+ $body-font-color: $body-color;
68
+
69
+ $font-weight-bold: 700;
73
70
  $font-weight-normal: 400;
74
71
  $font-weight-light: 300;
75
- $body-font-color: $body-color;
76
72
 
77
73
  // Modular Scale Values
78
74
  // http://typecast.com/blog/contrast-through-scale
@@ -88,5 +84,8 @@ $h5: 16px; // h5
88
84
  $p: 14px; // h6, p
89
85
 
90
86
  // Vertical Rythm
87
+ // http://drewish.com/tools/vertical-rhythm
88
+ // http://typecast.com/blog/4-simple-steps-to-vertical-rhythm
89
+
91
90
  $base-font-size: $p;
92
91
  $base-line-height: 20px;
data/templates/project/_settings.scss CHANGED
@@ -1,7 +1,7 @@
1
1
  // ---------------------------------------------------------------------------
2
2
  // Grid Settings
3
3
 
4
- $grid-system-style: 'fluid';
4
+ $grid-system-style: 'fluid'; // 'fluid' or 'fixed'
5
5
  $nb-columns: 12;
6
6
  $column-width: 60px;
7
7
  $gutter-width: 20px;
@@ -10,8 +10,8 @@ $max-width: 1200px;
10
10
  $border-box-sizing: true;
11
11
 
12
12
  // Breakpoints
13
+ // Mobile First
13
14
 
14
- $phone: 320px;
15
15
  $phone-wide: 480px;
16
16
  $tablet: 768px;
17
17
  $large-screen: 980px;
@@ -24,9 +24,6 @@ $large-screen: 980px;
24
24
  $blue-set: #465aff;
25
25
  $blue-dark-set: #143255;
26
26
  $blue-light-set: #afe1fa;
27
- $yellow-set: #ffc814;
28
- $yellow-light-set: #fff0c8;
29
- $green-set: #78c700;
30
27
 
31
28
  // Colors Set
32
29
 
@@ -34,12 +31,10 @@ $white-set: #fff;
34
31
  $grey-set: #808080;
35
32
  $black-set: #000;
36
33
 
37
- $background-body-color: transparent;
34
+ $background-body-color: $white-set;
38
35
  $txt-color: $blue-dark-set;
39
36
  $body-color: $blue-dark-set;
40
- $highlight-color: $yellow-light-set;
41
37
 
42
- $background-color: lighten($grey-set,45);
43
38
  $border-color: lighten($grey-set,30);
44
39
 
45
40
  $link-color: $blue-set;
@@ -64,15 +59,16 @@ $default-opposite: right;
64
59
 
65
60
  // Font Settings
66
61
 
67
- $adelle-sans: "adelle-sans", sans-serif;
62
+ $font-family: "Open Sans", sans-serif;
68
63
 
69
- $header-font-family: $adelle-sans;
70
- $font-weight-bold: 700;
64
+ $header-font-family: $font-family;
71
65
  $header-font-color: $txt-color;
72
- $body-font-family: $adelle-sans;
66
+ $body-font-family: $font-family;
67
+ $body-font-color: $body-color;
68
+
69
+ $font-weight-bold: 700;
73
70
  $font-weight-normal: 400;
74
71
  $font-weight-light: 300;
75
- $body-font-color: $body-color;
76
72
 
77
73
  // Modular Scale Values
78
74
  // http://typecast.com/blog/contrast-through-scale
@@ -88,5 +84,8 @@ $h5: 16px; // h5
88
84
  $p: 14px; // h6, p
89
85
 
90
86
  // Vertical Rythm
87
+ // http://drewish.com/tools/vertical-rhythm
88
+ // http://typecast.com/blog/4-simple-steps-to-vertical-rhythm
89
+
91
90
  $base-font-size: $p;
92
91
  $base-line-height: 20px;
data/templates/project/index.html CHANGED
@@ -10,6 +10,9 @@
10
10
 
11
11
  <title>Document Title</title>
12
12
 
13
+ <!-- Font Stack -->
14
+ <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700' rel='stylesheet' type='text/css'>
15
+
13
16
  <!-- Included CSS Files -->
14
17
  <link rel="stylesheet" href="stylesheets/screen.css" media="all">
15
18
  </head>
@@ -17,15 +20,21 @@
17
20
  <body>
18
21
 
19
22
  <header role="banner">
20
-
23
+ <div class="out-container">
24
+
25
+ </div>
21
26
  </header><!-- /header -->
22
27
 
23
28
  <div role="main">
24
-
29
+ <div class="out-container">
30
+
31
+ </div>
25
32
  </div><!-- /main -->
26
33
 
27
34
  <footer role="contentinfo">
28
-
35
+ <div class="out-container">
36
+
37
+ </div>
29
38
  </footer><!-- /footer -->
30
39
 
31
40
  <!-- JS -->
data/templates/project/screen.scss CHANGED
@@ -9,3 +9,7 @@
9
9
 
10
10
  // Framous
11
11
  @import "framous";
12
+
13
+ // Settings
14
+ // Settings that can be easily overridden from this file
15
+ @import "settings";
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: framous
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
4
+ hash: 23
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 3
9
- - 1
10
- version: 0.3.1
9
+ - 2
10
+ version: 0.3.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Alec Hance
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2013-07-23 00:00:00 Z
19
+ date: 2013-07-24 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: sass