Blog/event font styles. Blocks link if given url

Font styles were too large in some places and too small in others
due to the utilization of ingram-wide-2 in the Member area, which
requires 18px size in the body to be presentable in some places.
This rule throws off styles that are still using "Open Sans", as
18px is quite large.

Also added a statement to ensure that blocks only have a Read More
link if they are given a url.

diff --git a/css/app.css b/css/app.css
index a5d89e3..53d424c 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -6695,6 +6695,9 @@ a[href^=tel] {
   color: inherit;
   text-decoration: none; }
 
+body {
+  font-family: "ingram-wide-2"; }
+
 header#page-header {
   height: 210px;
   font-family: "ingram-wide-2";
@@ -7606,6 +7609,20 @@ h2#slide-text {
 #glm-event-wrapper #EventDrivingDirectionSubmit {
   margin-left: 0px; }
 
+.glm-event-day-event {
+  font-family: "ingram-wide-2"; }
+  .glm-event-day-event .agenda-event-name {
+    font-size: 18px; }
+  .glm-event-day-event .event-content {
+    font-family: "ingram-wide-2";
+    font-size: 16px; }
+
+#glm-event-wrapper input:not([type]), #glm-event-wrapper input[type="text"], #glm-event-wrapper input[type="password"], #glm-event-wrapper input[type="date"], #glm-event-wrapper input[type="datetime"], #glm-event-wrapper input[type="datetime-local"], #glm-event-wrapper input[type="month"], #glm-event-wrapper input[type="week"], #glm-event-wrapper input[type="email"], #glm-event-wrapper input[type="number"], #glm-event-wrapper input[type="search"], #glm-event-wrapper input[type="tel"], #glm-event-wrapper input[type="time"], #glm-event-wrapper input[type="url"], #glm-event-wrapper input[type="color"], #glm-event-wrapper textarea, #glm-event-wrapper select {
+  font-size: 14px; }
+
+.ui-datepicker-calendar {
+  font-size: 14px; }
+
 #glm-member-detail-packages-container .package-title a {
   color: #1479b0; }
 
@@ -7635,6 +7652,14 @@ body #glm-member-password-lost-link {
   margin-top: 40px; }
 body #glm-member-password-lost-form {
   display: none; }
+body #glm-member-list-filters-box select, body #glm-member-list-filters-box .glm-form-text-input {
+  font-size: 12px; }
+body .glm-member-db-list {
+  font-family: "ingram-wide-2"; }
+  body .glm-member-db-list h1, body .glm-member-db-list h2, body .glm-member-db-list h3, body .glm-member-db-list h4, body .glm-member-db-list h5, body .glm-member-db-list h6 {
+    font-family: "ingram-wide-2"; }
+body #menu-side, body #side-links, body .glm-button, body .glm-member-db-list .glm-member-list-active-info {
+  font-family: "ingram-wide-2"; }
 body .glm-member-db-list-view #glm-member-list-map-toggle {
   background-color: #434343; }
 body .glm-member-db-list-view .glm-alpha-link-selected {

diff --git a/glm-members-only-template.php b/glm-members-only-template.php
index 3fd5bbd..d7d1ebc 100644 (file)
--- a/glm-members-only-template.php
+++ b/glm-members-only-template.php
@@ -31,6 +31,7 @@ Template Name: GLM Members Only Template
                     <br>
                     <?php if (get_the_ID() == get_option("glm_members_database_option_members_only_id")) {?>
                         <?php get_template_part('parts/glm-members-only-blog-feed'); ?>
+                        <br><br>
                         <?php wp_reset_query(); ?>
                         <?php if(function_exists('fetch_all_glm_blocks')) { ?>
                             <div class="row">

diff --git a/parts/glm-blocks-front.php b/parts/glm-blocks-front.php
index 19f8637..dd640ba 100644 (file)
--- a/parts/glm-blocks-front.php
+++ b/parts/glm-blocks-front.php
@@ -15,14 +15,16 @@
             <?php endif;?>
         <div class="block-text" data-equalizer-watch="">
             <?php if($block->url):?>
-            <a class="title-posts" href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
+                <a class="title-posts" href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
+                <?php endif;?>
+                    <h3><?php echo $block->post_title;?></h3>
+                <?php if($block->url):?>
+                </a>
             <?php endif;?>
-                <h3><?php echo $block->post_title;?></h3>
-            <?php if($block->url):?>
-            </a>
-             <?php endif;?>
             <p><?php echo $block->post_content . $block->post_excerpt;?></p>
-            <a class="block-readmore" href="<?php echo $block->url;?>">Learn More <span class="block-more-arrow-right"></span></a>
+            <?php if($block->url):?>
+                <a class="block-readmore" href="<?php echo $block->url;?>">Learn More <span class="block-more-arrow-right"></span></a>
+            <?php endif;?>
         </div>
 
     </div>

diff --git a/parts/glm-blocks-members-only.php b/parts/glm-blocks-members-only.php
index 2d3674c..1f93d08 100644 (file)
--- a/parts/glm-blocks-members-only.php
+++ b/parts/glm-blocks-members-only.php
@@ -4,25 +4,33 @@
 <div class="blocks" data-equalizer="">
     <?php foreach ($blocks as $block):?>
     <div class="text-center small-10 small-centered medium-uncentered medium-6 columns large-text-left block">
-            <?php if($block->url):?>
+        <?php if($block->url):?>
             <a href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?> >
-            <?php endif;?>
-            <div class="block-thumb-wrap">
-                <?php $thumb = get_the_post_thumbnail($block->ID, 'glm-blocks'); echo $thumb; ?>
-            </div>
-            <?php if($block->url):?>
+        <?php endif;?>
+
+        <div class="block-thumb-wrap">
+            <?php $thumb = get_the_post_thumbnail($block->ID, 'glm-blocks'); echo $thumb; ?>
+        </div>
+
+        <?php if($block->url):?>
             </a>
-            <?php endif;?>
+        <?php endif;?>
         <div class="block-text" data-equalizer-watch="">
+
             <?php if($block->url):?>
-            <a class="title-posts" href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
+                <a class="title-posts" href="<?php echo $block->url;?>"<?php if($block->externalUrl){echo ' target="_blank"';}?>>
             <?php endif;?>
+
                 <h3><?php echo $block->post_title;?></h3>
+
             <?php if($block->url):?>
-            </a>
-             <?php endif;?>
+                </a>
+            <?php endif;?>
+
             <p><?php echo $block->post_content . $block->post_excerpt;?></p>
-            <a class="block-readmore" href="<?php echo $block->url;?>">Learn More <span class="block-more-arrow-right"></span></a>
+            <?php if($block->url):?>
+                <a class="block-readmore" href="<?php echo $block->url;?>">Learn More <span class="block-more-arrow-right"></span></a>
+            <?php endif;?>
         </div>
 
     </div>

diff --git a/scss/_body.scss b/scss/_body.scss
index 5d0f3c9..40486b8 100644 (file)
--- a/scss/_body.scss
+++ b/scss/_body.scss
@@ -8,8 +8,9 @@ body {
 //        -ms-box-shadow: 0 0 15px -6px $black;
 //        -moz-box-shadow: 0 0 15px -6px $black;
 //        -webkit-box-shadow: 0 0 15px -6px $black;
-//        
+//
 //        max-width: 1000px;
 //        padding-top: rem-calc(20);
 //    }
+    font-family: "ingram-wide-2";
 }

diff --git a/scss/plugins/_glm-member-db-events.scss b/scss/plugins/_glm-member-db-events.scss
index 4639f81..efe50fe 100644 (file)
--- a/scss/plugins/_glm-member-db-events.scss
+++ b/scss/plugins/_glm-member-db-events.scss
@@ -138,4 +138,22 @@ span#eventShare.st_sharethis,
     #EventDrivingDirectionSubmit {
         margin-left: 0px;
     }
-}
\ No newline at end of file
+}
+.glm-event-day-event {
+    font-family: "ingram-wide-2";
+    .agenda-event-name {
+        font-size: 18px;
+    }
+    .event-content {
+        font-family: "ingram-wide-2";
+        font-size: 16px;
+    }
+}
+#glm-event-wrapper {
+    input:not([type]), input[type="text"], input[type="password"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="month"], input[type="week"], input[type="email"], input[type="number"], input[type="search"], input[type="tel"], input[type="time"], input[type="url"], input[type="color"], textarea, select {
+        font-size: 14px;
+    }
+}
+.ui-datepicker-calendar {
+    font-size: 14px;
+}

diff --git a/scss/plugins/_glm-member-db.scss b/scss/plugins/_glm-member-db.scss
index 2199c9f..2786b2e 100644 (file)
--- a/scss/plugins/_glm-member-db.scss
+++ b/scss/plugins/_glm-member-db.scss
@@ -34,6 +34,24 @@ body {
 #glm-member-password-lost-form {
     display: none;
 }
+#glm-member-list-filters-box {
+    select,
+    .glm-form-text-input {
+        font-size: 12px;
+    }
+}
+.glm-member-db-list {
+    font-family: "ingram-wide-2";
+    h1, h2, h3, h4, h5, h6 {
+        font-family: "ingram-wide-2";
+    }
+}
+#menu-side,
+#side-links,
+.glm-button,
+.glm-member-db-list .glm-member-list-active-info {
+    font-family: "ingram-wide-2";
+}
 // 2.0 Member List
 
 .glm-member-db-list-view {