Applied content cell classes across all edit and new pages

concerto · Jul 8, 2012 · f7ad4a2 · f7ad4a2
1 parent c632e36
commit f7ad4a2
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 25 deletions.
diff --git a/app/assets/stylesheets/application/controls/buttons.scss.erb b/app/assets/stylesheets/application/controls/buttons.scss.erb
@@ -162,7 +162,7 @@
    	border: 0;
    	border-right: solid 1px #396bab;
    	height: 18px;
-   	padding: 4px 12px 0px 20px;
+   	padding: 2px 12px 2px 20px;
 
    	&:hover {
 	 		@include no-box-shadow;
@@ -176,8 +176,6 @@
 			background-position: 0% 100%;
    		border: 0;
    		border-right: solid 1px #999;
-			height: 17px;
-			padding: 5px 12px 0px 20px;
 		} 
 
 	}

diff --git a/app/assets/stylesheets/application/layout/contentcell.scss.erb b/app/assets/stylesheets/application/layout/contentcell.scss.erb
@@ -49,8 +49,7 @@ section.C {
 		// this element is only included when the back_button helper is used to place a back button
 		.C-header_back {
 	  	float: left;
-	  	margin-left: -25px;
-	  	margin-right: 8px;
+	  	margin: 7px 8px 7px -12px;
 		}
 
 	}

diff --git a/app/views/contents/_show_header.html.erb b/app/views/contents/_show_header.html.erb
@@ -1,4 +1,4 @@
-<h1 id="contentlist">
+<h1 class="default-padding" id="contentlist">
   <%= link_to "All Content", feeds_path, :remote => true %> &gt;
   <%= @content.name %>
 </h1>
diff --git a/app/views/feeds/edit.html.erb b/app/views/feeds/edit.html.erb
@@ -1,7 +1,7 @@
 <section class="C">
 	<header class="C-header">
 		<%= back_button feeds_path %>
-		<h1><%= t(:edit_feed)%></h1>
+		<h1 class="default-padding"><%= t(:edit_feed)%></h1>
 	</header>
 	<div class="C-cont">
 		<%= render 'form' %>

diff --git a/app/views/feeds/new.html.erb b/app/views/feeds/new.html.erb
@@ -1,7 +1,7 @@
 <section class="C">
 	<header class="C-header">
 		<%= back_button feeds_path %>
-		<h1><%=t(:new_feed)%></h1>
+		<h1 class="default-padding"><%=t(:new_feed)%></h1>
 	</header>
 	<div class="C-cont">
 		<%= render 'form' %>

diff --git a/app/views/groups/_show_header.html.erb b/app/views/groups/_show_header.html.erb
@@ -1,4 +1,4 @@
-<h1>
+<h1 class="default-padding">
   <%= link_to "All User Groups", groups_path %> &gt; 
   <%= @group.name %>
 </h1>
diff --git a/app/views/groups/edit.html.erb b/app/views/groups/edit.html.erb
@@ -1,12 +1,10 @@
 <section class="C no">
 	<header class="C-header">
 		<%= back_button groups_path %>
-		<h1>Edit Group</h1>
+		<h1 class="default-padding">Edit Group</h1>
 	</header>
 	<div class="C-cont">
-		<article>
-			<%= render 'form' %>
-		</article>
+		<%= render 'form' %>
 		<div class="clear"></div>
 	</div>
 </section>
diff --git a/app/views/groups/new.html.erb b/app/views/groups/new.html.erb
@@ -1,7 +1,7 @@
 <section class="C no">
 	<header class="C-header">
 		<%= back_button groups_path %>
-		<h1>New Group</h1>
+		<h1 class="default-padding">New Group</h1>
 	</header>
 	<div class="C-cont">
 		<article>

diff --git a/app/views/screens/_show_header.html.erb b/app/views/screens/_show_header.html.erb
@@ -1,4 +1,4 @@
-<h1>
+<h1 class="default-padding">
   <%= link_to "All Screens", screens_path %> &gt; 
   <%= @screen.name %>
 </h1>
diff --git a/app/views/screens/edit.html.erb b/app/views/screens/edit.html.erb
@@ -1,7 +1,7 @@
 <section class="C">
 	<header class="C-header">
 		<%= back_button :back %>
-		<h1>Edit Screen</h1>
+		<h1 class="default-padding">Edit Screen</h1>
 	</header>
 	<div class="C-cont">
 		<%= render 'form' %>

diff --git a/app/views/screens/new.html.erb b/app/views/screens/new.html.erb
@@ -1,7 +1,7 @@
 <section class="C">
 	<header class="C-header">
 		<%= back_button screens_path %>
-		<h1>New Screen</h1>
+		<h1 class="default-padding">New Screen</h1>
 	</header>
 	<div class="C-cont">
 		<%= render 'form' %>

diff --git a/app/views/templates/_show_header.html.erb b/app/views/templates/_show_header.html.erb
@@ -1,4 +1,4 @@
-<h1 id="contentlist">
+<h1 class="default-padding" id="contentlist">
   <%= link_to "All Templates", templates_path %> &gt; 
   <%= @template.name %>
 </h1>
diff --git a/app/views/templates/edit.html.erb b/app/views/templates/edit.html.erb
@@ -1,7 +1,7 @@
 <section class="C">
 	<header class="C-header" id="template-header">
 		<%= back_button template_path(@template), :back %>
-		<h1>Editing template</h1>
+		<h1 class="default-padding">Editing template</h1>
 	</header> 
 	<div class="C-cont">
 		<%= render 'form', :locals => { :template => @template } %>

diff --git a/app/views/templates/index.html.erb b/app/views/templates/index.html.erb
@@ -1,6 +1,6 @@
 <section class="C">
   <header class="C-header" id="browse-header">
-    <h1>All Templates <%= link_to 'New Template', new_template_path, :class => "btn" if can? :create, @templates %></h1>
+    <h1 class="default-padding">All Templates <%= link_to 'New Template', new_template_path, :class => "btn" if can? :create, @templates %></h1>
   </header>
   <div id="browse-body" class="C-cont">
     <%= render "index_body" %>

diff --git a/app/views/templates/new.html.erb b/app/views/templates/new.html.erb
@@ -9,7 +9,7 @@
   <div class="span10">
     <section class="C">
     	<header class="C-header" id="template-header">
-    		<h1><%= @type.capitalize + " Template" %></h1>
+    		<h1 class="default-padding"><%= @type.capitalize + " Template" %></h1>
     	</header>
     	<div class="C-cont">
   			<% if @type == "create" %>

diff --git a/app/views/users/_show_header.html.erb b/app/views/users/_show_header.html.erb
@@ -1,4 +1,4 @@
-<h1>
+<h1 class="default-padding">
   <%= link_to "All Users", users_path %> &gt;
   <%= @user.name %>
 </h1>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -1,7 +1,7 @@
 <section class="C">
 	<header class="C-header">
 		<%= back_button users_path %>
-		<h1>Edit User</h1>
+		<h1 class="default-padding">Edit User</h1>
 	</header>
 	<div class="C-cont">
 		<%= render 'form' %>

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
@@ -1,6 +1,6 @@
 <section class="C">
 	<header class="C-header">
-		<h1>All Users <%= link_to 'New User', new_user_path, :class => "button" %></h1>
+		<h1 class="default-padding">All Users <%= link_to 'New User', new_user_path, :class => "button" %></h1>
 	</header>
 	<div class="C-cont">
 		<table>

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
@@ -1,7 +1,7 @@
 <section class="C">
 	<header class="C-header">
 		<%= back_button users_path %>
-		<h1>New User</h1>
+		<h1 class="default-padding">New User</h1>
 	</header>
 	<div class="C-cont">
 		<%= render 'form' %>