pwnstyles_rails 0.0.3 → 0.0.4

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.3
1
+ 0.0.4
@@ -14,8 +14,8 @@ class UpdateGenerator < Rails::Generators::Base
14
14
  private
15
15
 
16
16
  def copy_static_assets(exclude_list = [])
17
- copy_dir 'public/stylesheets', 'public/pwnstyles/stylesheets'
18
- copy_dir 'public/javascripts', 'public/javascripts'
17
+ copy_dir 'public/stylesheets', 'public/pwnstyles/stylesheets', exclude_list
18
+ copy_dir 'public/javascripts', 'public/javascripts', exclude_list
19
19
  end
20
20
 
21
21
  def copy_dir(source_dir, destination_dir, exclude_list = [])
@@ -20,10 +20,6 @@ time, mark, audio, video {
20
20
  background: transparent;
21
21
  }
22
22
 
23
- body {
24
- line-height: 1.2;
25
- }
26
-
27
23
  article, aside, details, figcaption, figure, dialog,
28
24
  footer, header, hgroup, menu, nav, section {
29
25
  display: block;
@@ -0,0 +1,46 @@
1
+ html, body {
2
+ font: {
3
+ family: $main-font;
4
+ size: $main-font-size;
5
+ style: normal;
6
+ variant: normal;
7
+ weight: normal;
8
+ }
9
+ line-height: $main-line-height;
10
+ }
11
+
12
+ h1, h2, h3, h4, h5, h6 {
13
+ font-family: $heading-font;
14
+ font-weight: bold;
15
+ }
16
+
17
+ h1 {
18
+ font-size: $h1-font-size;
19
+ line-height: $h1-line-height;
20
+ color: $h1-text-color;
21
+ }
22
+ h2 {
23
+ font-size: $h2-font-size;
24
+ line-height: $h2-line-height;
25
+ color: $h2-text-color;
26
+ }
27
+ h3 {
28
+ font-size: $h3-font-size;
29
+ line-height: $h3-line-height;
30
+ color: $h3-text-color;
31
+ }
32
+ h4 {
33
+ font-size: $h4-font-size;
34
+ line-height: $h4-line-height;
35
+ color: $h4-text-color;
36
+ }
37
+ h5 {
38
+ font-size: $h5-font-size;
39
+ line-height: $h5-line-height;
40
+ color: $h5-text-color;
41
+ }
42
+ h6 {
43
+ font-size: $h6-font-size;
44
+ line-height: $h6-line-height;
45
+ color: $h6-text-color;
46
+ }
@@ -14,3 +14,18 @@ body {
14
14
  width: $page-width;
15
15
  overflow: hidden;
16
16
  }
17
+
18
+ article#sidebar {
19
+ float: right;
20
+ width: $sidebar-width;
21
+ }
22
+
23
+ article#main {
24
+ float: left;
25
+ width: $page-width;
26
+ }
27
+
28
+ article#sidebar + article#main {
29
+ float: left;
30
+ width: ($page-width - $sidebar-width - $column-total - $column-margin);
31
+ }
@@ -11,7 +11,7 @@ header {
11
11
 
12
12
  position: relative;
13
13
 
14
- font-family: Ubuntu, Helvetica, Tahoma, sans-serif;
14
+ font-family: $heading-font;
15
15
  font-weight: bold;
16
16
  }
17
17
 
@@ -34,11 +34,16 @@ header {
34
34
 
35
35
  span {
36
36
  display: block;
37
+ padding-right: 0.5em;
37
38
  float: left;
38
- padding: 0 0.5em 0 0.5em;
39
39
  height: 100%;
40
40
  }
41
41
 
42
+ // Padding between the image and the title.
43
+ img > span {
44
+ padding-left: 0.5em;
45
+ }
46
+
42
47
  a, a:visited, a:hover, a:active {
43
48
  color: inherit;
44
49
  text-decoration: none;
@@ -1,11 +1,13 @@
1
1
  @import 'vars/app.scss';
2
2
  @import 'vars/color_scheme.scss';
3
+ @import 'vars/fonts.scss';
3
4
  @import 'vars/layout_sizes.scss';
4
5
 
5
6
  @import 'generic/reset.scss';
6
7
  @import 'generic/controls.scss';
7
8
  @import 'generic/links.scss';
8
9
  @import 'generic/menu.scss';
10
+ @import 'generic/text.scss';
9
11
 
10
12
  @import 'modules/body.scss';
11
13
  @import 'modules/footer.scss';
@@ -1,6 +1,8 @@
1
1
  // Tweak variables to match your application here.
2
2
 
3
3
  // At the very least, you should set a primary color to distinguish the app.
4
- $main-color1: hsl(240deg, 100%, 50%);
4
+ // $main-color1: hsl(240deg, 100%, 50%);
5
5
 
6
6
  // If you use non-standard fonts, don't forget to add @font-face definitions.
7
+ // $main-font: Arial, Times, serif;
8
+ // $heading-font: Helvetica, Tahoma, sans-serif;
@@ -1,6 +1,7 @@
1
1
  // Main colors used in the application.
2
2
  // Do not change the values here. Instead, override them in _app.scss
3
3
 
4
+
4
5
  // Primary colors used in the app.
5
6
  $colors: 3 !default;
6
7
  $main-color1: hsl(240deg, 100%, 50%) !default;
@@ -9,6 +10,7 @@ $main-color3: adjust-hue($main-color1, 360 / $colors) !default;
9
10
  $main-color4: adjust-hue($main-color1, 360 / $colors) !default;
10
11
  $main-color5: adjust-hue($main-color1, 360 / $colors) !default;
11
12
 
13
+ // Modules.
12
14
  $header-background-color: change-color($main-color1,
13
15
  $saturation: 66%, $lightness: 88%) !default;
14
16
  $header-border-color: change-color($main-color1,
@@ -27,6 +29,7 @@ $footer-border-color: change-color($main-color1,
27
29
  $footer-text-color: change-color($main-color1,
28
30
  $saturation: 54%, $lightness: 16%) !default;
29
31
 
32
+ // Elements.
30
33
  $button-base-color: $main-color1 !default;
31
34
  $button-color: change-color($button-base-color, $lightness: 40%);
32
35
  $button-border-color: change-color($button-base-color,
@@ -57,3 +60,18 @@ $menu-hover-color: change-color($main-color1,
57
60
 
58
61
  $link-color: change-color($main-color1,
59
62
  $saturation: 66%, $lightness: 16%) !default;
63
+
64
+ // Text.
65
+ $heading-main-color: $main-color1 !default;
66
+ $h1-text-color: change-color($heading-main-color,
67
+ $saturation: 100%, $lightness: 25%) !default;
68
+ $h2-text-color: change-color($heading-main-color,
69
+ $saturation: 100%, $lightness: 23%) !default;
70
+ $h3-text-color: change-color($heading-main-color,
71
+ $saturation: 100%, $lightness: 21%) !default;
72
+ $h4-text-color: change-color($heading-main-color,
73
+ $saturation: 100%, $lightness: 19%) !default;
74
+ $h5-text-color: change-color($heading-main-color,
75
+ $saturation: 100%, $lightness: 17%) !default;
76
+ $h6-text-color: change-color($heading-main-color,
77
+ $saturation: 100%, $lightness: 15%) !default;
@@ -0,0 +1,24 @@
1
+ // Sizes of various elements of the page layout.
2
+ // Do not change the values here. Instead, override them in _app.scss
3
+
4
+
5
+ // Standard text
6
+ $main-font: Georgia, serif !default;
7
+ $main-font-size: 12px !default;
8
+ $main-line-height: 1.2 !default;
9
+
10
+ // Headings.
11
+ $heading-font: Helvetica, sans-serif !default;
12
+
13
+ $h1-font-size: $main-font-size * 5 !default;
14
+ $h1-line-height: $main-line-height !default;
15
+ $h2-font-size: $main-font-size * 4 !default;
16
+ $h2-line-height: $main-line-height !default;
17
+ $h3-font-size: $main-font-size * 3 !default;
18
+ $h3-line-height: $main-line-height !default;
19
+ $h4-font-size: $main-font-size * 2 !default;
20
+ $h4-line-height: $main-line-height !default;
21
+ $h5-font-size: $main-font-size * 1.2 !default;
22
+ $h5-line-height: $main-line-height !default;
23
+ $h6-font-size: $main-font-size * 1.2 !default;
24
+ $h6-line-height: $main-line-height !default;
@@ -1,4 +1,6 @@
1
1
  // Sizes of various elements of the page layout.
2
+ // Do not change the values here. Instead, override them in _app.scss
3
+
2
4
 
3
5
  // Vertical grid.
4
6
  $column-width: 30px !default;
@@ -6,7 +8,7 @@ $column-margin: 10px !default;
6
8
 
7
9
  // Page elements, expressed in terms of the grid.
8
10
  $page-columns: 25 !default;
9
- $sidebar-columns: 9 !default;
11
+ $sidebar-columns: 8 !default;
10
12
 
11
13
  $header-height: 40px;
12
14
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{pwnstyles_rails}
8
- s.version = "0.0.3"
8
+ s.version = "0.0.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Victor Costan"]
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
41
41
  "public/stylesheets/scss/generic/_links.scss",
42
42
  "public/stylesheets/scss/generic/_menu.scss",
43
43
  "public/stylesheets/scss/generic/_reset.scss",
44
+ "public/stylesheets/scss/generic/_text.scss",
44
45
  "public/stylesheets/scss/modules/_body.scss",
45
46
  "public/stylesheets/scss/modules/_footer.scss",
46
47
  "public/stylesheets/scss/modules/_header.scss",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
48
49
  "public/stylesheets/scss/pwnstyles.scss",
49
50
  "public/stylesheets/scss/vars/_app.scss",
50
51
  "public/stylesheets/scss/vars/_color_scheme.scss",
52
+ "public/stylesheets/scss/vars/_fonts.scss",
51
53
  "public/stylesheets/scss/vars/_layout_sizes.scss",
52
54
  "pwnstyles_rails.gemspec",
53
55
  "test/helper.rb",
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pwnstyles_rails
3
3
  version: !ruby/object:Gem::Version
4
- hash: 25
4
+ hash: 23
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 3
10
- version: 0.0.3
9
+ - 4
10
+ version: 0.0.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Victor Costan
@@ -143,6 +143,7 @@ files:
143
143
  - public/stylesheets/scss/generic/_links.scss
144
144
  - public/stylesheets/scss/generic/_menu.scss
145
145
  - public/stylesheets/scss/generic/_reset.scss
146
+ - public/stylesheets/scss/generic/_text.scss
146
147
  - public/stylesheets/scss/modules/_body.scss
147
148
  - public/stylesheets/scss/modules/_footer.scss
148
149
  - public/stylesheets/scss/modules/_header.scss
@@ -150,6 +151,7 @@ files:
150
151
  - public/stylesheets/scss/pwnstyles.scss
151
152
  - public/stylesheets/scss/vars/_app.scss
152
153
  - public/stylesheets/scss/vars/_color_scheme.scss
154
+ - public/stylesheets/scss/vars/_fonts.scss
153
155
  - public/stylesheets/scss/vars/_layout_sizes.scss
154
156
  - pwnstyles_rails.gemspec
155
157
  - test/helper.rb