Home Explore Help
Sign In
mirrors
/
Fork-Awesome
mirror of https://github.com/ForkAwesome/Fork-Awesome
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

updating sticky footer, finishing off doc update sans responsive layout

davegandy 11 years ago
parent
4ad04663f8
commit
daa478d346
5 changed files with 34 additions and 29 deletions
Split View Show Diff Stats
  1. 18 16
      src/_includes/examples/new.html
  2. 1 2
      src/_layouts/base.html
  3. 7 7
      src/assets/less/site/footer.less
  4. 4 4
      src/assets/less/site/navbar.less
  5. 4 0
      src/assets/less/site/variables.less

+ 18 - 16
src/_includes/examples/new.html
View File 

@@ -14,22 +14,24 @@
 
     </div>
 
     <div class="col-md-4">
 
       <h4><a href="#stacked">Stacked Icons</a></h4>
 
-      <div class="well well-transparent stacked">
 
-        <span class="fa-stack">
 
-          <i class="fa fa-unchecked fa-stack-base"></i>
 
-          <i class="fa fa-twitter"></i>
 
-        </span>
 
-        fa-twitter on fa-check-empty<br>
 
-        <span class="fa-stack">
 
-          <i class="fa fa-circle fa-stack-base"></i>
 
-          <i class="fa fa-flag fa-light"></i>
 
-        </span>
 
-        fa-flag on fa-circle<br>
 
-        <span class="fa-stack">
 
-          <i class="fa fa-sign-blank fa-stack-base"></i>
 
-          <i class="fa fa-terminal fa-light"></i>
 
-        </span>
 
-        fa-terminal on fa-sign-blank
 
+      <div class="well well-transparent">
 
+        <div class="margin-top margin-bottom">
 
+          <span class="fa-stack">
 
+            <i class="fa fa-unchecked fa-stack-base"></i>
 
+            <i class="fa fa-twitter"></i>
 
+          </span>
 
+          fa-twitter on fa-check-empty<br>
 
+          <span class="fa-stack">
 
+            <i class="fa fa-circle fa-stack-base"></i>
 
+            <i class="fa fa-flag fa-light"></i>
 
+          </span>
 
+          fa-flag on fa-circle<br>
 
+          <span class="fa-stack">
 
+            <i class="fa fa-sign-blank fa-stack-base"></i>
 
+            <i class="fa fa-terminal fa-light"></i>
 
+          </span>
 
+          fa-terminal on fa-sign-blank
 
+        </div>
 
       </div>
 
     </div>
 
     <div class="col-md-4">

+ 1 - 2
src/_layouts/base.html
View File 

@@ -45,12 +45,11 @@
 
     })();
 
   </script>
 
 </head>
 
-<body data-spy="scroll" data-target=".navbar">
 
+<body>
 
 <div id="wrap"> <!-- necessary for sticky footer. wrap all content except footer -->
 
   {% include navbar.html %}
 
 
   {{ content }}
 
-  <div class="push"><!-- necessary for sticky footer --></div>
 
 </div>
 
 {% include footer.html %}

+ 7 - 7
src/assets/less/site/footer.less
View File 

@@ -11,9 +11,12 @@
 
 
   }
 
 
+  .container {
 
+    padding-top: 40px;
 
+  }
 
+
 
   color: mix(@red, #fff, 35%);
 
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 
-  margin-top: 60px;
 
   .project { margin-top: 10px; }
 
 }
 
 
@@ -21,10 +24,8 @@
 
 // Sticky Footer Styles
 
 // --------------------
 
 
-@footer-height: 160px;
 
-@footer-padding-top: 40px;
 
-@footer-padding-bottom: 40px;
 
-@wrap-padding-bottom: 60px; // also known as the margin above the footer
 
+@footer-height: 165px;
 
+@footer-margin: 60px;
 
 
 html, body { height: 100%; }
 
 
@@ -33,10 +34,9 @@ html, body { height: 100%; }
 
   height: auto !important;
 
   height: 100%;
 
   margin: 0 auto -(@footer-height);
 
-  padding: 0 0 (@footer-height + @wrap-padding-bottom);
 
+  padding: 0 0 (@footer-height + @footer-margin);
 
 }
 
 
 #footer {
 
   height: @footer-height;
 
-  padding: @footer-padding-top 0 @footer-padding-bottom;
 
 }

+ 4 - 4
src/assets/less/site/navbar.less
View File 

@@ -10,10 +10,10 @@
 
 
 //.navbar .nav > li > a { padding: 12px 10px 9px; }
 
 
-.navbar-nav > li > a {
 
-  padding-top: 16px;
 
-  padding-bottom: 14px;
 
-}
 
+//.navbar-nav > li > a {
 
+//  padding-top: 16px;
 
+//  padding-bottom: 14px;
 
+//}
 
 
 // makes dropdowns closer for split dropdown
 
 .navbar-nav > li {

+ 4 - 0
src/assets/less/site/variables.less
View File 

@@ -30,6 +30,10 @@
 
 @state-info-bg:                  @blue-lighter;
 
 @state-info-border:              darken(spin(@state-info-bg, -10), 7%);
 
 
+// Navbar
 
+@navbar-height:                     40px;
 
+@navbar-inverse-brand-color:        #fff;
 
+
 
 
 
 // SITE VARIABLES