ThemeMagic: Fix theme in frontend

t3framework · Oct 18, 2013 · a98d71c · a98d71c
1 parent 883e6a7
commit a98d71c
Show file tree

Hide file tree

Showing 30 changed files with 2,438 additions and 1,236 deletions.
diff --git a/source/plg_system_t3/admin/thememagic/thememagic.tpl.php b/source/plg_system_t3/admin/thememagic/thememagic.tpl.php
@@ -165,7 +165,7 @@
 
 			<?php endif;?>
 			<div id="t3-admin-tm-preview">
-				<iframe id="t3-admin-tm-ifr-preview" frameborder="0" src="<?php echo $url . ($tplparams->get('theme', -1) != -1 ? ('&t3style=' . $tplparams->get('theme')) : '') ?>"></iframe>
+				<iframe id="t3-admin-tm-ifr-preview" frameborder="0" src="<?php echo $url ?>"></iframe>
 			</div>
 
 		</div>

diff --git a/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.eot b/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.svg b/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.ttf b/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.woff b/source/plg_system_t3/base/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/source/plg_system_t3/base/bootstrap/img/bootstrap-mdo-sfmoma-01.jpg b/source/plg_system_t3/base/bootstrap/img/bootstrap-mdo-sfmoma-01.jpg
diff --git a/source/plg_system_t3/base/bootstrap/img/bootstrap-mdo-sfmoma-02.jpg b/source/plg_system_t3/base/bootstrap/img/bootstrap-mdo-sfmoma-02.jpg
diff --git a/source/plg_system_t3/base/bootstrap/img/bootstrap-mdo-sfmoma-03.jpg b/source/plg_system_t3/base/bootstrap/img/bootstrap-mdo-sfmoma-03.jpg
diff --git a/source/plg_system_t3/base/bootstrap/img/example-sites/fleetio.png b/source/plg_system_t3/base/bootstrap/img/example-sites/fleetio.png
diff --git a/source/plg_system_t3/base/bootstrap/img/example-sites/jshint.png b/source/plg_system_t3/base/bootstrap/img/example-sites/jshint.png
diff --git a/source/plg_system_t3/base/bootstrap/img/example-sites/kippt.png b/source/plg_system_t3/base/bootstrap/img/example-sites/kippt.png
diff --git a/source/plg_system_t3/base/bootstrap/img/example-sites/soundready.png b/source/plg_system_t3/base/bootstrap/img/example-sites/soundready.png
diff --git a/source/plg_system_t3/base/bootstrap/img/examples/bootstrap-example-fluid.jpg b/source/plg_system_t3/base/bootstrap/img/examples/bootstrap-example-fluid.jpg
diff --git a/source/plg_system_t3/base/bootstrap/img/examples/bootstrap-example-hero.jpg b/source/plg_system_t3/base/bootstrap/img/examples/bootstrap-example-hero.jpg
diff --git a/source/plg_system_t3/base/bootstrap/img/examples/bootstrap-example-starter.jpg b/source/plg_system_t3/base/bootstrap/img/examples/bootstrap-example-starter.jpg
diff --git a/source/plg_system_t3/base/etc/assets.xml b/source/plg_system_t3/base/etc/assets.xml
diff --git a/source/plg_system_t3/base/js/less-1.3.3.min.js b/source/plg_system_t3/base/js/less-1.3.3.min.js
diff --git a/source/plg_system_t3/base/js/less-1.3.3.js → source/plg_system_t3/base/js/less.js b/source/plg_system_t3/base/js/less-1.3.3.js → source/plg_system_t3/base/js/less.js
diff --git a/source/plg_system_t3/base/less/mixins.less b/source/plg_system_t3/base/less/mixins.less
@@ -19,7 +19,7 @@
   // extend left offset
   .offset (@gridColumnWidth, @gridGutterWidth) {
     .offset-X (@index) when (@index > 0) {
-      (.offset-@{index}) { .offset-(@index); }
+      (~".offset-@{index}") { .offset-(@index); }
       .offset-X(@index - 1);
     }
     .offset-X (0) {}
@@ -35,8 +35,8 @@
   .fixOffsetX (@fluidGridColumnWidth, @fluidGridGutterWidth) {
 
     .offsetX (@index) when (@index > 0) {
-      (.offset@{index}) { .offset(@index); }
-      (.offset@{index}:first-child) { .offsetFirstChild(@index); }
+      (~'.offset@{index}') { .offset(@index); }
+      (~'.offset@{index}:first-child') { .offsetFirstChild(@index); }
       .offsetX(@index - 1);
     }
     .offsetX (0) {}
@@ -50,7 +50,7 @@
     }
 
     .offset-X (@index) when (@index > 0) {
-      (.offset-@{index}) { .offset-(@index); }
+      (~'.offset-@{index}') { .offset-(@index); }
       .offset-X(@index - 1);
     }
     .offset-X (0) {}
@@ -67,7 +67,7 @@
   .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
 
     .spanX (@index) when (@index > 0) {
-      (.span@{index}) { .span(@index); }
+      (~".span@{index}") { .span(@index); }
       .spanX(@index - 1);
     }
     .spanX (0) {}
@@ -105,7 +105,7 @@
       *width: percentage(((@fluidGridColumnWidth * @cols) + (@fluidGridGutterWidth * (@cols - 1)))/((@fluidGridColumnWidth * @pcols) + (@fluidGridGutterWidth * (@pcols - 1)))) - (.5 / @gridRowWidth * 100 * 1%);
     }
     .spanXY (@indexx) when(@indexx > 0) {
-      (.span@{indexx}) {
+      (~".span@{indexx}") { 
         .row {
           // span for spany in spanx
           [class*="span"] {
@@ -117,7 +117,7 @@
           }
 
           .spanY (@indexy) when (@indexy > 0) {
-            (.span@{indexy}) {
+            (~".span@{indexy}") {
               .spanxy_(@indexx, @indexy);
             }
             .spanY (@indexy - 1); 

diff --git a/source/plg_system_t3/base/less/t3.less b/source/plg_system_t3/base/less/t3.less
@@ -17,7 +17,7 @@
 
 // Always Show Submenu
 // -------------------
-@media (max-width: @grid-float-breakpoint) {
+@media (max-width: @navbarCollapseWidth) {
   // Always show submenu for navigation
   .always-show .mega > .mega-dropdown-menu,
   .always-show .dropdown-menu {

diff --git a/source/plg_system_t3/bs3/js/less-1.3.3.min.js b/source/plg_system_t3/bs3/js/less-1.3.3.min.js