pixarea-compass-themes 0.3.3 → 0.3.4

data/lib/pixarea-compass-themes/version.rb

@@ -1,7 +1,7 @@
 module Pixarea
   module Compass
     module Themes
-      VERSION = "0.3.3"
+      VERSION = "0.3.4"
     end
   end
 end

data/sass/pixarea/lib/_structure.sass

@@ -1,6 +1,6 @@
-=box($padding: 20px, $margin-bottom: 20px)
+=box($padding: 20px)
   padding: $padding
-  margin-bottom: $margin-bottom
+  // margin-bottom: $margin-bottom
 
 =container-alt
   +container
@@ -10,3 +10,11 @@
 =visually-hide
   visibility: hidden
   position: absolute  
+  
+=liquid-column($last: false)
+  overflow: hidden
+  +append-bottom($blueprint-grid-margin)
+  @if $last
+    +last
+  @else
+    margin-right: $blueprint-grid-margin  

data/sass/pixarea/themes/minipane/_shapes.sass

@@ -1,7 +1,6 @@
 =minipane-shapes
   #{$_menu_1} a,
   #{$_menu_lang} a,
-  #{$_body_content_1},
-  #{$_body_content_2}
+  section
     +pie
     +border-radius

data/sass/pixarea/themes/minipane/_structure.sass

@@ -30,15 +30,13 @@
     position: relative
 
   #{$_body_content_1}
-    +column(16)
-    #{$_no_body_content_2} &
-      +column(22)
+    +liquid-column    
+      
   @import compass/layout/stretching
   #{$_body_content_2}
     +column(8)
     +last
-    +stretch-y
-    right: 0
+    +float(right)
     
   #{$_menu_1} 
     +menu-inline-blocks(4)

data/sass/pixarea/themes/minipane/tones/_dark.sass

@@ -45,13 +45,11 @@
   #{$_footer}
     color: ($bg / 2) + ($neutral / 2.5)
     
-  #{$_body_content_1}
-    background: $dark + 30
-  
-  #{$_body_content_2} 
-    background: $dark + 10
-    color: $neutral - 50
-    //border: 2px solid $dark - 10
+  #{$_body_content} 
+    section
+      background: $dark + 10
+    #{$_body_content_1} 
+      background: $dark + 30
     
   #{headers()}
     color: $light - 40

data/templates/project/_base.sass

@@ -7,9 +7,8 @@ $_menu_1:            "#menu"
 $_menu_lang:         "#menu-lang"
 $_body:              "#body"      
 $_body_content:      "#body_content"
-$_body_content_1:    "#body_content_left"
-$_body_content_2:    "#body_content_right"
-$_no_body_content_2: ".no_body_content_right"
+$_body_content_1:    "#body_content_main"
+$_body_content_2:    "#body_content_sub"
+$_no_body_content_2: ".no_body_content_sub"
 $_page_title:        "#body_content_title"
 $_inner:             ".inner"
-

data/templates/project/views/inquiries/new.html.erb

@@ -0,0 +1,42 @@
+<% content_for :body_content_main do %>
+  <div class='inquiries'>
+    <%=raw @page[Page.default_parts.first.to_sym] %>
+
+    <%= form_for @inquiry do |f| %>
+      <%= render :partial => "/shared/admin/error_messages",
+                 :locals => {
+                   :object => @inquiry,
+                   :include_object_name => true
+                 } %>
+      <div class='field'>
+        <%= f.required_label :name %>
+        <%= f.text_field :name %>
+      </div>
+      <div class='field'>
+        <%= f.required_label :email %>
+        <%= f.text_field :email %>
+      </div>
+      <div class='field'>
+        <%= f.label :phone %>
+        <%= f.text_field :phone %>
+      </div>
+      <div class='field message_field'>
+        <%= f.required_label :message  %>
+        <%= f.text_area :message, :rows => 8 %>
+      </div>
+      <div class='actions'>
+        <%= f.submit t('.send') %>
+        <%= link_to t('.privacy_policy'), "/pages/privacy-policy", :id => "privacy_link" if RefinerySetting.find_or_set(:show_contact_privacy_link, false) %>
+      </div>
+    <% end %>
+  </div>
+<% end -%>
+
+<% 
+  sections = []
+  sections << {:yield => :body_content_title, :fallback => page_title, :title => true}
+  sections << {:yield => :body_content_sub, :fallback => @page[:side_body]}
+  sections << {:yield => :body_content_main, :fallback => @page[:body]}
+-%>
+
+<%= render :partial => "/shared/content_page", :locals => {:sections => sections} %>

data/templates/project/views/layouts/_default.html.erb

@@ -16,12 +16,13 @@
       
     <div id="page_container">
       <header>      
-        <%= yield :header_before %>
+        <%= yield :header_prepend %>
         <%= render :partial => "/shared/header" -%>
         <%= render :partial => "/shared/menu", :locals => { :dom_id => 'menu', :css => 'menu' } -%>
       </header>
       
       <section id='page'>
+      
         <%= yield %>
       </section>
       <footer>

data/templates/project/views/layouts/application.html.erb

@@ -1,4 +1,4 @@
-<% content_for :header_before do %>
+<% content_for :header_prepend do %>
   <%= render(:partial => "/shared/menu_lang", :locals => {:dom_id => 'menu-lang', :css => 'menu'}) %>             
 <% end -%>
 

data/templates/project/views/pages/home.html.erb

@@ -0,0 +1,8 @@
+<% 
+  sections = []
+  sections << {:yield => :body_content_title, :fallback => page_title, :title => true}
+  sections << {:yield => :body_content_sub, :fallback => @page[:side_body]}
+  sections << {:yield => :body_content_main, :fallback => @page[:body]}
+-%>
+
+<%= render :partial => "/shared/content_page", :locals => {:sections => sections} %>

data/templates/project/views/pages/show.html.erb

@@ -0,0 +1,8 @@
+<% 
+  sections = []
+  sections << {:yield => :body_content_title, :fallback => page_title, :title => true}
+  sections << {:yield => :body_content_sub, :fallback => @page[:side_body]}
+  sections << {:yield => :body_content_main, :fallback => @page[:body]}
+-%>
+
+<%= render :partial => "/shared/content_page", :locals => {:sections => sections} %>

metadata

@@ -2,7 +2,7 @@
 name: pixarea-compass-themes
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Daniel Reszka
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +02:00
+date: 2011-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,9 +107,12 @@ files:
 - templates/project/themes/shapy/dark.sass
 - templates/project/themes/shapy/firen.sass
 - templates/project/themes/shapy/rusty.sass
+- templates/project/views/inquiries/new.html.erb
 - templates/project/views/layouts/_cabinet.html.erb
 - templates/project/views/layouts/_default.html.erb
 - templates/project/views/layouts/application.html.erb
+- templates/project/views/pages/home.html.erb
+- templates/project/views/pages/show.html.erb
 - templates/project/views/shared/_footer.html.erb
 - templates/project/views/shared/_header.html.erb
 - templates/project/views/shared/_menu_lang.html.erb