Merge branch 'new-docs' of git.int.sfo01.mml:mxml/api-spec into new-docs

appdotnet · Apr 1, 2014 · e193a8e · e193a8e
2 parents 8014a5e + d00a6ff
commit e193a8e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/layouts/default.html b/layouts/default.html
@@ -19,20 +19,14 @@
     <div id='replace-header'>
     </div>
     <div class="yui3-u-1 subnav-container">
-      <ul class="breadcrumb container">
-        <li><a class="brand" href="/">App.net API Documentation</a></li>
-        <li class="pull-right ordering">
-          <a href="https://github.com/appdotnet/api-spec/">View on Github</a>
-        </li>
-      </ul>
     </div>
     <script>
       ADN.write_markup('replace-header');
     </script>
 
     <div class="container">
       <div class="yui3-g">
-        <div class="yui3-u-1-4 m-yui3-u-1">
+        <div class="yui3-u-1-5 m-yui3-u-1">
           <div class='sidebar'>
             <% if @item.identifier.start_with? '/reference' %>
               <%= render 'partials/reference_nav'%>
@@ -41,8 +35,10 @@
             <% end %>
           </div>
         </div>
-        <div class="yui3-u-3-4 m-yui3-u-1 content subpixel">
-          <%= yield %>
+        <div class="yui3-u-4-5 m-yui3-u-1 yui3-g content-container">
+            <div class="yui3-u-1 content subpixel">
+              <%= yield %>
+            </div>
         </div>
       </div>
     </div>

diff --git a/static/css/style.css b/static/css/style.css
@@ -1,11 +1,22 @@
 /* we're currently modifying bootstrap.css to apply 'table' and 'table-striped' styles to all tables */
 
 body {
-    background-color: white;
+}
+
+.content-container {
+    margin-left: 6px;
 }
 
 .content {
-    padding-bottom: 100px;
+    padding: 15px 15px 15px 15px;
+    margin-bottom: 100px;
+    background-color: white;
+    border: 1px solid #ddd;
+    border-top: none;
+}
+
+.sidebar {
+    margin-top: 46px;
 }
 
 .label-GET {
@@ -177,8 +188,7 @@ p, div.layout-like-p {
 }
 
 .subnav-container {
-    border-bottom: 1px solid #dddddd;
-    margin-bottom: 30px;
+    height: 0;
 }
 
 ul.nav-list .nav-header {