Mostly Style fixes

- Fix footer so block are inline-block - Navbar Collapes At larger size - Other style fixes
joewashear007 · Jan 12, 2014 · 392cb2b · 392cb2b
1 parent 70c5d5a
commit 392cb2b
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 25 deletions.
diff --git a/Controller/SectionsController.php b/Controller/SectionsController.php
@@ -3,6 +3,13 @@
 class SectionsController extends AppController {
     public $helpers = array('Html', 'Form', 'Session', 'Js');
     public $components = array('Session', 'Auth');
+
+    public function beforeFilter() {
+        parent::beforeFilter();
+        if(!$this->Auth->loggedIn()) {
+            $this->Components->unload('DebugKit.Toolbar');
+        }
+    }
 
     public function index() { 
         $this->layout = 'siteeng';

diff --git a/View/Elements/MainMenu.ctp b/View/Elements/MainMenu.ctp
@@ -29,12 +29,12 @@ $this->Js->get('#msgbox-close')->event('click', $event);
         </ul>
         <?php if(Configure::read('SiteEng.Run.Edit') ): ?>
             <ul class="nav navbar-nav navbar-right">
-                <li><?php echo $this->Html->link("", array('controller' => 'users', 'action' => 'logout'), array( "class" => "glyphicon glyphicon-floppy-saved")); ?></li>
-                <li><?php echo $this->Html->link("", array('controller' => 'sections', 'action' => 'editsite'), array( "class" => "glyphicon glyphicon-cog")); ?></li>
+                <li class="navbar-icon"><?php echo $this->Html->link("", array('controller' => 'users', 'action' => 'logout'), array( "class" => "glyphicon glyphicon-floppy-saved")); ?></li>
+                <li class="navbar-icon"><?php echo $this->Html->link("", array('controller' => 'sections', 'action' => 'editsite'), array( "class" => "glyphicon glyphicon-cog")); ?></li>
             </ul>
         <?php else: ?>
             <ul class="nav navbar-nav navbar-right">
-                <li><?php echo $this->Html->link("", array('controller' => 'users', 'action' => 'login'), array( "class" => "glyphicon glyphicon-pencil")); ?></li>
+                <li class="navbar-icon"><?php echo $this->Html->link("", array('controller' => 'users', 'action' => 'login'), array( "class" => "glyphicon glyphicon-pencil")); ?></li>
             </ul>
         <?php endif; ?>
     </div><!--/.nav-collapse -->

diff --git a/webroot/css/SE.CustomStyles.css b/webroot/css/SE.CustomStyles.css
@@ -1,20 +1,67 @@
 @font-face  {font-family: atrox;  src: url('../fonts/ATROX.TTF'); font-stretch: extra-expanded;  }
 
-/* Predefined Styles  */
-.Section-Title{
-    font-size: 2.7em;
-    font-family: atrox; 
-    text-decoration: underline;
+@media (max-width: 991px) {
+    .navbar-header {
+        float: none;
+    }
+    .navbar-toggle {
+        display: block;
+    }
+    .navbar-collapse {
+        border-top: 1px solid transparent;
+        box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
+    }
+    .navbar-collapse.collapse {
+        display: none!important;
+    }
+    .navbar-nav {
+        float: none!important;
+        margin: 7.5px -15px;
+    }
+    .navbar-nav>li {
+        float: none;
+    }
+    .navbar-nav>li>a {
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
 }
-.Article-Title{
-    font-size: 2.0em;
-    font-family: atrox; 
+
+
+/* Predefined Styles  */
+
+@media(max-width:991px){
+    .Section-Title{
+        font-size: 2.0em;
+        font-family: atrox; 
+        text-decoration: underline;
+    }
+     .Article-Title{
+        font-size: 1.7em;
+        font-family: atrox; 
+    }
+    .Article-Text{
+        font-weight: bold;
+        font-size: 1.2em;
+    }
 }
-.Article-Text{
-    font-weight: bold;
-    font-size: 1.3em;
+@media(min-width:992px){
+    .Section-Title{
+        font-size: 2.5em;
+        font-family: atrox; 
+        text-decoration: underline;
+    }
+     .Article-Title{
+        font-size: 2.0em;
+        font-family: atrox; 
+    }
+    .Article-Text{
+        font-weight: bold;
+        font-size: 1.3em;
+    }
 }
 
+
 /* Custom Styles */
 body {
     background-color: grey;

diff --git a/webroot/css/siteeng.css b/webroot/css/siteeng.css
@@ -6,17 +6,30 @@
 .navbar {
     margin-bottom: 0px;
 }
-.navbar-header > a {
-   font-size: 4.0em; 
-}
-.navbar-right {
-   font-size: 2.0em;
-   padding-right: 40px;
-}
-.navbar-right > li {
-    padding-left: 10px;
-    padding-right: 10px;
-}
+
+@media(max-width:991px){
+    .navbar-header > a {
+       font-size: 3.0em; 
+    }
+    .navbar-icon {
+        padding-left: 10px;
+        padding-right: 10px;
+        font-size: 1.5em;
+    }
+}
+@media(min-width:992px){
+    .navbar-header > a {
+      font-size: 3.5em; 
+    }
+    .navbar-icon {
+        padding-left: 10px;
+        padding-right: 40px;
+        font-size: 2.0em;
+    }
+}
+@media(min-width:1200px){}
+
+
 
 /* Panel Styles  */
 .panel-title{
@@ -67,6 +80,7 @@
     color: black;
     font-weight: bold;
     border-right: solid 1px #555;
+    display: inline-block;
 }
 .SiteInfoItem a{
    text-decoration:underline;
@@ -80,6 +94,7 @@
     display: block;
 }
 .TechUsedItem{
+    display: inline-block;
     color: black;
     height: 20px;
     display: inline;