Merge branch 'master' of github.com:concerto/concerto into revised_in…

…fo_arch
concerto · Jul 6, 2012 · 52fcd80 · 52fcd80
2 parents 9b2cf79 + 258dc6a
commit 52fcd80
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 6 deletions.
diff --git a/app/assets/stylesheets/application/layout/navs.scss.erb b/app/assets/stylesheets/application/layout/navs.scss.erb
@@ -181,6 +181,7 @@
   border-right: 0px !important;
   @include border-radius(12px 0 0 12px !important);
   background: $grayLight;
+  margin-top: 35px;
 
   .nav-header {
     color: #666;

diff --git a/app/assets/stylesheets/application/layout/responsive-767px-max.scss b/app/assets/stylesheets/application/layout/responsive-767px-max.scss
@@ -60,6 +60,27 @@
     position: static;
   }
 
+  // fluid grid resets:
+  .row-fluid {
+    [class*="span"].collapse-right {
+      margin-right: 0px;
+    }
+  }
+
+  // nav resets:
+  .nav-drawer-left {
+    @include border-radius(12px !important);
+    border-right: solid 4px $grayLight !important;
+    margin-top: 0px;
+
+    > li:first-child > a {
+      @include border-radius(8px 8px 0 0 !important);
+    }
+    > li:last-child > a {
+      @include border-radius(0 0 8px 8px !important);
+    }
+  }
+
 }
 
 
@@ -128,4 +149,25 @@
     width: auto;
   }
 
+    // fluid grid resets:
+  .row-fluid {
+    [class*="span"].collapse-right {
+      margin-right: 0px;
+    }
+  }
+
+  // nav resets:
+  .nav-drawer-left {
+    @include border-radius(12px !important);
+    border-right: solid 4px $grayLight !important;
+    margin-top: 0px;
+
+    > li:first-child > a {
+      @include border-radius(8px 8px 0 0 !important);
+    }
+    > li:last-child > a {
+      @include border-radius(0 0 8px 8px !important);
+    }
+  }
+
 }
diff --git a/app/views/contents/new.html.erb b/app/views/contents/new.html.erb
@@ -1,8 +1,7 @@
 <div class="row-fluid">
   <div class="span2 collapse-right">
-    <br /><br />
     <ul class="nav nav-tabs nav-stacked nav-drawer-left">
-      <li class="nav-header">Add content type:</li>
+      <li class="nav-header">Content type to add:</li>
       <% content_types.each do |subclass| %>
   			<li<% if @content.class.to_s == subclass.model_name.human %> class="active"<% end %>>
   				<%= link_to subclass.model_name.human, new_content_path(:type => subclass.model_name.singular) %>

diff --git a/app/views/templates/new.html.erb b/app/views/templates/new.html.erb
@@ -1,10 +1,9 @@
 <div class="row-fluid">
   <div class="span2 collapse-right">
-    <br /><br />
     <ul class="nav nav-tabs nav-stacked nav-drawer-left">
-      <li class="nav-header">Add template by:</li>
-      <li<% if @type == "create" %> class="active"<% end %>><%= link_to "Creating from Scratch", new_template_path(:type=> "create") %></li>
-      <li<% if @type == "import" %> class="active"<% end %>><%= link_to "Importing Existing", new_template_path(:type=> "import") %></li>
+      <li class="nav-header">Template method:</li>
+      <li<% if @type == "create" %> class="active"<% end %>><%= link_to "Create from Scratch", new_template_path(:type=> "create") %></li>
+      <li<% if @type == "import" %> class="active"<% end %>><%= link_to "Import Existing", new_template_path(:type=> "import") %></li>
     </ul>
   </div>
   <div class="span10">