compass-treesaver-theme-basic-plugin 0.1.2 → 0.2.0

data/compass-treesaver-theme-basic-plugin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{compass-treesaver-theme-basic-plugin}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5")
   s.authors = ["Andrea Campi"]
@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
     "stylesheets/treesaver/theme/basic/_grid.scss",
     "stylesheets/treesaver/theme/basic/_smallscreen.scss",
     "stylesheets/treesaver/theme/basic/_typography.scss",
-    "templates/project/_compass_treesaver_theme_basic.scss",
-    "templates/project/manifest.rb"
+    "stylesheets/treesaver/theme/basic/_utils.scss",
+    "templates/project/manifest.rb",
+    "templates/project/style.scss"
   ]
   s.homepage = %q{http://zephirworks.com/}
   s.require_paths = ["lib"]

data/stylesheets/treesaver/theme/_basic.scss

@@ -2,8 +2,10 @@
 // Simple style, meant as a starting point for further customization.
 //
 
+@import "treesaver";
 @import "basic/config";
 
+@include treesaver-chrome-viewer-with-bottom-controls(40px);
 @include treesaver-layout-setup($treesaver-theme-grid-outer-width, $treesaver-theme-grid-margin, 3);
 
 @import "basic/base";
@@ -13,5 +15,6 @@
 
 @include -treesaver-theme-basic-body;
 @include -treesaver-theme-basic-grid;
+@include -treesaver-theme-basic-grid-vertical-padding;
 @include -treesaver-theme-basic-grid-smallscreen;
 @include -treesaver-theme-basic-misc-smallscreen;

data/stylesheets/treesaver/theme/basic/_config.scss

@@ -1,4 +1,5 @@
 @import "treesaver/config";
+@import "utils";
 
 //
 // Grid (page) layout
@@ -49,3 +50,10 @@ $treesaver-theme-h3-font-size: $treesaver-theme-base-font-size !default;
 $treesaver-theme-h4-font-size: $treesaver-theme-base-font-size !default;              // Font size for h4
 $treesaver-theme-h5-font-size: $treesaver-theme-base-font-size !default;              // Font size for h5
 $treesaver-theme-h6-font-size: $treesaver-theme-base-font-size !default;              // Font size for h6
+
+$treesaver-theme-h1-line-height: -treesaver-theme-font-size-to-line-height($treesaver-theme-h1-font-size) !default;
+$treesaver-theme-h2-line-height: -treesaver-theme-font-size-to-line-height($treesaver-theme-h2-font-size) !default;
+$treesaver-theme-h3-line-height: -treesaver-theme-font-size-to-line-height($treesaver-theme-h3-font-size) !default;
+$treesaver-theme-h4-line-height: -treesaver-theme-font-size-to-line-height($treesaver-theme-h4-font-size) !default;
+$treesaver-theme-h5-line-height: -treesaver-theme-font-size-to-line-height($treesaver-theme-h5-font-size) !default;
+$treesaver-theme-h6-line-height: -treesaver-theme-font-size-to-line-height($treesaver-theme-h6-font-size) !default;

data/stylesheets/treesaver/theme/basic/_grid.scss

@@ -15,3 +15,14 @@
     opacity: 1;
   }
 }
+
+@mixin -treesaver-theme-basic-grid-vertical-padding($height: 24px) {
+  .grid {
+    min-height: $height * 2;
+  }
+
+  .column, .container {
+    top: $height;
+    bottom: $height;
+  }
+}

data/stylesheets/treesaver/theme/basic/_typography.scss

@@ -6,24 +6,30 @@ div, p, button {
 h1 {
   font-family: $treesaver-theme-font-family;
   font-size: $treesaver-theme-h1-font-size;
+  line-height: $treesaver-theme-h1-line-height;
 }
 
 h2 {
   font-size: $treesaver-theme-h2-font-size;
+  line-height: $treesaver-theme-h2-line-height;
 }
 
 h3 {
   font-size: $treesaver-theme-h3-font-size;
+  line-height: $treesaver-theme-h3-line-height;
 }
 
 h4 {
   font-size: $treesaver-theme-h4-font-size;
+  line-height: $treesaver-theme-h4-line-height;
 }
 
 h5 {
   font-size: $treesaver-theme-h5-font-size;
+  line-height: $treesaver-theme-h5-line-height;
 }
 
 h6 {
   font-size: $treesaver-theme-h6-font-size;
+  line-height: $treesaver-theme-h6-line-height;
 }

data/stylesheets/treesaver/theme/basic/_utils.scss

@@ -0,0 +1,8 @@
+@function -treesaver-theme-font-size-to-line-height($font-size) {
+  @each $mult in (6, 5, 4, 3, 2) {
+    @if ($font-size > $treesaver-line-height * ($mult - 1)) {
+      @return $treesaver-line-height * $mult;
+    }
+  }
+  @return $treesaver-line-height;
+}

data/templates/project/manifest.rb

@@ -1 +1 @@
-stylesheet '_compass_treesaver_theme_default.scss', :media => 'screen'
+stylesheet 'style.scss', :media => 'screen'

data/templates/project/style.scss

@@ -0,0 +1 @@
+@import "treesaver/theme/basic";

metadata

@@ -2,7 +2,7 @@
 name: compass-treesaver-theme-basic-plugin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andrea Campi
@@ -53,8 +53,9 @@ files:
 - stylesheets/treesaver/theme/basic/_grid.scss
 - stylesheets/treesaver/theme/basic/_smallscreen.scss
 - stylesheets/treesaver/theme/basic/_typography.scss
-- templates/project/_compass_treesaver_theme_basic.scss
+- stylesheets/treesaver/theme/basic/_utils.scss
 - templates/project/manifest.rb
+- templates/project/style.scss
 has_rdoc: true
 homepage: http://zephirworks.com/
 licenses: []

data/templates/project/_compass_treesaver_theme_basic.scss

@@ -1 +0,0 @@
-@import "treesaver/theme/default";