refine grid + remove styling attributes from content id

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 45e644895f771da87f858bcca8c748ff474b794b..edf6eb85f2deccb7793904ce2ad529ae3ab20263 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -73,6 +73,10 @@ abbr, acronym {
 .col11   { float:left; width:91.6666%; }
 .col12   { width:100%; }
 
 .col11   { float:left; width:91.6666%; }
 .col12   { width:100%; }
 

+
+.pad1 { padding: $lineheight/2; }
+.pad2 { padding: $lineheight; }
+

 /* Default rules for the body of every page */
 
 * {
 /* Default rules for the body of every page */
 
 * {


@@ -1014,7 +1018,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the main content area */
 
 #content {
 /* Rules for the main content area */
 
 #content {

-  padding: $lineheight;

   position: relative;
 }
 
   position: relative;
 }
 


@@ -1032,12 +1035,9 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .site-welcome,
 .user-new {
   .content-heading {
 .site-welcome,
 .user-new {
   .content-heading {

-    text-align: center;

   }
 
   #content {
   }
 
   #content {

-    max-width: 700px;
-    margin: auto;

   }
 }
 
   }
 }
 


@@ -2271,14 +2271,6 @@ a.button {
     background-position: -300px 0;
   }
 
     background-position: -300px 0;
   }
 

-  .pad1 {
-    padding: 10px;
-  }
-
-  .pad2 {
-    padding: 20px;
-  }
-

   .start-mapping {
     background: #EB6F67;
     color: #FFF;
   .start-mapping {
     background: #EB6F67;
     color: #FFF;

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index a0e894e462c315e834dd193ae01fea1a4b403f54..863bb8d693ce1c16dcdc1b9f2726813ab8f9a36b 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -153,7 +153,7 @@
         <%= yield :heading %>
       </div>
       <% end %>
         <%= yield :heading %>
       </div>
       <% end %>

-      <div id="content" class="clearfix">
+      <div id="content" class="pad2 clearfix">

         <%= yield %>
       </div>
     </div>
         <%= yield %>
       </div>
     </div>

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 7d5439d6f8acbe04af8c89a04f50365cc107c623..1368dfe19ddec28e093b8307f3954315f01b22fc 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -2,7 +2,7 @@
   <h1><%= t 'user.new.title' %></h1>
 <% end %>
 
   <h1><%= t 'user.new.title' %></h1>
 <% end %>
 

-<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'col6' } do %>
+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'col6 pad2' } do %>

   <%= error_messages_for 'user' %>
 
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
   <%= error_messages_for 'user' %>
 
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>


@@ -70,7 +70,7 @@
   </div>
 <% end %>
 
   </div>
 <% end %>
 

-<div class='col6'>
+<div class='col6 pad2'>

   <h3><%= t 'user.new.about.header' %></h3>
   <%= t 'user.new.about.html' %>
 </div>
   <h3><%= t 'user.new.about.header' %></h3>
   <%= t 'user.new.about.html' %>
 </div>