Merge pull request #1090 from CFXd/move-main-and-sidebar-markup-out-of-php

Move <main> and .sidebar markup out of PHP and into LESS
2014-08-15 12:30:09 -05:00
parent d12bd1de1c 32acdb3860
commit a1edc5404f
5 changed files with 20 additions and 20 deletions
--- a/assets/less/_variables.less
+++ b/assets/less/_variables.less
@@ -8,3 +8,7 @@
 // -------------------------

@icon-font-path:        "../vendor/bootstrap/fonts/";
+
+@main-sm-columns:       @grid-columns;
+
+@sidebar-sm-columns:    4;
--- a/assets/less/layouts/_general.less
+++ b/assets/less/layouts/_general.less
@@ -2,4 +2,9 @@
 .wrap { }

 // Main content area
-.main { }
+.main {
+  .make-sm-column(@main-sm-columns);
+  .sidebar-primary & {
+    .make-sm-column(@main-sm-columns - @sidebar-sm-columns);
+  }
+}
--- a/assets/less/layouts/_sidebar.less
+++ b/assets/less/layouts/_sidebar.less
@@ -1 +1,3 @@
-.sidebar { }
+.sidebar {
+  .make-sm-column(@sidebar-sm-columns);
+}