Footer now isn't sticky, that never worked. Removed some extra commen…

…ted code in the HTML
nerdbaggy · Feb 3, 2016 · d5fbe58 · d5fbe58
1 parent deef88b
commit d5fbe58
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 44 deletions.
diff --git a/css/statuspage.css b/css/statuspage.css
@@ -1,21 +1,8 @@
-html {
-      position: relative;
-      min-height: 100%;
-}
+
 body {
-      /* Margin bottom by footer height */
-      margin-bottom: 60px;
       padding-top: 50px;
 
 }
-.footer {
-      position: absolute;
-      bottom: 0;
-      width: 100%;
-      /* Set the fixed height of the footer here */
-      height: 60px;
-      padding-top: 60px;
-}
 
 
 .fa {

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,13 +11,20 @@ minifyCSS = require('gulp-minify-css'),
 del = require('del'),
 dest = 'build/';
 
+gulp.task('watch', function() {
+  gulp.watch("html/*", ['html']);
+  gulp.watch("js/app/config.js", ['js-config']);
+	gulp.watch("backend/statuspage/**/**/*", ['php']);
+});
+
+
 gulp.task('templates', function(){
 	return gulp.src(['js/app/templates/table.hbs', 'js/app/templates/logs.hbs'])
 	.pipe(handlebars())
 	.pipe(wrap('Handlebars.template(<%= contents %>)'))
 	.pipe(declare({
 		namespace: 'StatusPage.templates',
-      noRedeclare: true, // Avoid duplicate declarations 
+      noRedeclare: true, // Avoid duplicate declarations
   }))
 	.pipe(concat('templates.js'))
 	.pipe(gulp.dest('js/app/'));

diff --git a/html/index.html b/html/index.html
@@ -20,46 +20,32 @@
         <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
             <div class="container">
                 <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                        <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
                     <a class="navbar-brand" href="index.html" id="statusPageName"></a>
                 </div>
                 <div class="collapse navbar-collapse">
-                    <!--                      <ul class="nav navbar-nav">
-                        <li class="active">
-                            <a href="#">Home</a>
-                        </li>
-                        <li>
-                            <a href="#about">About</a>
-                        </li>
-                        <li>
-                            <a href="#contact">Contact</a>
-                        </li>
-                    </ul>  -->
                     <ul class="nav navbar-nav navbar-right">
                         <p class="navbar-text" id="countdownText"></p>
                     </ul>
                 </div>
-                <!--/.nav-collapse -->
             </div>
         </div>
         <br>
         <div class="container">
             <div class="row">
                 <div class="col-md-12">
                 <div id='alertBar' role="alert"></div>
-
                     <div id="target" class="text-center">
                         <h4>Pulling Latest Updates</h4>
                         <i class="fa fa-refresh fa-spin fa-3x"></i>
                     </div>
                 </div>
             </div>
         </div>
+        <footer class="footer" id='footer'>
+            <div class="container">
+                <p class="text-muted"><a href="http://spencerl.com/statuspage" target="_blank" class="text-muted"><i class="fa fa-github"></i> Powered By StatusPage</a></p>
+            </div>
+        </footer>
         <div class="modal fade" id="logsDisplay" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
@@ -88,22 +74,12 @@ <h4 class="modal-title" id="latencyTitle"></h4>
                     </div>
                     <div class="modal-body">
                         <div id="latencyArea" class="">
-                            <!--<div class="ct-chart ct-perfect-fourth"></div> -->
                             <div id="latencyChart" style="height: 250px;"></div>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-        <footer class="footer" id='footer'>
-            <div class="container">
-                <p class="text-muted"><i class="fa fa-github"></i> Powered By <a href="http://spencerl.com/statuspage" target="_blank" class="text-muted">StatusPage</a></p>
-            </div>
-        </footer>
-        <!-- /.container -->
-        <!-- Bootstrap core JavaScript
-    ================================================== -->
-        <!-- Placed at the end of the document so the pages load faster -->
 
     </body>
 </html>