cyaml 0.0.22 → 0.0.23

Sign up to get free protection for your applications and to get access to all the features.
@@ -4,21 +4,14 @@ $layout_width: 1000px;
4
4
  $layout_max_width: $layout_width;
5
5
  $layout_min_width: $layout_width;
6
6
  $display_3rd_column: none; /* (none|block) */
7
+ $header_height: 200px;
8
+ $content_height: auto;
9
+ $footer_height: 50px;
10
+ $width_c1: 25%;
11
+ $width_c2: 50%;
12
+ $width_c3: auto;
7
13
 
8
-
9
-
10
- /* import core styles | Basis-Stylesheets einbinden */
11
- @import "cyaml/core/base";
12
-
13
- /* import screen layout | Screen-Layout einbinden */
14
- @import "cyaml/navigation/nav_shinybuttons";
15
-
16
- @import "cyaml/screen/content";
17
-
18
- /* import print layout | Druck-Layout einbinden */
19
- @import "cyaml/print/print_draft";
20
-
21
-
14
+ @import "default_includes";
22
15
 
23
16
  /**
24
17
  * "Yet Another Multicolumn Layout" - (X)HTML/CSS framework
@@ -58,6 +51,7 @@ $display_3rd_column: none; /* (none|block) */
58
51
  padding: 10px; }
59
52
  #header {
60
53
  padding: 45px 2em 1em 20px;
54
+ height: $header_height;
61
55
  color: #000;
62
56
  background: #fff; }
63
57
  #nav {
@@ -65,10 +59,12 @@ $display_3rd_column: none; /* (none|block) */
65
59
  div.hlist {}
66
60
  #main {
67
61
  margin: 10px 0;
62
+ height: $content_height;
68
63
  background: #fff; }
69
64
  #footer {
70
65
  padding: 10px 20px;
71
66
  color: #666;
67
+ height: $footer_height;
72
68
  background: #f9f9f9;
73
69
  border-top: 5px #efefef solid; }
74
70
  /* (en) navigation: horizontal adjustment | (de) horizontale Ausrichtung */
@@ -82,14 +78,14 @@ $display_3rd_column: none; /* (none|block) */
82
78
  */
83
79
  #col1 {
84
80
  float: left;
85
- width: 25%;
81
+ width: $width_c1;
86
82
  margin: 0; }
87
83
  #col2 {
88
84
  float: left;
89
- width: 50%;
85
+ width: $width_c2;
90
86
  margin: 0; }
91
87
  #col3 {
92
- width: auto;
88
+ width: $width_c3;
93
89
  margin: 0 0 0 75%;
94
90
  display: $display_3rd_column;
95
91
  }
@@ -100,4 +96,3 @@ $display_3rd_column: none; /* (none|block) */
100
96
  #col3_content {
101
97
  padding: 0 20px 0 10px; }
102
98
 
103
- @import "project.scss";
@@ -0,0 +1,13 @@
1
+
2
+ /* import core styles | Basis-Stylesheets einbinden */
3
+ @import "cyaml/core/base";
4
+
5
+ /* import screen layout | Screen-Layout einbinden */
6
+ @import "cyaml/navigation/nav_shinybuttons";
7
+
8
+ @import "cyaml/screen/content";
9
+
10
+ /* import print layout | Druck-Layout einbinden */
11
+ @import "cyaml/print/print_draft";
12
+
13
+
@@ -16,6 +16,7 @@ image 'images/vlist/square/node_plus.gif', :to => 'vlist/square/node_plus.gif'
16
16
  image 'images/vlist/square/subnode.gif', :to => 'vlist/square/subnode.gif'
17
17
  image 'images/vlist/square/subnode_minus.gif', :to => 'vlist/square/subnode_minus.gif'
18
18
  image 'images/vlist/square/subnode_plus.gif', :to => 'vlist/square/subnode_plus.gif'
19
+ stylesheet 'default_includes.scss'
19
20
  stylesheet 'basemod.scss', :media => 'all'
20
21
  stylesheet 'patch_my_layout.scss', :media => 'screen, projection'
21
22
 
@@ -37,13 +38,13 @@ $ compass init rails -r cyaml -u cyaml --force
37
38
  Stand Alone Installation
38
39
  ========================
39
40
  $ gem install cyaml
40
- $ compass create my_project -r cyaml -u cyaml --javascripts-dir js --css-dir css
41
+ $ compass create my_project -r cyaml -u cyaml
41
42
 
42
43
  }
43
44
 
44
45
  welcome_message %Q{
45
46
  You've installed CYAML. Good for you!
46
47
 
47
- Now you should create a project.scss file where your Project specific CSS-rules and imports go.
48
+ All project specific changes should be made in basemod.scss.
48
49
 
49
50
  }
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 22
9
- version: 0.0.22
8
+ - 23
9
+ version: 0.0.23
10
10
  platform: ruby
11
11
  authors:
12
12
  - Michael Gerber
@@ -71,6 +71,7 @@ files:
71
71
  - stylesheets/_cyaml.scss
72
72
  - templates/project/citrin.html.haml
73
73
  - templates/project/index.html.haml
74
+ - templates/project/default_includes.scss
74
75
  - templates/project/patch_my_layout.scss
75
76
  - templates/project/javascripts/lib/jquery-1.3.2.min.js
76
77
  - templates/project/javascripts/lib/jquery-1.3.2.js