adding new fonts, colors, search graphic, logo. testing on dev site

diff --git a/assets/fonts/Comfortaa-Bold.ttf b/assets/fonts/Comfortaa-Bold.ttf
new file mode 100755 (executable)
index 0000000..ec3eadf
Binary files /dev/null and b/assets/fonts/Comfortaa-Bold.ttf differ

diff --git a/assets/fonts/Comfortaa-Light.ttf b/assets/fonts/Comfortaa-Light.ttf
new file mode 100755 (executable)
index 0000000..dea4cec
Binary files /dev/null and b/assets/fonts/Comfortaa-Light.ttf differ

diff --git a/assets/fonts/Comfortaa-Regular.ttf b/assets/fonts/Comfortaa-Regular.ttf
new file mode 100755 (executable)
index 0000000..5e81491
Binary files /dev/null and b/assets/fonts/Comfortaa-Regular.ttf differ

diff --git a/assets/fonts/caveat-bold.ttf b/assets/fonts/caveat-bold.ttf
new file mode 100755 (executable)
index 0000000..ca27a36
Binary files /dev/null and b/assets/fonts/caveat-bold.ttf differ

diff --git a/assets/fonts/caveat-regular.ttf b/assets/fonts/caveat-regular.ttf
new file mode 100755 (executable)
index 0000000..a11f865
Binary files /dev/null and b/assets/fonts/caveat-regular.ttf differ

diff --git a/assets/fonts/caveatbrush-regular.ttf b/assets/fonts/caveatbrush-regular.ttf
new file mode 100755 (executable)
index 0000000..fa60b56
Binary files /dev/null and b/assets/fonts/caveatbrush-regular.ttf differ

diff --git a/assets/logo-color.png b/assets/logo-color.png
new file mode 100755 (executable)
index 0000000..52ed853
Binary files /dev/null and b/assets/logo-color.png differ

diff --git a/assets/logo_white.png b/assets/logo_white.png
new file mode 100755 (executable)
index 0000000..bed20cd
Binary files /dev/null and b/assets/logo_white.png differ

diff --git a/assets/meet-here-white.png b/assets/meet-here-white.png
new file mode 100755 (executable)
index 0000000..c9b0238
Binary files /dev/null and b/assets/meet-here-white.png differ

diff --git a/assets/meet-here.png b/assets/meet-here.png
new file mode 100755 (executable)
index 0000000..4ed6a54
Binary files /dev/null and b/assets/meet-here.png differ

diff --git a/assets/search_icon.png b/assets/search_icon.png
index a03f367..0047ab6 100644 (file)
Binary files a/assets/search_icon.png and b/assets/search_icon.png differ

diff --git a/css/app.css b/css/app.css
index 78cc0db..40132c2 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -1566,12 +1566,12 @@ button, .button {
   display: inline-block;
   padding: 1rem 2rem 1.0625rem 2rem;
   font-size: 1rem;
-  background-color: #ffc742;
-  border-color: #ffc742;
+  background-color: #E6E125;
+  border-color: #E6E125;
   color: #FFFFFF;
   transition: background-color 300ms ease-out; }
   button:hover, button:focus, .button:hover, .button:focus {
-    background-color: #ffc742; }
+    background-color: #E6E125; }
   button:hover, button:focus, .button:hover, .button:focus {
     color: #FFFFFF; }
   button.secondary, .button.secondary {
@@ -1642,18 +1642,18 @@ button, .button {
   button.round, .button.round {
     border-radius: 1000px; }
   button.disabled, button[disabled], .button.disabled, .button[disabled] {
-    background-color: #ffc742;
-    border-color: #ffc742;
+    background-color: #E6E125;
+    border-color: #E6E125;
     color: #FFFFFF;
     box-shadow: none;
     cursor: default;
     opacity: 0.7; }
     button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus {
-      background-color: #ffc742; }
+      background-color: #E6E125; }
     button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus {
       color: #FFFFFF; }
     button.disabled:hover, button.disabled:focus, button[disabled]:hover, button[disabled]:focus, .button.disabled:hover, .button.disabled:focus, .button[disabled]:hover, .button[disabled]:focus {
-      background-color: #ffc742; }
+      background-color: #E6E125; }
     button.disabled.secondary, button[disabled].secondary, .button.disabled.secondary, .button[disabled].secondary {
       background-color: #e7e7e7;
       border-color: #b9b9b9;
@@ -4730,12 +4730,12 @@ meta.foundation-mq-topbar {
     .top-bar-section ul li:hover:not(.has-form) > a {
       background-color: #1479b0;
       color: #FFFFFF;
-      background: #1479b0; }
+      background: #16345B; }
     .top-bar-section ul li.active > a {
       background: transparent;
       color: #FFFFFF; }
       .top-bar-section ul li.active > a:hover {
-        background: #0078a0;
+        background: #16345B;
         color: #FFFFFF; }
   .top-bar-section .has-form {
     padding: 0.8333333333rem; }
@@ -4850,7 +4850,7 @@ meta.foundation-mq-topbar {
           display: none; }
     .top-bar-section li.hover > a:not(.button) {
       background-color: #1479b0;
-      background: #1479b0;
+      background: #16345B;
       color: #FFFFFF; }
     .top-bar-section li:not(.has-form) a:not(.button) {
       background: transparent;
@@ -4858,14 +4858,14 @@ meta.foundation-mq-topbar {
       padding: 0 0.8333333333rem; }
       .top-bar-section li:not(.has-form) a:not(.button):hover {
         background-color: #1479b0;
-        background: #1479b0; }
+        background: #16345B; }
     .top-bar-section li.active:not(.has-form) a:not(.button) {
       background: transparent;
       color: #FFFFFF;
       line-height: 2.5rem;
       padding: 0 0.8333333333rem; }
       .top-bar-section li.active:not(.has-form) a:not(.button):hover {
-        background: #0078a0;
+        background: #16345B;
         color: #FFFFFF; }
     .top-bar-section .has-dropdown.moved {
       position: relative; }
@@ -4913,7 +4913,7 @@ meta.foundation-mq-topbar {
         color: #000000; }
       .top-bar-section .dropdown li:not(.has-form):not(.active):hover > a:not(.button) {
         background-color: #1479b0;
-        color: #1479b0;
+        color: #16345B;
         background: transparent; }
       .top-bar-section .dropdown li label {
         background: #333333;
@@ -4945,7 +4945,7 @@ meta.foundation-mq-topbar {
 
   .no-js .top-bar-section ul li:hover > a {
     background-color: #1479b0;
-    background: #1479b0;
+    background: #16345B;
     color: #FFFFFF; }
   .no-js .top-bar-section ul li:active > a {
     background: transparent;
@@ -6429,6 +6429,42 @@ th.hide-for-touch {
     display: table-cell !important; }
  }
 
+@font-face {
+  font-family: 'Comfortaa';
+  src: url('../assets/fonts/Comfortaa-Bold.ttf'); }
+
+#example.element {
+  background-color: transparent; }
+
+h1 {
+  font-family: "Comfortaa";
+  color: #16345B; }
+
+h2 {
+  font-family: "Comfortaa";
+  color: #54BB54; }
+
+h3 {
+  font-family: "Comfortaa";
+  color: #16345B; }
+
+h4 {
+  font-family: "Comfortaa";
+  color: #16345B; }
+
+h5 {
+  font-family: "Comfortaa";
+  color: #54BB54; }
+
+h6 {
+  font-family: "Comfortaa";
+  color: #434343;
+  font-size: 18px; }
+
+p {
+  font-family: "Open Sans", sans-serif;
+  font-size: 16px; }
+
 /* 
     Created on : Mar 5, 2015, 2:57:35 PM
     Author     : laury
@@ -6681,14 +6717,14 @@ h1, h2, h3, h4, h5, h6 {
     display: inline-block;
     padding: 1rem 2rem 1.0625rem 2rem;
     font-size: 1rem;
-    background-color: #ffc742;
-    border-color: #ffc742;
+    background-color: #E6E125;
+    border-color: #E6E125;
     color: #FFFFFF;
     transition: background-color 300ms ease-out;
     display: block;
     margin: 0 auto; }
     .ninja-forms-form-wrap input[type=submit]:hover, .ninja-forms-form-wrap input[type=submit]:focus {
-      background-color: #ffc742; }
+      background-color: #E6E125; }
     .ninja-forms-form-wrap input[type=submit]:hover, .ninja-forms-form-wrap input[type=submit]:focus {
       color: #FFFFFF; }
 
@@ -6718,21 +6754,20 @@ header#page-header {
     position: relative; }
     header#page-header #top #logo {
       position: absolute;
-      left: 33%; }
+      left: 24%; }
       @media only screen and (min-width:40em) and (max-width:64em) {
         header#page-header #top #logo {
           left: 18%; } }
       header#page-header #top #logo img {
         display: inline-block;
-        padding-top: 22px;
+        padding-top: 10px;
         margin: 0 auto; }
         @media (max-width: 1055px) {
           header#page-header #top #logo img {
             padding-top: 50px; } }
     header#page-header #top .meet-here {
       position: absolute;
-      left: 0;
-      text-align: center; }
+      left: 0; }
       header#page-header #top .meet-here a {
         color: white;
         text-decoration: underline; }
@@ -7412,14 +7447,14 @@ h2#slide-text {
     display: inline-block;
     padding: 1rem 2rem 1.0625rem 2rem;
     font-size: 1rem;
-    background-color: #ffc742;
-    border-color: #ffc742;
+    background-color: #E6E125;
+    border-color: #E6E125;
     color: #FFFFFF;
     transition: background-color 300ms ease-out;
     display: block;
     margin: 0 auto; }
     .ninja-forms-form-wrap input[type=submit]:hover, .ninja-forms-form-wrap input[type=submit]:focus {
-      background-color: #ffc742; }
+      background-color: #E6E125; }
     .ninja-forms-form-wrap input[type=submit]:hover, .ninja-forms-form-wrap input[type=submit]:focus {
       color: #FFFFFF; }
 
@@ -8390,16 +8425,6 @@ img#orb-foot {
     #footer_address span.bullet, #copyright span.bullet {
       display: none !important; } }
 
-#example.element {
-  background-color: transparent; }
-
-h1 {
-  font-family: "Kaushan Script";
-  color: #1479b0; }
-
-h2 {
-  color: #1479b0; }
-
 /* for the mobile menu */
 @media (max-width: 1055px) {
   aside.left-off-canvas-menu {
@@ -8599,3 +8624,23 @@ td.gfield_list_cell.gfield_list_56_cell1, td.gfield_list_cell.gfield_list_57_cel
     display: inline-block !important; }
 
  }
+
+body .meet-here-logo {
+  max-width: 120px; }
+body .oc-meet-here-logo {
+  max-width: 100px; }
+body #reservation {
+  background: #54BB54; }
+body main.page-front #content-wrapper .blocks .block-text {
+  background: #16345B; }
+  body main.page-front #content-wrapper .blocks .block-text .block-readmore {
+    color: #E6E125; }
+body .header-logo {
+  max-width: 415px;
+  width: 100%; }
+body footer#main {
+  background: #54BB54; }
+  body footer#main #menu-footer a:hover {
+    color: #16345B; }
+body .footer-logo {
+  max-width: 300px; }

diff --git a/header.php b/header.php
index 7885b65..c7efe6d 100644 (file)
--- a/header.php
+++ b/header.php
@@ -65,11 +65,13 @@ Note 2: 'Nb cols' parameter for Bootstrap only.
                     <header id="page-header">
 
                         <div id="top" class="row collapse">
-                            <div class="large-4 columns show-for-large-up meet-here">
-                                <a href="<?php echo get_permalink(12367);?>">Meet Here</a>
+                            <div class="large-3 columns show-for-large-up meet-here">
+                                <a href="<?php echo get_permalink(12367);?>">
+                                    <img class="meet-here-logo" src="<?php echo get_stylesheet_directory_uri(); ?>/assets/meet-here.png" alt="">
+                                </a>
                             </div>
-                            <div id="logo" class="medium-8 large-4 columns show-for-medium-up text-center">
-                                <a href="<?php bloginfo('url'); ?>"><img class="text-center" alt="Mount Pleasant logo" src="<?php bloginfo('template_url'); ?>/assets/mt-pleasant-pure-mi-logo.png"></a>
+                            <div id="logo" class="medium-8 large-5 columns show-for-medium-up text-center">
+                                <a href="<?php bloginfo('url'); ?>"><img class="text-center header-logo" alt="Mount Pleasant logo" src="<?php bloginfo('template_url'); ?>/assets/logo-color.png"></a>
                             </div>
                             <div class="search-top medium-4 columns show-for-medium-up">
                                 <?php get_template_part('parts/search');?>
@@ -83,7 +85,7 @@ Note 2: 'Nb cols' parameter for Bootstrap only.
                             </div>
                         </div>
                         <?php get_template_part('parts/top-bar');?>
-                        <a id="sm-logo" class="show-for-small-down text-center" href="<?php bloginfo('url'); ?>"><img alt="Mount Pleasant logo" src="<?php bloginfo('template_url'); ?>/assets/mt-pleasant-pure-mi-logo.png"></a>
+                        <a id="sm-logo" class="show-for-small-down text-center" href="<?php bloginfo('url'); ?>"><img class="header-logo" alt="Mount Pleasant logo" src="<?php bloginfo('template_url'); ?>/assets/logo-color.png"></a>
                         <?php if (get_page_template_slug( $post->ID ) == "page-golf-template.php") { ?>
                         <div id="golf-logo-img" class="row collapse">
                             <div class="small-12 text-center columns">

diff --git a/parts/client-info-footer.php b/parts/client-info-footer.php
index 531fbdd..d6bacea 100644 (file)
--- a/parts/client-info-footer.php
+++ b/parts/client-info-footer.php
@@ -1,5 +1,5 @@
 <div id="footer_address" class="row small-centered small-11 small-text-center medium-6 columns">
-    <a href="<?php bloginfo('url'); ?>"><img alt="Mount Pleasant Wow Logo" src="<?php bloginfo('template_url'); ?>/assets/mt-pleasant-wow-logo.png"></a>
+    <a href="<?php bloginfo('url'); ?>"><img class="footer-logo" alt="Mount Pleasant Wow Logo" src="<?php bloginfo('template_url'); ?>/assets/logo-color.png"></a>
     <?php if (function_exists('glm_get_clientinfo_option')) :?>
     <span id="business"><?php echo glm_get_clientinfo_option('businessName');?></span><br>
     <?php if (glm_get_clientinfo_option('address')):?>

diff --git a/parts/off-canvas-menu.php b/parts/off-canvas-menu.php
index cbcb8a2..cff2164 100644 (file)
--- a/parts/off-canvas-menu.php
+++ b/parts/off-canvas-menu.php
@@ -1,5 +1,7 @@
 <aside class="left-off-canvas-menu hide-for-large-up">
-    <a id="oc-meet-link" href="<?php echo get_permalink(12367);?>">Meet Here</a>
+    <a id="oc-meet-link" href="<?php echo get_permalink(12367);?>">
+        <img class="oc-meet-here-logo" src="<?php echo get_stylesheet_directory_uri(); ?>/assets/meet-here-white.png" alt="">
+    </a>
     <?php //glm_offcanvas_menu(); ?>
     <?php mountpleasantcvb_mobile_off_canvas(); ?>
     <form role="search" method="get" id="formsearch" action="<?php echo home_url('/'); ?>">

diff --git a/parts/slide-show.php b/parts/slide-show.php
index d5f02ac..cd75bb6 100644 (file)
--- a/parts/slide-show.php
+++ b/parts/slide-show.php
@@ -1,6 +1,6 @@
 <?php if (is_front_page()) {
     echo '<div id="slideshow">';
-    echo do_shortcode("[metaslider id=14]");
+    echo do_shortcode("[metaslider id=391]");
     echo do_shortcode("[metaslider id=34]");
     echo do_shortcode("[metaslider id=840]");
     echo '</div>';

diff --git a/scss/_fonts.scss b/scss/_fonts.scss
new file mode 100644 (file)
index 0000000..d816ebc
--- /dev/null
+++ b/scss/_fonts.scss
@@ -0,0 +1,5 @@
+@font-face
+{
+    font-family: 'Comfortaa';
+    src: url('../assets/fonts/Comfortaa-Bold.ttf');
+}
\ No newline at end of file

diff --git a/scss/_page.header.scss b/scss/_page.header.scss
index 3a546e3..97ec964 100644 (file)
--- a/scss/_page.header.scss
+++ b/scss/_page.header.scss
@@ -17,13 +17,13 @@ header#page-header {
         position: relative;
         #logo {
             position: absolute;
-            left: 33%;
+            left: 24%;
             @media #{$medium-only} {
                 left: 18%;
             }
             img {
                 display: inline-block;  
-                padding-top: 22px;
+                padding-top: 10px;
                 margin: 0 auto;
                 @media (max-width: 1055px) {
                     padding-top: 50px;
@@ -33,7 +33,7 @@ header#page-header {
         .meet-here {
             position: absolute;
             left: 0;
-            text-align: center;
+            // text-align: center;
             a {
                 color: white;
                 text-decoration: underline;

diff --git a/scss/_revamp-styles.scss b/scss/_revamp-styles.scss
new file mode 100644 (file)
index 0000000..844a646
--- /dev/null
+++ b/scss/_revamp-styles.scss
@@ -0,0 +1,33 @@
+body{
+    .meet-here-logo{
+        max-width: 120px;
+    }
+    .oc-meet-here-logo{
+        max-width: 100px;
+    }
+    #reservation{
+        background: $revamp-green;
+    }
+    main.page-front #content-wrapper .blocks .block-text{
+        background: $revamp-blue;
+        .block-readmore{
+            color: $revamp-yellow;
+        }
+    }
+    .header-logo{
+        max-width: 415px;
+        width: 100%;
+    }
+    footer#main{
+        background: $revamp-green;
+        #menu-footer{
+            
+            a:hover{
+                color: #16345B;
+            }
+        }
+    }
+    .footer-logo{
+        max-width: 300px;
+    }
+}
\ No newline at end of file

diff --git a/scss/_settings.scss b/scss/_settings.scss
index c6eebeb..0d5ef2b 100644 (file)
--- a/scss/_settings.scss
+++ b/scss/_settings.scss
@@ -135,6 +135,10 @@ $success-color: #43AC6A;
 $warning-color: #f08a24;
 $info-color: #a0d3e8;
 
+$revamp-green : #54BB54;
+$revamp-blue : #16345B;
+$revamp-gray : #434343;
+$revamp-yellow : #E6E125;
 // We use these to control various global styles
 // $body-bg: $white;
 $body-font-color: $black;
@@ -466,8 +470,8 @@ $small-font-color: scale-color($header-font-color, $lightness: 35%);
 // We use these to control button border styles.
 // $button-border-width: 0;
 // $button-border-style: solid;
- $button-bg-color: $gold;
- $button-bg-hover: $gold;
+ $button-bg-color: $revamp-yellow;
+ $button-bg-hover: $revamp-yellow;
 // $button-border-color: $button-bg-hover;
 // $secondary-button-bg-hover: scale-color($secondary-color, $lightness: $button-function-factor);
 // $secondary-button-border-color: $secondary-button-bg-hover;
@@ -1415,10 +1419,10 @@ $small-font-color: scale-color($header-font-color, $lightness: 35%);
  $topbar-link-font-size: rem-calc(18);
 // $topbar-link-hover-lightness: -10%; // Darken by 10%
  $topbar-link-bg: $topbar-bg;
- $topbar-link-bg-hover: $blue;
+ $topbar-link-bg-hover: $revamp-blue;
  $topbar-link-bg-color-hover: $blue;
  $topbar-link-bg-active: transparent;
-// $topbar-link-bg-active-hover: scale-color($primary-color, $lightness: -14%);
+$topbar-link-bg-active-hover: $revamp-blue;
 // $topbar-link-font-family: $body-font-family;
  $topbar-link-text-transform: uppercase;
 // $topbar-link-padding: ($topbar-height / 3);
@@ -1430,7 +1434,7 @@ $small-font-color: scale-color($header-font-color, $lightness: 35%);
 // Style the top bar dropdown elements
  $topbar-dropdown-bg: $white;
  $topbar-dropdown-link-color: $black;
- $topbar-dropdown-link-color-hover: $blue;
+ $topbar-dropdown-link-color-hover: $revamp-blue;
  $topbar-dropdown-link-bg: $topbar-bg;
  $topbar-dropdown-link-bg-hover: $topbar-bg;
 // $topbar-dropdown-link-weight: $font-weight-normal;

diff --git a/scss/_structure.scss b/scss/_structure.scss
index 39bbfaa..df8b814 100644 (file)
--- a/scss/_structure.scss
+++ b/scss/_structure.scss
@@ -15,9 +15,31 @@
     background-color: transparent;
 }
 h1 {
-    font-family: "Kaushan Script";
-    color: $blue;
+    font-family: "Comfortaa";
+    color: $revamp-blue;
 }
 h2 {
-    color: $blue;
+    font-family: "Comfortaa";
+    color: $revamp-green;
 }
+h3 {
+    font-family: "Comfortaa";
+    color: $revamp-blue;
+}
+h4 {
+    font-family: "Comfortaa";
+    color: $revamp-blue;
+}
+h5 {
+    font-family: "Comfortaa";
+    color: $revamp-green;
+}
+h6 {
+    font-family: "Comfortaa";
+    color: $revamp-gray;
+    font-size: 18px;
+}
+p{
+    font-family: "Open Sans", sans-serif;
+    font-size: 16px;
+}
\ No newline at end of file

diff --git a/scss/app.scss b/scss/app.scss
index ebdd87d..9c3ab14 100644 (file)
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -1,5 +1,7 @@
 @import "settings";
 @import "foundation";
+@import "fonts";
+@import "structure";
 @import "mixins";
 @import "wordpress";
 @import "defaults";
@@ -14,8 +16,8 @@
 @import "search";
 @import "page.footer";
 @import "copyright";
-@import "structure";
 @import "left-off-canvas";
 @import "plugins/gravityforms";
+@import "revamp-styles";
 //@import "right-off-canvas";