Commits

Max Bronsema  committed 0d139be Merge

Merging into wwuzen master the updated panels.

  • Participants
  • Parent commits 292ba5f, 80f4252

Comments (0)

Files changed (12)

File layouts/clean-25-75/clean-25-75.inc

+<?php
+
+// Plugin definition
+$plugin = array(
+  'title' => t('Clean 25/75'),
+  'category' => t('Western'),
+  'icon' => 'clean-25-75.png',
+  'theme' => 'clean-25-75',
+  'css' => '../../css/panel-layouts/clean-25-75.css',
+  'regions' => array(
+    'left' => t('25% Left side'),
+    'right' => t('75% Right side')
+  ),
+);

File layouts/clean-25-75/clean-25-75.png

Added
New image

File layouts/clean-25-75/clean-25-75.tpl.php

+<?php
+/**
+ * @file
+ * Template for a 2 column Clean Chemistry panel layout.
+ *
+ * This template provides a two column panel display layout with minimal markup.
+ * Edited by Amy Brown November 2013
+ *
+ * Variables:
+ * - $id: An optional CSS id to use for the layout.
+ * - $content: An array of content, each item in the array is keyed to one
+ *   panel of the layout. This layout supports the following sections:
+ *   - $content['left']: Content in the left column.
+ *   - $content['right']: Content in the right column.
+ */
+?>
+<div class="wwu-25-percent-left-column" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+	<?php print $content['left']; ?>
+</div>
+
+<div class="wwu-75-percent-right-column" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+	<?php print $content['right']; ?>
+</div>

File layouts/clean-chemistry/clean-chemistry.inc

+<?php
+
+// Plugin definition
+$plugin = array(
+  'title' => t('Clean Chemistry'),
+  'category' => t('Western'),
+  'icon' => 'clean-chemistry.png',
+  'theme' => 'clean-chemistry',
+  'css' => '../../css/panel-layouts/clean-chemistry.css',
+  'regions' => array(
+    'left' => t('Left side'),
+    'right' => t('Right side')
+  ),
+);

File layouts/clean-chemistry/clean-chemistry.png

Added
New image

File layouts/clean-chemistry/clean-chemistry.tpl.php

+<?php
+/**
+ * @file
+ * Template for a 2 column Clean Chemistry panel layout.
+ *
+ * This template provides a two column panel display layout with minimal markup.
+ * Edited by Amy Brown November 2013
+ *
+ * Variables:
+ * - $id: An optional CSS id to use for the layout.
+ * - $content: An array of content, each item in the array is keyed to one
+ *   panel of the layout. This layout supports the following sections:
+ *   - $content['left']: Content in the left column.
+ *   - $content['right']: Content in the right column.
+ */
+?>
+<div class="chemistry-homepage-left-column" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+	<?php print $content['left']; ?>
+</div>
+
+<div class="chemistry-homepage-right-column" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+	<?php print $content['right']; ?>
+</div>

File sass/_base.scss

 @import "zen";              // Add the Zen Grids responsive layout mixins.
 
 @import "custom";           // Import our custom mixins last.
+

File sass/panel-layouts/clean-25-75.scss

+/**
+* These are the layout styles for the clean-chemistry panel.
+*/
+@import "base";
+
+$box-sizing-polyfill-path: "/sites/all/themes/wwuzen/js/boxsizing.htc";
+
+
+$zen-column-count:  12;
+$zen-gutter-width:  30px;
+
+.wwu-25-percent-left-column {
+  @include zen-grid-item(3,1);
+  padding-left:0;
+  padding-right:0;
+}
+
+.wwu-75-percent-right-column {
+  @include zen-grid-item(9,4);
+}
+
+@media all and (max-width: 800px) {
+  .wwu-25-percent-left-column {
+    $zen-column-count:1;
+    @include zen-clear(left);
+    @include zen-grid-item(1,1);
+    padding-left:0;
+    padding-right:0;
+  }
+  .wwu-75-percent-right-column {
+    $zen-column-count:1;
+    @include zen-clear(left);
+    @include zen-grid-item(1,1);
+  }
+}

File sass/panel-layouts/clean-chemistry.scss

+/**
+* These are the layout styles for the clean-chemistry panel.
+*/
+@import "base";
+
+$box-sizing-polyfill-path: "/sites/all/themes/wwuzen/js/boxsizing.htc";
+
+
+$zen-column-count:  12;
+$zen-gutter-width:  30px;
+
+.chemistry-homepage-left-column {
+  @include zen-grid-item(6.5,1);
+}
+
+.chemistry-homepage-right-column {
+  @include zen-grid-item(5.5,7.5);
+}
+
+@media all and (max-width: 360px) {
+  .chemistry-homepage-left-column {
+    $zen-column-count:1;
+    @include zen-clear(left);
+    @include zen-grid-item(1,1);
+  }
+  .chemistry-homepage-right-column {
+    $zen-column-count:1;
+    @include zen-clear(left);
+    @include zen-grid-item(1,1);
+  }
+}
+
+@media all and (min-width:361px) and (max-width: 800px) {
+  .chemistry-homepage-left-column {
+    $zen-column-count:3;
+    @include zen-clear(left);
+    @include zen-grid-item(3,1);
+  }
+  .chemistry-homepage-right-column {
+    $zen-column-count:3;
+    @include zen-clear(left);
+    @include zen-grid-item(3,1);
+  }
+}
+
+#edit-buttons {
+  clear:both;
+}

File sass/panel-layouts/clean-chss.scss

 
 $gray: rgba(151,151,151,1);
 
-.front header#department { display:none; }
+.front .page-title { display:none; }
 
 /*.clean-chss-middle-column {
     background-color: #FFFFFF;
     padding-top: 1em;
   }*/
 
-#content p.callOut {
+main p.callOut {
   color:$wwuLtblue;
   font-size:1.25em;
 }

File sass/panel-layouts/clean-huxley.scss

 $zen-column-count:  12;
 $zen-gutter-width:  30px;
 
-.huxley-homepage #content .huxley-homepage-left-column {
+.huxley-homepage-left-column {
   @include zen-grid-item(6.5,1);
 }
 
-.huxley-homepage #content .huxley-homepage-right-column {
+.huxley-homepage-right-column {
   @include zen-grid-item(5.5,7.5);
   .huxley-homepage-people-and-places {
     @include zen-grid-item(11,1);
 }
 
 @media all and (max-width: 360px) {
-  .huxley-homepage #content {
-    .huxley-homepage-left-column {
-      $zen-column-count:1;
-      @include zen-clear(left);
-      @include zen-grid-item(1,1);
-    }
-    .huxley-homepage-right-column {
-      $zen-column-count:1;
-      @include zen-clear(left);
+  .huxley-homepage-left-column {
+    $zen-column-count:1;
+    @include zen-clear(left);
+    @include zen-grid-item(1,1);
+  }
+  .huxley-homepage-right-column {
+    $zen-column-count:1;
+    @include zen-clear(left);
+    @include zen-grid-item(1,1);
+    .huxley-homepage-people-and-places {
       @include zen-grid-item(1,1);
-      .huxley-homepage-people-and-places {
-        @include zen-grid-item(1,1);
-      }
     }
   }
 }
 
 @media all and (min-width:361px) and (max-width: 800px) {
-  .huxley-homepage #content {
-    .huxley-homepage-left-column {
-      $zen-column-count:3;
-      @include zen-clear(left);
-      @include zen-grid-item(3,1);
-    }
-    .huxley-homepage-right-column {
-      $zen-column-count:3;
-      @include zen-clear(left);
+  .huxley-homepage-left-column {
+    $zen-column-count:3;
+    @include zen-clear(left);
+    @include zen-grid-item(3,1);
+  }
+  .huxley-homepage-right-column {
+    $zen-column-count:3;
+    @include zen-clear(left);
+    @include zen-grid-item(3,1);
+    .huxley-homepage-people-and-places {
       @include zen-grid-item(3,1);
-      .huxley-homepage-people-and-places {
-        @include zen-grid-item(3,1);
-      }
     }
   }
 }
 
 ; To add a Panels layout (which can also be used by Display Suite), uncomment
 ; the line below and see the documentation at: http://drupal.org/node/495654
+
 plugins[panels][layouts] = layouts
+