Update content layout markup

gabor-udvari · Sep 25, 2015 · 7464d05 · 7464d05
1 parent 8c724a0
commit 7464d05
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/RoboFile.php b/RoboFile.php
@@ -137,8 +137,10 @@ public function watch() {
     $this->taskWatch()
       ->monitor('assets/styles/main.scss', function() {
         $this->styles();
+      })
       ->monitor('assets/styles/bootgenie.scss', function() {
         $this->styles();
-      })->run();
+      })
+      ->run();
   }
 }
diff --git a/assets/styles/bootgenie.css b/assets/styles/bootgenie.css
diff --git a/sources/styles/bootgenie.scss b/sources/styles/bootgenie.scss
@@ -32,17 +32,21 @@
 
 // Layout
 
-.main-wrapper {
+#content_container {
+  @extend .container;
+}
+
+.content-wrapper {
   @include make-row();
 }
 
-.main-wrapper .sidebar {
+.content-wrapper .sidebar {
   @include make-lg-column(4);
   @include make-md-column(4);
   @include make-sm-column(4);
 }
 
-.main-wrapper .main {
+.content-wrapper .main {
   @include make-lg-column(8);
   @include make-md-column(8);
   @include make-sm-column(8);

diff --git a/templates/layout.php b/templates/layout.php
@@ -38,10 +38,12 @@
                 <?php require_once BOOTGENIE_PATH . 'templates/header.inc.php'; ?>
                 <?php \thebuggenie\core\framework\Logging::log('done (rendering header)'); ?>
             </header>
-            <div id="content_container" class="container">
+            <div id="content_container">
+                <div class="content-wrapper">
                 <?php \thebuggenie\core\framework\Logging::log('Rendering content'); ?>
                 <?php echo $content; ?>
                 <?php \thebuggenie\core\framework\Logging::log('done (rendering content)'); ?>
+                </div> <!-- /.content-wrapper -->
             </div> <!-- /#content_container -->
             <footer>
                 <?php \thebuggenie\core\framework\Event::createNew('core', 'layout.php::footer-begins')->trigger(); ?>

diff --git a/templates/main_index.html.php b/templates/main_index.html.php
@@ -12,7 +12,6 @@
     <?php endif; ?>
 <?php endif; ?>
 
-<div class="main-wrapper">
 <aside class="sidebar">
         <?php include_component('main/menulinks', array('links' => $links, 'target_type' => 'main_menu', 'target_id' => 0, 'title' => __('Quick links'))); ?>
         <?php \thebuggenie\core\framework\Event::createNew('core', 'index_left')->trigger(); ?>
@@ -54,4 +53,3 @@
         <?php endif; ?>
         <?php \thebuggenie\core\framework\Event::createNew('core', 'index_right_bottom')->trigger(); ?>
 </section> <!-- /.main -->
-</div> <!-- /.main-wrapper -->
diff --git a/templates/publish_showarticle.html.php b/templates/publish_showarticle.html.php
@@ -5,7 +5,6 @@
     $tbg_response->setTitle($article_name);
 ?>
 
-<div class="main-wrapper">
 <aside class="sidebar <?php if ($article->getArticleType() == \thebuggenie\modules\publish\entities\Article::TYPE_MANUAL) echo 'manual'; ?>">
             <?php if ($article->getArticleType() == \thebuggenie\modules\publish\entities\Article::TYPE_MANUAL): ?>
                 <?php include_component('manualsidebar', array('article' => $article)); ?>

diff --git a/templates/publish_specialarticle.html.php b/templates/publish_specialarticle.html.php
@@ -6,7 +6,6 @@
 
 ?>
 
-<div class="main-wrapper">
 <aside class="sidebar">
     <?php include_component('leftmenu', compact('article', 'special')); ?>
 </aside>