Revert "Fix for issue #116."

breaks more than it fixes This reverts commit c55fd53.
expressjs · Feb 3, 2014 · 5adc440 · 5adc440
1 parent 3b80d74
commit 5adc440
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 114 deletions.
diff --git a/api.jade b/api.jade
@@ -15,7 +15,7 @@ html
 
       include en/api/menu
 
-      #main
+      #right
         include en/api/express
 
         h2 Application

diff --git a/applications.jade b/applications.jade
@@ -10,6 +10,5 @@ html
         include includes/logo
         active = './applications.html'
         include includes/menu
-      #main
-        include en/applications
+      include en/applications
     include includes/footer
diff --git a/en/community.jade b/en/community.jade
@@ -1,4 +1,4 @@
-#main
+#boxes.clearfix
   section#mailing-list
     h3 Mailing List
     p.

diff --git a/faq.jade b/faq.jade
@@ -10,6 +10,6 @@ html
         include includes/logo
         active = './faq.html'
         include includes/menu
-      #main
+      #faq
         include en/faq
     include includes/footer
diff --git a/guide.jade b/guide.jade
@@ -13,8 +13,7 @@ html
 
       include includes/mixins
       include en/guide/menu
-
-      #main
-        include en/guide/index
+
+      include en/guide/index
 
     include includes/footer
diff --git a/includes/menu.jade b/includes/menu.jade
@@ -8,3 +8,4 @@ nav.clearfix
   +item('./applications.html') Applications
   +item('./community.html') Community
   +item('./faq.html') FAQ
+
diff --git a/index.jade b/index.jade
@@ -8,10 +8,9 @@ html
     .bar
     section#content
       header
+        include includes/logo
         active = './'
         include includes/menu
-      section
-        include includes/logo
      section#logos
        .content
          include includes/app-logos

diff --git a/style.css b/style.css
@@ -38,27 +38,33 @@ strong {
   margin-top: 100px;
 }
 
+#content {
+  margin-left: 80px;
+  width: 900px;
+  margin-bottom: 80px;
+}
+
 li code {
   color: #353535;
 }
 
+section section p {
+  width: 60%;
+}
+
 h2 {
   margin-top: 80px;
   font-weight: bold;
 }
 
 h3 {
   background: url(images/hr.png) top center no-repeat;
+  margin-top: 40px;
   padding-top: 50px;
   padding-bottom: 5px;
   font-weight: bold;
 }
 
-#main {
-  width: 75%;
-  margin: 0 12.5% 0 12.5%;
-}
-
 /* links */
 
 a {
@@ -81,12 +87,11 @@ nav a {
 
 /* logo */
 
-#content > section {
-  margin: 10% 0 10% 0;
-}
-
 #logo {
-  margin: auto;
+  margin-top: 180px;
+  margin-bottom: 180px;
+  margin-left: 80px;
+  padding-left: 40px;
   width: 440px;
   border-left: 1px dotted #eee;
   -webkit-font-smoothing: antialiased;
@@ -228,15 +233,11 @@ code .number { color: #2F6FAD }
 
 /* navigation */
 
-header {
-  width: 100%;
-  height: 57px;
-}
-
 nav {
-  margin-top: 15px;
-  margin-right: 15px;
-  float: right;
+  position: fixed;
+  top: 20px;
+  right: 15px;
+  z-index: 100;
 }
 
 nav a {
@@ -281,8 +282,7 @@ html[xmlns] .clearfix {
 
 #boxes {
   background: url(images/hr.png) top center no-repeat;
-  width: 75%;
-  margin: 0 12.5% 0 12.5%;
+  margin-left: 50px;
   padding-top: 50px;
   padding-bottom: 50px;
   font-size: 12px;
@@ -293,23 +293,13 @@ html[xmlns] .clearfix {
 }
 
 #boxes section {
-  width: 15%;
+  width: 180px;
   margin: 0 25px;
   float: left;
   /* fix grid jank. #105 */
   min-height: 200px;
 }
 
-#boxes section:last-child {
-  width: 30%;
-}
-
-#boxes section:last-child p {
-  width: 50%;
-  display: inline-block;
-  margin-top: 0;
-}
-
 #boxes h3 {
   background: none;
   margin-top: 0;
@@ -381,7 +371,6 @@ html[xmlns] .clearfix {
 
 .application img {
   float: right;
-  width: 60%;
 }
 
 .application .link {
@@ -396,102 +385,76 @@ html[xmlns] .clearfix {
 
 /* ipad landscape */
 
-@media all and (max-width: 1200px) {    
-  #boxes section {
-    width: 100%;
-    margin-top: 20px;
-    margin-left: 0;
-    /* undo grid jank */
-    min-height: 0;
+@media all and (max-width: 1200px) {
+  #content {
+    width: 760px;
   }
-
-  #boxes section:last-child {
-    width: 100%;
+
+  .applications #content,
+  .community #content {
+    width: 900px;
   }
 }
 
 /* ipad portrait */
 
 @media all and (max-width: 768px) {
+  #content {
+    width: 500px;
+  }
+
+  .applications #content,
+  .community #content {
+    width: 600px;
+  }
+
   .application img {
     width: 60%;
   }
-
-  .inner header {
-    height: 85px;
-  }
-
-  nav {
-    margin-top: 50px;
-    margin-left: 20px;
-    float: left;
+
+  .application {
+    height: 450px;
   }
-
-  /* reference only the nav on the home page */
-  #content header nav:first-child {
-    float: right;
+
+  #boxes {
+    margin-left: 0;
   }
-
-  #menu {
-    display: none;
+
+  #boxes section {
+    width: 100%;
+    margin-top: 20px;
+    margin-left: 0;
+    /* undo grid jank */
+    min-height: 0;
   }
 }
 
 /* iphone portrait */
 
 @media all and (max-width: 650px) {
-  body a > img {
-    display: none;
-  }
-
-  nav {
-    margin: 15px 0 0 0;
-    width: 30%;
-    display: inline-block;
-    float: right;
-  }
-
-  nav a {
-    display: inherit;
-  }
-
-  #content header {
-    height: 150px;
-  }
-
-  .inner header {
-    position: static;
-  }
-
-  .inner {
-    margin-top: 0;
-  }
-
-  .inner.scroll header {
-    border-bottom: 0;
-    box-shadow: 0 0 0;
+  #logo {
+    margin-left: 0;
   }
-
-  .inner #logo {
-    padding-top: 60px;
-    display: inline-block;
-    position: static;
+
+  #content {
+    width: 380px;
   }
-
-  #menu {
-    display: none;
+
+  .applications #content,
+  .community #content {
+    width: 500px;
   }
 
   section section p {
     width: 100%;
   }
 
-  .application img {
-    width: 50%;
+  .application {
+    height: 380px;
   }
-  
-  .application .link {
-    left: 70%;
+
+  .application img {
+    width: 60%;
   }
 }
 
@@ -506,7 +469,8 @@ html[xmlns] .clearfix {
 }
 
 #book img {
-  display: inline-block;
-  width: 30%;
-  float: right;
+  position: absolute;
+  top: 0;
+  right: -110px;
+  width: 50%;
 }