projects / WP-Themes / glmthemes / universitycenter-theme.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 62f4844)
Bottom sections now show up by default.
authorLaury GvR <laury@gaslightmedia.com>
Wed, 16 Nov 2016 19:26:51 +0000 (14:26 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 16 Nov 2016 19:26:51 +0000 (14:26 -0500)
bottom-sections.php [deleted file] patch | blob | history
parts/main-content.php patch | blob | history
scss/_page.header.scss patch | blob | history
scss/_search.scss patch | blob | history
scss/plugins/_acf.scss patch | blob | history
sections/interior-page.php patch | blob | history

diff --git a/bottom-sections.php b/bottom-sections.php
deleted file mode 100644 (file)
index 7553a92..0000000
--- a/bottom-sections.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/*
-Template Name: Bottom Sections
-*/
-?>
-<!doctype html>
-<html class="no-js" lang="en">
-    <?php get_template_part("parts/header-meta"); ?>
-    <?php $index_template = true;?>
-    <body>
-        <div class="off-canvas-wrap" data-offcanvas>
-            <div class="inner-wrap">
-                <div id="page-wrapper">
-                    <?php
-                    include "sections/header.php";
-                    include "sections/off-canvas.php";
-                    include "sections/interior-page.php";
-                    include "sections/footer.php";
-                    include "sections/copyright.php";
-                    ?>
-                </div><!--/#page-wrapper-->
-            <a class="exit-off-canvas"></a>
-            </div><!--End of inner-wrap-->
-        </div><!--End of off-canvas-->
-        <?php wp_footer();?>
-        <script charset="utf-8" type="text/javascript">var switchTo5x=true;</script>
-        <script charset="utf-8" type="text/javascript" src="http://w.sharethis.com/button/buttons.js"></script>
-        <script charset="utf-8" type="text/javascript">stLight.options({"publisher":"wp.c3d3647e-de70-4780-b71d-6b739fad685a"});var st_type="wordpress4.3.1";</script>
-    </body>
-</html>
\ No newline at end of file
diff --git a/parts/main-content.php b/parts/main-content.php
index 529fa84..a5fa520 100644 (file)
--- a/parts/main-content.php
+++ b/parts/main-content.php
@@ -1,4 +1,4 @@
-        <?php if (is_page_template('bottom-sections.php')) { ?>
+        <?php if (!is_page_template('no-bottom-sections.php')) { ?>
             <div id="main-content" class="small-12 medium-8 columns" data-equalizer-watch>
         <?php } else { ?>
             <div id="main-content" class="small-12 medium-8 columns">
diff --git a/scss/_page.header.scss b/scss/_page.header.scss
index 5f9ef13..3827348 100644 (file)
--- a/scss/_page.header.scss
+++ b/scss/_page.header.scss
@@ -207,6 +207,7 @@ input.header-search-input{
     border-right: 10px solid #007697;
     border-bottom: 10px solid #007697;
     border-top: 1px solid #007697;
+    padding: 0 0.5rem;
 }
 form.header-searchform{
 //    position: relative;
diff --git a/scss/_search.scss b/scss/_search.scss
index e8062c5..9ea745b 100644 (file)
--- a/scss/_search.scss
+++ b/scss/_search.scss
@@ -1,53 +1,53 @@
 .search-top {
-        #searchform {
-            text-align: left;
-            display: inline-block;
-            position: relative;
-            #search-button {
-                width: 22px;
-                right: 0px;
-                position: absolute;
-                padding: 0;
-                border: 1px solid lightgray;
-            }
-        }
-        input {
-            height: 20px;
-            width: 167px;
-            padding: 0 8px;
-            margin: 13px 0px 0px 18px;
-            border-radius: 3px;
-            font-size: 10px;
-            color: $black;
-            display: inline-block;
+    #searchform {
+        text-align: left;
+        display: inline-block;
+        position: relative;
+        #search-button {
+            width: 22px;
+            right: 0px;
+            position: absolute;
+            padding: 0;
+            border: 1px solid lightgray;
         }
-        a {
-            &.magnifying-glass {
-                font-size: 10em; /* This controls the size. */ 
-                width: rem-calc(12); 
-                height: rem-calc(12);
-                border: rem-calc(2) solid darkblue; 
-                position: absolute;
-                top: 15px;
-                border-radius: 0.35em;
-                margin: 0 0 0 -20px;
-                &:before {
-                    content: ""; 
-                    display: inline-block; 
-                    position: absolute; 
-                    right: rem-calc(-7); 
-                    bottom: rem-calc(-4); 
-                    border-width: 0; 
-                    background: darkblue; 
-                    width: rem-calc(8); 
-                    height: rem-calc(2); 
-                    -webkit-transform: rotate(45deg); 
-                    -moz-transform: rotate(45deg);
-                    -ms-transform: rotate(45deg);
-                    transform: rotate(45deg);
-                }
+    }
+    input {
+        height: 20px;
+        width: 167px;
+        padding: 0 8px;
+        margin: 13px 0px 0px 18px;
+        border-radius: 3px;
+        font-size: 10px;
+        color: $black;
+        display: inline-block;
+    }
+    a {
+        &.magnifying-glass {
+            font-size: 10em; /* This controls the size. */ 
+            width: rem-calc(12); 
+            height: rem-calc(12);
+            border: rem-calc(2) solid darkblue; 
+            position: absolute;
+            top: 15px;
+            border-radius: 0.35em;
+            margin: 0 0 0 -20px;
+            &:before {
+                content: ""; 
+                display: inline-block; 
+                position: absolute; 
+                right: rem-calc(-7); 
+                bottom: rem-calc(-4); 
+                border-width: 0; 
+                background: darkblue; 
+                width: rem-calc(8); 
+                height: rem-calc(2); 
+                -webkit-transform: rotate(45deg); 
+                -moz-transform: rotate(45deg);
+                -ms-transform: rotate(45deg);
+                transform: rotate(45deg);
             }
         }
+    }
 }
 #blog-posts-over .search-result-container{
     header.entry-header{
diff --git a/scss/plugins/_acf.scss b/scss/plugins/_acf.scss
index a11dc50..56fd5df 100644 (file)
--- a/scss/plugins/_acf.scss
+++ b/scss/plugins/_acf.scss
@@ -1,18 +1,18 @@
 #content-wrapper {
-    #glm-acf-first {
+    .glm-acf-field:first-of-type {
         background-color: $alt-blue;
         .glm-acf-text {
             color: white;
         }
-        .glm-acf-text h2 {
+        .glm-acf-text h1,h2,h3,h4,h5,h6 {
             color: $yellow;
         }
     }
-    #glm-acf-second {
+    .glm-acf-field:nth-of-type(2) {   
         .glm-acf-text {
             color: black;
         }
-        .glm-acf-text h2 {
+        .glm-acf-text h1,h2,h3,h4,h5,h6 {
             color: $d-blue;
         }
     }
diff --git a/sections/interior-page.php b/sections/interior-page.php
index 73b7af2..815ca31 100644 (file)
--- a/sections/interior-page.php
+++ b/sections/interior-page.php
@@ -39,7 +39,7 @@
                                 </div>
                             </div>
                             
-                            <?php if (is_page_template('bottom-sections.php')) { ?>
+                            <?php if (!is_page_template('no-bottom-sections.php')) { ?>
                                 <?php if (get_field('glm-acf-first-text')) { ?>
                                     <div id="glm-acf-first" class="glm-acf-field row">
                                         <div class="glm-acf-text small-12 columns">