compass-drupal-plugin 0.2.4.beta → 0.2.5.alpha

data/compass-drupal-plugin.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   # Release Specific Information
-  s.version = "0.2.4.beta"
+  s.version = "0.2.5.alpha"
   s.date = "2011-09-27"
 
   # Gem Details

data/stylesheets/drupal/_zen.scss

@@ -345,16 +345,17 @@ $zen-base-font-size: 14px !default;
 
 @mixin zen-footer {
 
-  html, body, #page-wrapper, #page {
+  html, body, #page-wrapper, #page, #main-wrapper {
     height: 100%;
   }
 
   #main-wrapper {
+    height: auto;
     min-height: 100%;
   }
 
   #main {
-    overflow: auto;
+    //overflow: auto;
     padding-bottom: $zen-footer-size; /* the footer size */
   }
 
@@ -365,4 +366,4 @@ $zen-base-font-size: 14px !default;
     margin-top: -$zen-footer-size; /* the negative value of the footer size */
   }
 
-}
+}

data/templates/fusion/manifest.rb

@@ -16,4 +16,5 @@ help %Q{
 welcome_message %Q{
   Hello and welcome to Fusion Compass Plugin.
   Fusion is a powerful base theme built on top of the NineSixty grid framework meant to be used with the Skinr module.
+  You must enable relative assets in config.rb in order to use theme images in the css.
 }

data/templates/project/_skin.scss

@@ -19,7 +19,7 @@ $<%= project_name %>-monospaced-typeface: "Courier New", "DejaVu Sans Mono", mon
 $<%= project_name %>-base-font-size: 14px;
 
 //HTML Elements
-.-<%= project_name %>-h2 { } 
+.-<%= project_name %>-h2 { }
 
 .-<%= project_name %>-h3 { }
 
@@ -29,11 +29,9 @@ $<%= project_name %>-base-font-size: 14px;
 
 .-<%= project_name %>-li { }
 
-.-<%= project_name %>-ul {
-  li { @extend .-<%= project_name %>-li; } }
+.-<%= project_name %>-ul { }
 
-.-<%= project_name %>-ol {
-  li { @extend .-<%= project_name %>-li; } }
+.-<%= project_name %>-ol { }
 
 .-<%= project_name %>-blockquote { }
 
@@ -62,7 +60,7 @@ $<%= project_name %>-base-font-size: 14px;
     tbody & { } } }
 
 // Content Classes
-.-<%= project_name %>-node-content {
+.-<%= project_name %>-full-html-content {
   h2 { @extend .-<%= project_name %>-h2; }
   h3 { @extend .-<%= project_name %>-h3; }
   h4 { @extend .-<%= project_name %>-h4; }
@@ -77,7 +75,7 @@ $<%= project_name %>-base-font-size: 14px;
   a { @extend .-<%= project_name %>-a; }
   table { @extend .-<%= project_name %>-table; } }
 
-.-<%= project_name %>-block-content {
+.-<%= project_name %>-restricted-html-content {
   h3 { @extend .-<%= project_name %>-h3; }
   h4 { @extend .-<%= project_name %>-h4; }
   p { @extend .-<%= project_name %>-p; }
@@ -99,7 +97,7 @@ $<%= project_name %>-base-font-size: 14px;
 
 .-<%= project_name %>-logo { }
 
-.-<%= project_name %>-name-and-slogan { } // usually a #name-and-slogan wrapper div (YMMV) 
+.-<%= project_name %>-name-and-slogan { } // usually a #name-and-slogan wrapper div (YMMV)
 
 .-<%= project_name %>-site-name {
   a { } }
@@ -140,8 +138,8 @@ $<%= project_name %>-base-font-size: 14px;
   .secondary { }
   // the following styles apply to both tab groups.
   ul { }
-  li { } 
-  a { } 
+  li { }
+  a { }
   a.active { } }
 
 .-<%= project_name %>-messages {
@@ -166,8 +164,8 @@ $<%= project_name %>-base-font-size: 14px;
 
 .-<%= project_name %>-feed-icons {
   .feed-icon { } }
-  
-.-<%= project_name %>-title { } 
+
+.-<%= project_name %>-title { }
 
 .-<%= project_name %>-content-area { }
 
@@ -176,12 +174,25 @@ $<%= project_name %>-base-font-size: 14px;
 .-<%= project_name %>-footer-message { }
 
 // Block Components
-// Make copies of these components for a diversity of block styles
+// These are defaults for every block in your theme
 .-<%= project_name %>-block { }
 
 .-<%= project_name %>-block-title { }
 
-.-<%= project_name %>-block-content { @extend .-<%= project_name %>-block-content; }
+.-<%= project_name %>-block-content { @extend .-<%= project_name %>-restricted-html-content; }
+
+// Make copies of the components for a diversity of block styles, like these
+.-<%= project_name %>-content-block { }
+
+.-<%= project_name %>-content-block-title { }
+
+.-<%= project_name %>-content-block-content { @extend .-<%= project_name %>-restricted-html-content; }
+
+.-<%= project_name %>-sidebar-block { }
+
+.-<%= project_name %>-sidebar-block-title { }
+
+.-<%= project_name %>-sidebar-block-content { @extend .-<%= project_name %>-restricted-html-content; }
 
 // Node Components
 // Make copies of these components for a diversity of node styles
@@ -197,7 +208,7 @@ $<%= project_name %>-base-font-size: 14px;
 
 .-<%= project_name %>-node-terms { } }
 
-.-<%= project_name %>-node-content { @extend .-<%= project_name %>-node-content; }
+.-<%= project_name %>-node-content { @extend .-<%= project_name %>-full-html-content; }
 
 .-<%= project_name %>-node-links {
   li {

data/templates/project/drupal.scss

@@ -3,12 +3,11 @@
 @import "_<%= File.basename(config.project_path) %>-base";
 
 /* page.tpl.php */
-
 body { @extend .-<%= project_name %>-body; }
 
 #page { @extend .-<%= project_name %>-page; }
 
-#header { 
+#header {
   @extend .-<%= project_name %>-header; }
 
 #logo-title { @extend .-<%= project_name %>-logo-title; }
@@ -23,16 +22,16 @@ body { @extend .-<%= project_name %>-body; }
 
 #header-region { @extend .-<%= project_name %>-header-region; }
 
-#container { @extend .-<%= project_name %>-main; }
+#container { @extend .-<%= project_name %>-container; }
 
 #navigation {
   @extend .-<%= project_name %>-navigation; }
 
-.primary-links  {
+ul.primary-links  {
   @extend .-<%= project_name %>-menu;
   > li > .links { @extend .-<%= project_name %>-submenu; } }
-  
-.secondary-links  { @extend .-<%= project_name %>-menu; }
+
+ul.secondary-links  { @extend .-<%= project_name %>-menu; }
 
 #sidebar-left { @extend .-<%= project_name %>-sidebar; }
 
@@ -40,54 +39,69 @@ body { @extend .-<%= project_name %>-body; }
 
 #mission { @extend .-<%= project_name %>-mission; }
 
-#breadcrumb { @extend .-<%= project_name %>-breadcrumb; }  
+#breadcrumb { @extend .-<%= project_name %>-breadcrumb; }
 
 #content {
   @extend .-<%= project_name %>-content;
-  
+
   div.tabs { @extend .-<%= project_name %>-tabs; }
-    
+
   .messages { @extend .-<%= project_name %>-messages; }
 
   .pager { @extend .-<%= project_name %>-pager; }
-    
+
   //drupal prints only a link with an image inside, beware.
   .feed-icon { @extend .-<%= project_name %>-feed-icons; } }
-  
+
 #page-title { @extend .-<%= project_name %>-title; }
 
 #content-content { @extend .-<%= project_name %>-content-area; }
 
 #sidebar-right { @extend .-<%= project_name %>-sidebar; }
 
-#footer-wrapper {
-  @extend .-<%= project_name %>-footer;
-  
-  //Drupal will print the footer message right away, but theming the
-  //whole region isn't a good idea. Copy page.tpl.php to your theme and
-  //edit it to wrap the $footer_message variable
-  //@extend .-<%= project_name %>-footer-message;
+#footer-wrapper { @extend .-<%= project_name %>-footer; }
+
+ //Drupal will print the footer message right away, but theming the
+//whole region isn't a good idea. Copy page.tpl.php to your theme and
+//edit it to wrap the $footer_message variable
+//@extend .-<%= project_name %>-footer-message;
 
- }
 
 /* block.tpl.php */
 .block {
-  // these are Kit regions blocks, set as examples for any region specific block styling
-  #content-content & { @extend .-<%= project_name %>-content-block; }
-  #sidebar-left & { @extend .-<%= project_name %>-sidebar-block; }
-  #sidebar-right & { @extend .-<%= project_name %>-sidebar-block; }
-
-  // these selectors will affect all of your blocks, beware!
-  // try scoping the selectors by region, as shown above
-  @extend .-<%= project_name %>-block; 
+  // try scoping the selectors by region
+  @extend .-<%= project_name %>-block;
   > h2 { @extend .-<%= project_name %>-block-title; }
-  .content { @extend .-<%= project_name %>-block-content; } }
+  .content { @extend .-<%= project_name %>-block-content; }
+
+  // these are Kit regions blocks, set as examples for any region specific block styling
+  #content-content & {
+    @extend .-<%= project_name %>-content-block;
+    > h2 { @extend .-<%= project_name %>-content-block-title; }
+    .content { @extend .-<%= project_name %>-content-block-content; } }
+
+  #sidebar-left &,
+  #sidebar-right & {
+    @extend .-<%= project_name %>-sidebar-block;
+    > h2 { @extend .-<%= project_name %>-sidebar-block-title; }
+    .content { @extend .-<%= project_name %>-sidebar-block-content; } }
+
+  #header-region & {
+    @extend .-<%= project_name %>-header-block;
+    > h2 { @extend .-<%= project_name %>-header-block-title; }
+    .header { @extend .-<%= project_name %>-header-block-header; } }
+
+  #footer & {
+    @extend .-<%= project_name %>-footer-block;
+    > h2 { @extend .-<%= project_name %>-footer-block-title; }
+    .footer { @extend .-<%= project_name %>-footer-block-footer; } }
+}
 
 /* node.tpl.php */
 .node {
   @extend .-<%= project_name %>-node;
   .picture { @extend .-<%= project_name %>-node-picture; }
-  .title { @extend .-<%= project_name %>-node-title; }
+  > h2 { @extend .-<%= project_name %>-node-title; }
   .meta { @extend .-<%= project_name %>-node-meta; }
   .submitted { @extend .-<%= project_name %>-node-submitted; }
   .terms { @extend .-<%= project_name %>-node-terms; }
@@ -105,4 +119,4 @@ body { @extend .-<%= project_name %>-body; }
   dl { @extend .-<%= project_name %>-profile-category-wrapper; }
   dt { @extend .-<%= project_name %>-profile-field-label; }
   dd { @extend .-<%= project_name %>-profile-field-value; } }
-  
+

data/templates/project/manifest.rb

@@ -17,4 +17,5 @@ welcome_message %Q{
   Hello and welcome to Drupal Compass Plugin.
   This is a blank theme meant for skilled users only.
   If you're looking for something fun and easy to use, try the Zen or Fusion variants.
+  You must enable relative assets in config.rb in order to use theme images in the css.
 }

data/templates/zen/_zen-base.scss

@@ -12,3 +12,6 @@ $zen-base-font-size: $<%= project_name %>-base-font-size;
 // Zen requires navbar width and height, following are default ones
 $zen-navigation-width: 100%;
 $zen-navigation-height: 2.3em;
+
+// Zen footer requires a footer height, following is the default height
+$zen-footer-size: 150px;

data/templates/zen/manifest.rb

@@ -18,4 +18,5 @@ welcome_message %Q{
   You need to add it to YOURTHEME.info in order to load it into Drupal.
   If either zen-fixed.css or zen-liquid.css are declared on YOURTHEME.info,
   you should comment it to avoid CSS conflicts.
+  You must enable relative assets in config.rb in order to use theme images in the css.
 }

data/templates/zen/zen.scss

@@ -15,11 +15,14 @@
 //Use this mixin to set the font sizes
 @include zen-typography;
 
+//Use this mixin to set a fixed footer
+@include zen-footer;
+
 body { @extend .-<%= project_name %>-body; }
 
 #skip-link { @extend .-<%= project_name %>-skip-link; }
 
-#page-wrapper { @extend .-<%= project_name %>-page; }
+#page { @extend .-<%= project_name %>-page; }
 
 #header { @extend .-<%= project_name %>-header; }
 
@@ -31,7 +34,7 @@ body { @extend .-<%= project_name %>-body; }
 
 #site-slogan { @extend .-<%= project_name %>-site-slogan; }
 
-#main-wrapper { @extend .-<%= project_name %>-main; }
+#main { @extend .-<%= project_name %>-main; }
 
 #content {
   @extend .-<%= project_name %>-content;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass-drupal-plugin
 version: !ruby/object:Gem::Version
-  version: 0.2.4.beta
+  version: 0.2.5.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000 -03:00
-default_executable: 
+date: 2011-09-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &84974520 !ruby/object:Gem::Requirement
+  requirement: &73478170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +21,7 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *84974520
+  version_requirements: *73478170
 description: a Compass extension providing Drupal integration, supporting popular
   base themes
 email: barraponto@gmail.com
@@ -46,7 +45,6 @@ files:
 - templates/zen/zen.scss
 - templates/zen/_zen-base.scss
 - templates/zen/manifest.rb
-has_rdoc: true
 homepage: http://bitbucket.org/barraponto/drupal-compass-extension/
 licenses: []
 post_install_message: 
@@ -67,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: a Compass extension providing Drupal integration