Jacob Moen avatar Jacob Moen committed bd809d9

Layout fixing

Comments (0)

Files changed (4)

themes/ogitor/sass/main.scss

 
 body {
     @include improve-text-rendering;
+    background: #222;
 }
 
 $base-font-size: 16px;
 }
 
 #navbar {
-    margin: 0;
-    padding: 0;
     @extend .pillbox;
+    padding-top: 2em;
+    padding-bottom: 2em;
 }
-    
-    
+
 img {
   max-width: 100%;
 }
 
-
-#navbar {
-    @extend .pillbox;
-    padding-left: 20px;
-    padding-top: 0px;
-    padding-bottom: 1em;
+.content-wrapper {
+    background: white;
 }
 
 #crumbs {
     background: black;
 }
 
-/*#header-img {
+#header-img {
     margin: 8px 20px 0 8px;
-    padding: 8px 20px 0 8px;
-}*/
+    //padding: 8px 20px 0 8px;
+}
 
 #download-button {
     position: relative;
   padding-top: 1em;
 }
 
-#fbg {
+#appetizers {
     border-top: 1px solid darken($pillactive, 10%);
     background: $pillactive;
-    padding: 10px 0 0 0;
+    padding-top: 1em;
+    padding-bottom: 1em;
     h2 {
         color: #5190bb;
         @include text-shadow(0px 3px 3px rgba(0, 0, 0, 0.6));
     }
 }
 
-#fbg-resize {
-  margin: 0 auto;
-  padding: 20px 20px;
-}
-
 #footer {
     background: #222;
-    padding: 10px 0 5px 0;
+    padding-top: 1em;
+    padding-bottom: 1em;
     p {
         color: #9a9a9a;
         a {

themes/ogitor/sass/partials/_grid-susy.scss

 $total-columns  : 4;             // a 4-column grid
 $column-width   : 8em;            // each column is 8em wide
 $gutter-width   : 1em;            // 1em gutters between columns
-$grid-padding   : $gutter-width * 2;  // grid-padding equal to gutters
+$grid-padding   : $gutter-width;  // grid-padding equal to gutters
 
 $container-style: fluid; // fluid, magic, static
 
 @import 'susy';
 
 
-$show-grid: false;
+$show-grid: true;
 
 // Override susy-grid-background mixin to show vertical rythm
 @mixin susy-grid-background {
     }
   }
   
-  #fbg-resize {
+  #appetizers {
     #col1 {
       @include span-columns(2, 6);
     }
     }
   }
   
-  #fbg-resize {
+  #appetizers {
     #col1 {
       @include span-columns(2, 8);
     }
     }
   }
   
-  #fbg-resize {
+  #appetizers {
     #col1 {
       @include span-columns(4, 12);
     }
     }
   }
   
-  #fbg-resize {
+  #appetizers {
     #col1 {
       @include span-columns(8, 24);
     }
   }
 }
 
-/*#header, #footer { background: $c-tertiary; }
-#content { background: $c-primary; }*/
-                    
-.contentwide, .content {
-    @include span-columns(4,4);
-    padding-bottom: 1em;
-    /*background: $c-primary;*/ }
-
-.sidebar {
-    @include span-columns(4,4);
-    padding-bottom: 1em;
-    /*background: $c-secondary;*/ }
-
-@include at-breakpoint($first-break 6) {
-    .contentwide {
-        @include span-columns(6,6); }
-    .content {
-        @include span-columns(4,6); }
-    .sidebar {
-        @include span-columns(2 omega,6); } }
-    
-@include at-breakpoint($second-break 8) {
-    .contentwide {
-        @include span-columns(8,8); }
-    .content {
-        @include span-columns(6,8); }
-    .sidebar {
-        @include span-columns(2 omega,8); } }    
-
-@include at-breakpoint($third-break 12) {
-    .contentwide {
-        @include span-columns(12,12); }
-    .content {
-        @include span-columns(9,12); }
-    .sidebar {
-        @include span-columns(3 omega,12); } }    
-
-@include at-breakpoint($fourth-break 24) {
-    .contentwide {
-        @include span-columns(24,24); }
-    .content {
-        @include span-columns(18,24); }
-    .sidebar {
-        @include span-columns(6 omega,24); } }
-
-/*
-.mobile-only {
-    @include mobile-only;
-}
-
-.mobile-hide {
-    @include mobile-hide;
-}*/
-
 // Media Queries in Sass 3.2
 //
 // These mixins make media queries a breeze with Sass.

themes/ogitor/views/layouts/front.php

 <?php $this->beginContent('//layouts/main'); ?>
     <div id="header">
         <div id="header-row1-wrap">
-            <div id="header-row1" class="container">&nbsp;
+            <div id="header-row1" class="container">
                 <div id="logo">
                     <a href="<?php echo $this->createUrl('/site/index'); ?>"><img src="<?php echo Yii::app()->theme->baseUrl; ?>/images/blue/logo.png" alt="name" /></a>
                 </div>
             </div>
         </div><!-- main-header-wrap //-->
     </div><!-- header //-->
-    <div id="content" class="container">
-        <div id="main-content" role="main">
-            <?php echo $content; ?>
-        </div>
-        <div id="sidebar" role="complementary">
-            <ul id="home_sidebar_widget">
-                <li id="homepage_sidebar_1">
-                    <div class="widget">
-                        <h2>Download</h2>
-                        <img style="float:left; position: relative; bottom: 5px;" src="<?php echo Yii::app()->theme->baseUrl; ?>/images/icone_download_small.png" alt="<?php echo CHtml::encode(Yii::app()->name); ?>" />
-                        <p>Latest Ogitor</p>
-                        <br class="clear"/>
-                    </div>
-                </li>   
-                <li id="homepage_sidebar_2">
-                    <div class="widget">
-                        <h2>Users Online</h2>
-                        <?php echo $this->clips['users_online']; ?>
-                    </div>
-                    <div class="widget">
-                        <h2>Site Statistics</h2>
-                        <?php echo $this->clips['site_statistics']; ?>
-                    </div>
-                </li>   
-            </ul>
+    <div class="content-wrapper">
+        <div id="content" class="container">
+            <div id="main-content" role="main">
+                <?php echo $content; ?>
+            </div>
+            <div id="sidebar" role="complementary">
+                <ul id="home_sidebar_widget">
+                    <li id="homepage_sidebar_1">
+                        <div class="widget">
+                            <h2>Download</h2>
+                            <img style="float:left; position: relative; bottom: 5px;" src="<?php echo Yii::app()->theme->baseUrl; ?>/images/icone_download_small.png" alt="<?php echo CHtml::encode(Yii::app()->name); ?>" />
+                            <p>Latest Ogitor</p>
+                            <br class="clear"/>
+                        </div>
+                    </li>
+                    <li id="homepage_sidebar_2">
+                        <div class="widget">
+                            <h2>Users Online</h2>
+                            <?php echo $this->clips['users_online']; ?>
+                        </div>
+                        <div class="widget">
+                            <h2>Site Statistics</h2>
+                            <?php echo $this->clips['site_statistics']; ?>
+                        </div>
+                    </li>
+                </ul>
+            </div>
         </div>
     </div>
 <?php $this->endContent(); ?>

themes/ogitor/views/layouts/main.php

 <body>
         <?php echo $content; ?>
         <!-- The main column ends  -->
-        <div id="fbg">
-            <div id="fbg-resize" class="container">
+            <div id="appetizers" class="container">
                 <!--
                 <div id="col1">
                     <h2><span>Image Gallery</span></h2>
                     <p>Lorem ipsum dolor<br />
                     Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec libero. Suspendisse bibendum. Cras id urna. <a href="#">Morbi tincidunt, orci ac convallis aliquam</a>, lectus turpis varius lorem, eu posuere nunc justo tempus leo. Donec mattis, purus nec placerat bibendum, dui pede condimentum odio, ac blandit ante orci ut diam.</p>
                 </div>
-            </div><!-- fbg-resize //-->
+            </div><!-- appetizers //-->
             <!-- begin footer -->
-            <div id="footer">
-                <div id="footer-resize" class="container">
-                    <p id="footerleft">&copy; Copyright <a href="#">MyWebSite</a>.</p>
-                    <p id="footerright">
-                        <?php if(!Yii::app()->user->isGuest) : ?>
-                            <?php echo CHtml::link('Log Out', $this->createUrl('/userGroups/user/logout')); ?>
-                        <?php else : ?>
-                            <?php echo CHtml::link('Log In', $this->createUrl('/userGroups')); ?>
-                        <?php endif; ?>
-                    </p>
-                </div>
-            </div><!-- footer //-->
-    </div><!-- fbg //-->
+            <div id="footer" class="container">
+                <p id="footerleft">&copy; Copyright <a href="#">MyWebSite</a>.</p>
+                <p id="footerright">
+                    <?php if(!Yii::app()->user->isGuest) : ?>
+                        <?php echo CHtml::link('Log Out', $this->createUrl('/userGroups/user/logout')); ?>
+                    <?php else : ?>
+                        <?php echo CHtml::link('Log In', $this->createUrl('/userGroups')); ?>
+                    <?php endif; ?>
+                </p>
+            </div>
 </body>
 </html>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.