1. wwuweb
  2. Untitled project
  3. wwuzen

Commits

Max Bronsema  committed c58d5ba Merge

Merged in 7.x-dev (pull request #58)

1.3.1 update

  • Participants
  • Parent commits c217fcf, bdedc8a
  • Branches 7.x-dev
  • Tags v1.3.0

Comments (0)

Files changed (10)

File layouts/25-50-25/25-50-25.inc

View file
+<?php
+
+// Plugin definition
+$plugin = array(
+  'title' => t('25/50/25'),
+  'category' => t('Western'),
+  'icon' => '25-50-25.png',
+  'theme' => '25-50-25',
+  'css' => '../../css/panel-layouts/25-50-25.css',
+  'regions' => array(
+    'left' => t('25% Left Column'),
+    'middle' => t('50% Middle Column'),
+    'right' => t('25% Right Column')
+  ),
+);

File layouts/25-50-25/25-50-25.png

Added
New image

File layouts/25-50-25/25-50-25.tpl.php

View file
+<?php
+/**
+ * @file
+ * Template for a three-column layout with 25-50-25 width percentages.
+ *
+ * This template provides a three-column panel display layout with minimal markup.
+ * Created by Nigel Packer April 2014
+ */
+?>
+<div class="layout-25-50-25 container-25-50-25" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  <div class="layout-25-50-25 left-column-25-50-25" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  	<?php print $content['left']; ?>
+  </div>
+
+  <div class="layout-25-50-25 middle-column-25-50-25" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  	<?php print $content['middle']; ?>
+  </div>
+
+  <div class="layout-25-50-25 right-column-25-50-25" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  	<?php print $content['right']; ?>
+  </div>
+</div>

File layouts/clean-cst/clean-cst.inc

View file
+<?php
+
+// Plugin definition
+$plugin = array(
+  'title' => t('Clean CST'),
+  'category' => t('Western'),
+  'icon' => 'clean-cst.png',
+  'theme' => 'clean-cst',
+  'css' => '../../css/panel-layouts/clean-cst.css',
+  'regions' => array(
+    'top' => t('Top'),
+    'middle_left' => t('Middle Left'),
+    'middle_center' => t('Middle Center'),
+    'middle_right' => t('Middle Right')
+  ),
+);

File layouts/clean-cst/clean-cst.png

Added
New image

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

View file
+<?php
+/**
+ * @file
+ * Template for a Clean CST panel layout.
+ *
+ * This template provides a single top row with three columns below that top row.
+ *
+ *
+ * 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.
+ */
+?>
+
+<div class="clean-cst-top" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+	<?php print $content['top']; ?>
+</div>
+
+<div class="clean-cst-middle-left" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  <?php print $content['middle_left']; ?>
+</div>
+
+<div class="clean-cst-middle-center" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  <?php print $content['middle_center']; ?>
+</div>
+
+<div class="clean-cst-middle-right" <?php if (!empty($css_id)) { print "id=\"$css_id\""; } ?>>
+  <?php print $content['middle_right']; ?>
+</div>

File sass/_accordion.scss

View file
   line-height: 1.5;
 }
 
+.ui-accordion .ui-accordion-header {
+    padding: 0;
+}
+
 //Accordion Item/Entry = Row
 
 .ui-accordion .accordion-row {

File sass/layouts/responsive-sidebars.scss

View file
 
   .footer-left {
     @include zen-grid-item(1.5,1);
-    padding-left:1em;
      }
   .footer-center {
-    @include zen-grid-item(1.5,2.4);
+    @include zen-grid-item(1.5,2.5);
     ul.menu {
       padding:0 2em 0 0;
       margin:.5em 0;

File sass/panel-layouts/25-50-25.scss

View file
+/**
+* These are the layout styles for the 25-50-25 panel layout
+*/
+@import "base";
+
+$box-sizing-polyfill-path: "/sites/all/themes/wwuzen/js/boxsizing.htc";
+$display-small: 320px;
+$display-medium: 700px;
+$display-large: 900px;
+
+@media all and (min-width: 0) {
+    .container-25-50-25 {
+        @include zen-grid-container();
+        $zen-column-count: 1;
+        $zen-gutter-width: 0;
+        
+        .layout-25-50-25 {
+            @include zen-grid-item(1, 1);
+            @include zen-clear();
+        }
+    }
+}
+
+@media all and (min-width: $display-small) {
+   
+}
+
+@media all and (min-width: $display-medium) {
+    .container-25-50-25 {
+      $zen-column-count: 3;
+      $zen-gutter-width: 1.5em;
+      
+      .layout-25-50-25 {
+        @include zen-clear(none);
+      }
+      
+      .left-column-25-50-25 {
+        @include zen-grid-item(1, 1);
+      }
+      
+      .middle-column-25-50-25 {
+        @include zen-grid-item(2, 2);
+      }
+      
+      .right-column-25-50-25 {
+        @include zen-grid-item(2, 2);
+        @include zen-clear();
+      }
+    }
+}
+
+@media all and (min-width: $display-large) {
+    .container-25-50-25 {
+        $zen-column-count: 4;
+        $zen-gutter-width: 1.5em;
+        
+        .layout-25-50-25 {
+          @include zen-clear(none);
+        }
+        
+        .left-column-25-50-25 {
+            @include zen-grid-item(1, 1); 
+        }
+        
+        .middle-column-25-50-25 {
+            @include zen-grid-item(2, 2);
+        }
+        
+        .right-column-25-50-25 {
+            @include zen-grid-item(1, 4);
+        }
+    }
+}

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

View file
+/**
+* These are the layout styles for the clean-cst panel.
+*/
+@import "base";
+@import "compass";
+@import "zen";
+
+$box-sizing-polyfill-path: "/sites/all/themes/wwuzen/js/boxsizing.htc";
+
+$zen-column-count:  12;
+$zen-gutter-width:  1.25em;
+$zen-auto-include-item-base: false;
+
+$gray: rgba(151,151,151,1);
+
+.front .page-title { display:none; }
+
+
+main p.callOut {
+  color:$wwuLtblue;
+  font-size:1.25em;
+}
+
+
+/* ****************************************************
+                Small-size -> 550px
+**************************************************** */
+
+@media all and (max-width:550px) {
+  $zen-column-count: 1;
+
+  .clean-cst-top,
+  .clean-cst-middle-left,
+  .clean-cst-middle-center,
+  .clean-cst-middle-right {
+    @include zen-grid-item(1,1);
+    @include zen-clear();
+    margin:0 auto;
+    display:block;
+  }
+
+  // Center aligns images until they are turned into straight CSS
+  .clean-cst-top,
+  .clean-cst-middle-left,
+  .clean-cst-middle-center,
+  .clean-cst-middle-right {
+      text-align:center;
+  }
+}
+
+
+/* ****************************************************
+            Medium-size 551px <-> 800px
+**************************************************** */
+
+@media all and (min-width: 551px) and (max-width: 800px) {
+  $zen-column-count: 3;
+
+  .clean-cst-top {
+    @include zen-grid-item(3,1);
+    @include zen-float(none);
+  }
+
+  .clean-cst-middle-left { // Dean's Lecture Series
+    @include zen-grid-item(.9,1);
+  }
+
+  .clean-cst-middle-center { // Slideshow
+    @include zen-grid-item(.9,2);
+  }
+  .clean-cst-middle-right { // About the college
+    @include zen-grid-item(.9,3);
+  }
+
+}
+
+/* ****************************************************
+                Screen 801px ->
+**************************************************** */
+
+@media all and (min-width:801px) {
+  $zen-column-count: 12;
+
+  .clean-cst-top { // Intro text
+    @include zen-grid-item(12,1);
+  }
+  .clean-cst-middle-left { // Dean's Lecture Series
+    @include zen-grid-item(3.8,1);
+    @include zen-clear(both);
+  }
+  .clean-cst-middle-center { // Slideshow
+    @include zen-grid-item(3.8,5);
+  }
+  .clean-cst-middle-right { // About the college
+    @include zen-grid-item(3.9,9);
+  }
+}
+
+// /////////////////////////////////////////////
+//        Styling for panel editor view
+
+#page-manager-edit {
+  .clean-cst-top,
+  .clean-cst-middle-left,
+  .clean-cst-middle-center,
+  .clean-cst-middle-right,
+  .clean-cst-bottom-left,
+  .clean-cst-bottom-right {
+    display:inline-block;
+  }
+  .clean-cst-top {
+    width:100%;
+  }
+
+  .clean-cst-middle-left {
+    margin:1% .5% 1% 0;
+    width:33%;
+  }
+
+  .clean-cst-middle-center {
+    margin:1% .5% 1% 0;
+    width:33%;
+  }
+
+  .clean-cst-middle-right {
+    margin:1% 0 1% 0;
+    width:33%;
+  }
+
+}
+#edit-buttons {
+  clear:both;
+  width:100%;
+}