Fix on previous commit, same changes.

Gruntified previous commit

diff --git a/css/app.css b/css/app.css
index 778bb1f..4f6d436 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -7397,117 +7397,6 @@ h2#slide-text {
 .ai1ec-calendar-title, .ai1ec-calendar-title-short {
   font-size: 9px !important; }
 
-/*#page-wrapper {
-    #glm-locationMap-container {
-        margin-bottom: 8px;
-    }
-    #glm-locationMap {
-        margin: 0;
-    }
-    .glm-member-detail-image-wrapper  {
-        @media only screen and (max-width: 40em) {
-            text-align: center;
-        }
-    }
-    .glm-member-detail-container,
-    .glm-member-entry-container,
-    .glm-member-list-container {
-        line-height: 1.3;
-        font-size: 14px;
-        height: 1%;
-        overflow: hidden;
-        position: relative;
-        a:hover {
-            color: black;
-            cursor: pointer;
-        }
-        ul, ol, dl {
-            font-size: 14px;
-        }
-        h2 {
-            padding: 0;
-            line-height: 1;
-            margin-bottom:3px;
-            font-size: 16px;
-            text-transform: uppercase;
-            a {
-                color: $maroon;
-            }
-            a:hover {
-                color: black;
-            }
-        }
-        p {
-            font-size: 14px;
-            margin-bottom: 10px;
-        }
-        .glm-member-list-image-border {
-            border-right: 2px solid lightgrey;
-            overflow: hidden;
-            max-height: 200px;
-            max-width: 300px;
-            @media only screen and (max-width: 40em) {
-                margin: 0 auto;
-            }
-        }
-        .glm-member-list-links {
-            display: inline;
-            a {
-            color: black;
-            text-decoration: underline;
-            margin-right: 15px;
-            }
-        }
-        .glm-member-list-description {
-            padding: 20px 20px 20px 0;
-            @media only screen and (max-width: 40em) {
-                padding: 20px;
-            }
-        }
-        .glm-member-list-active-info {
-            @media only screen and (min-width:0em) and (max-width:64em) {
-                left: initial;
-            }
-        }
-    }
-    .glm-member-detail-container {
-        border: 0;
-        .glm-member-detail-info  {
-            @media only screen and (max-width: 40em) {
-                text-align: center;
-            }
-        }
-        ul {
-            list-style: none;
-        }
-        .glm-member-detail-info {
-            padding: 15px;
-        }
-    }
-    #glm-member-detail-amenities-container {
-        padding: 10px 40px 10px 10px;
-        @media only screen and (max-width: 40em) {
-            padding: 10px;
-            text-align: center;
-        }
-    }
-    #glm-member-detail-description-container {
-        padding: 10px;
-        padding-top: 10px;
-        padding-bottom: 10px;
-    }
-    .glm-member-detail-border {
-        border: 1px solid lightgrey;
-        padding: 10px;
-    }
-    #glm-member-detail-photos {
-        margin-top: 20px;
-        b, .clearing-assembled {
-            padding: 5px;
-        }
-        
-    }
-}*/
 .wu-wrapper * {
   margin: 0;
   padding: 0;
@@ -7667,14 +7556,14 @@ h2#slide-text {
   text-decoration: none;
   display: inline-block;
   padding: 0.75rem 1.5rem 0.8125rem 1.5rem;
-  background-color: #1479b0;
-  border-color: #10618d;
+  background-color: #008752;
+  border-color: #006c42;
   color: #FFFFFF;
   border-radius: 3px;
   transition: background-color 300ms ease-out;
   width: 220px; }
   #glm-event-wrapper button:hover, #glm-event-wrapper button:focus {
-    background-color: #10618d; }
+    background-color: #006c42; }
   #glm-event-wrapper button:hover, #glm-event-wrapper button:focus {
     color: #FFFFFF; }
 #glm-event-wrapper p {
@@ -7724,53 +7613,23 @@ h2#slide-text {
   height: 30px;
   border-radius: 3px; }
 #glm-event-wrapper #EventDrivingDirectionSubmit {
-  margin-left: 0px;
-  font-weight: bold; }
-
-.hasDatepicker {
-  width: 100%;
-  height: 34px; }
-
-#glm-events-frontpage-wrapper .glm-events-frontpage-day {
-  padding: 3px;
-  background-color: #690433;
-  color: #ffc742; }
-#glm-events-frontpage-wrapper .glm-events-frontpage-event-container {
-  margin: 10px 0;
-  overflow: hidden; }
-#glm-events-frontpage-wrapper .glm-events-frontpage-event-image {
-  width: 90px;
-  height: 90px; }
-#glm-events-frontpage-wrapper .glm-events-frontpage-event-title, #glm-events-frontpage-wrapper .glm-events-frontpage-event-dates, #glm-events-frontpage-wrapper .glm-events-frontpage-event-content {
-  float: left;
-  width: 170px;
-  padding: 0px 12px 0px 8px;
-  margin-top: 4px; }
-#glm-events-frontpage-wrapper .glm-events-frontpage-event-title {
-  /*    font-size: 15px;*/
-  color: #690433;
-  font-weight: bold;
-  max-height: 37.2px;
-  overflow: hidden;
-  line-height: 1.4; }
-#glm-events-frontpage-wrapper .glm-events-frontpage-event-dates {
-  color: grey;
-  max-height: 20px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap; }
-#glm-events-frontpage-wrapper .glm-events-frontpage-event-content {
-  max-height: 37.2px;
-  overflow: hidden; }
+  margin-left: 0px; }
 
 #glm-member-detail-packages-container .package-title a {
   color: #1479b0; }
 
+.glm-member-package-detail-container .glm-member-title, .glm-member-package-detail-container .glm-member-title a {
+  color: #690433;
+  text-transform: none;
+  font-style: normal;
+  font-size: 24px;
+  text-decoration: none; }
+
 body #glm-member-login-form {
   width: 250px;
   margin-bottom: 40px; }
 body #glm-member-login-form .button-primary, body #glm-member-password-lost-form .lostpassword-button {
-  background-color: #1479b0;
+  background-color: #008CBA;
   border: 0 none;
   border-radius: 5px;
   color: white;
@@ -7786,17 +7645,29 @@ body #glm-member-password-lost-link {
 body #glm-member-password-lost-form {
   display: none; }
 body .glm-member-db-list-view #glm-member-list-map-toggle {
-  background-color: #1479b0; }
+  background-color: #0093d1; }
+body .glm-member-db-list-view .glm-alpha-link-selected {
+  background-color: #131c5f; }
+body .glm-member-db-list-view .glm-member-title, body .glm-member-db-list-view .glm-member-title a {
+  color: #690433;
+  text-transform: none;
+  font-style: normal;
+  font-size: 24px;
+  text-decoration: none; }
+body .glm-member-db-list-view .glm-member-list-links > a {
+  text-decoration: none; }
+body .glm-member-db-list-view .glm-member-list-description a {
+  text-decoration: none; }
 body .glm-member-db-list-view .glm-member-list-links #glm-member-list-website-link:before {
   background-image: url("../assets/offsite-link_grn.png"); }
+body .glm-member-db-list-view .glm-member-db-socials > a {
+  text-decoration: none; }
 body .glm-member-db-list-view .glm-member-search:before {
-  background-color: #1479b0; }
+  background-color: #0093d1; }
 body .glm-member-db-list-view #glm-member-list-filters-button {
-  background-color: #1479b0; }
+  background-color: #0093d1; }
 body .glm-member-db-list-view #glm-member-list-filters-box .glm-member-search h3 {
-  color: #690433; }
-body .glm-member-db-list-view #glm-member-list-map-toggle {
-  background-color: #1479b0; }
+  color: #0093d1; }
 body .glm-member-db-list-grid-view .glm-member-list-record .glm-member-list-image-empty {
   background-image: url("../assets/no-image.jpg");
   background-repeat: no-repeat;
@@ -7806,49 +7677,75 @@ body .glm-member-db-list-grid-view .glm-member-list-record .glm-member-list-imag
 body .glm-member-db-list-grid-view .glm-member-title, body .glm-member-db-list-grid-view .glm-member-title a {
   color: #690433; }
 body .glm-member-db-list-grid-view .glm-member-list-sub-links {
-  color: #1479b0; }
+  color: #008CBA; }
 body .glm-member-db-list-grid-view .glm-member-search:before {
-  background-color: #1479b0; }
+  background-color: #008CBA; }
 body .glm-member-db-list-grid-view #glm-member-list-filters-button {
-  background-color: #1479b0; }
+  background-color: #008CBA; }
 body .glm-member-db-list-grid-view #glm-member-list-filters-box .glm-member-search h3 {
   color: #690433; }
 body .glm-member-db-list-grid-view #glm-member-list-map-toggle {
-  background-color: #1479b0; }
+  background-color: #0093d1; }
 body #glm-member-detail-container #glm-member-detail-contact-info {
-  background-color: #690433; }
+  background-color: #690433;
+  color: #690433; }
+body #glm-member-detail-container .glm-member-list-image-wrapper a {
+  color: #0093d1; }
+body #glm-member-detail-container .glm-member-list-image-wrapper a:hover {
+  color: #FFFFFF; }
+body #glm-member-detail-container .glm-member-list-image-wrapper a h3 {
+  color: #690433; }
+body #glm-member-detail-container .glm-member-db-package-title > a {
+  color: #690433; }
 body #glm-member-detail-container #glm-member-detail-side-box #glm-member-detail-website-link {
-  background-color: #ecb42f; }
+  background-color: #690433; }
 body #glm-member-detail-container .glm-member-detail-content-toggle {
   color: #690433; }
 body #glm-member-detail-container .glm-member-detail-sub-data-links > a {
-  color: #1479b0; }
+  color: #008CBA;
+  text-decoration: none;
+  font-size: 12px; }
+body #glm-member-detail-container #glm-member-detail-links a {
+  color: #690433;
+  text-decoration: none;
+  border-color: #0093d1; }
 body #glm-member-detail-container #glm-member-detail-links a:hover {
-  border-color: #1479b0; }
+  border-color: #FFFFFF; }
 body #glm-member-detail-container #glm-member-detail-takeback-mini {
-  background-color: #ecb42f; }
+  background-color: #008CBA; }
 body #glm-member-detail-container #glm-member-detail-map-button {
-  background-color: #ecb42f; }
+  background-color: #690433; }
 body #glm-member-detail-container #glm-locationMap-container {
   margin: 0; }
 body #glm-member-detail-container #MemberDrivingDirectionSubmit {
-  background-color: #ecb42f; }
+  background-color: #690433; }
+body #glm-member-detail-container .glm-member-db-socials > a {
+  text-decoration: none; }
+body #glm-member-detail-container #glm-package-detail-member-name h3 {
+  color: #690433; }
+body #glm-member-detail-container #glm-package-detail-member-name a:hover {
+  color: white;
+  text-decoration: underline; }
 body .members-only-template #side-links {
   background-color: #690433;
-  border: 1px solid #ffc742;
+  border: 1px solid #0093d1;
   border-radius: 5px;
-  color: #ffc742;
+  color: #0093d1;
   list-style: outside none none;
   padding: 20px; }
+body .members-only-template #menu-members-only-menu {
+  list-style: outside none none; }
 body .members-only-template #side-links h2 {
   color: #FFFFFF; }
 body .members-only-template #side-links li a {
-  color: #fdc540; }
+  color: #FFFFFF;
+  text-decoration: none;
+  font-size: 18px; }
 body .members-only-template #side-links li a:hover {
-  color: #ffc742;
-  border-bottom: 1px solid #ecb42f; }
+  color: #0093d1;
+  border-bottom: 1px solid #0093d1; }
 body #glm-member-front-header .glm-button.button {
-  background-color: #fdc540; }
+  background-color: #690433; }
 
 #front {
   padding: 20px; }
@@ -8282,6 +8179,11 @@ a#calendar-link {
     -ms-transform: rotate(45deg);
     transform: rotate(45deg); }
 
+.search-results #blog-posts-over .entry-meta {
+  display: none; }
+.search-results #blog-posts-over p {
+  margin-bottom: 0; }
+
 footer#main {
   margin-top: 40px;
   background: #1479b0;

diff --git a/scss/_search.scss b/scss/_search.scss
index 8dda651..04f7c81 100644 (file)
--- a/scss/_search.scss
+++ b/scss/_search.scss
@@ -59,7 +59,7 @@
             }
         }
 }
-#search-results {
+.search-results {
     #blog-posts-over .entry-meta {
         display: none;
     }

diff --git a/scss/plugins/_glm-member-db-events.scss b/scss/plugins/_glm-member-db-events.scss
index c401820..2239888 100644 (file)
--- a/scss/plugins/_glm-member-db-events.scss
+++ b/scss/plugins/_glm-member-db-events.scss
@@ -1,12 +1,10 @@
-// Setting for the colors
 
-$maroon                  : #622004;
-$brown                   : #311D13;
-$nameSearchButtonColor   : $l-blue;
+// Setting for the colors
+$nameSearchButtonColor   : $maroon;
 $shortcutsButtonColor    : $maroon;
-$backToSearchButtonColor : $blue;
+$backToSearchButtonColor : $green;
 $eventGradientColor      : #f2f2f2;
-$eventMonthColor         : $l-blue;
+$eventMonthColor         : $maroon;
 $readMoreColor           : $l-blue;
 
 #glm-event-wrapper {
@@ -91,7 +89,7 @@ $readMoreColor           : $l-blue;
         }
     }
     .glm-event-day-event a.glm-read-more {
-        border: 1px solid $l-blue;
+        border: 1px solid $maroon;
         background-color: $white;
         color: $black;
     }
@@ -111,79 +109,30 @@ $readMoreColor           : $l-blue;
         color: #fff;
     }
     h1 {
-        color: $light-green;
+        color: $eventMonthColor;
     }
     h2 {
-        color: $light-green;
+        color: $l-blue;
         font-weight: bold;
     }
     #glm-event-detail-cost:before{
         top: 0px;
     }
-    .stButton .sharethis{
-       display: none;
-   }
-    span#eventShare.st_sharethis,
-    #shareThisOrange{
-        background-color: $l-blue !important;
-        padding: 2px 0 5px 10px;
-        font-size: rem-calc(14);
-        font-weight: bold;
-        color: white;
-        width: auto;
-        height: 30px;
-        border-radius: 3px;
-    }
-    #EventDrivingDirectionSubmit {
-        margin-left: 0px;
-        font-weight: bold;
-    }
+ .stButton .sharethis{
+    display: none;
 }
-.hasDatepicker {
-    width: 100%;
-    height: 34px;
+span#eventShare.st_sharethis,
+#shareThisOrange{
+    background-color: $maroon !important;
+    padding: 2px 0 5px 10px;
+    font-size: rem-calc(14);
+    font-weight: bold;
+    color: white;
+    width: auto;
+    height: 30px;
+    border-radius: 3px;
 }
-// Front page display
-#glm-events-frontpage-wrapper {
-    .glm-events-frontpage-day {
-        padding: 3px;
-        background-color: $maroon;
-        color: $white;
-    }
-    .glm-events-frontpage-event-container {
-        margin: 10px 0;
-        overflow: hidden;
-    }
-    .glm-events-frontpage-event-image {
-        width: 90px;
-        height: 90px;
-    }
-    .glm-events-frontpage-event-title,
-    .glm-events-frontpage-event-dates,
-    .glm-events-frontpage-event-content {
-        float: left;
-        width: 170px;
-        padding: 0px 12px 0px 8px;
-        margin-top: 4px;
-    }
-    .glm-events-frontpage-event-title {
-        font-size: 14px;
-        color: $l-blue;
-        font-weight: bold;
-        max-height: 37.2px;
-        overflow: hidden;
-        line-height: 1.4;
-    }
-    .glm-events-frontpage-event-dates {
-        font-size: 14px;
-        color: grey;
-        max-height: 20px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-    }
-    .glm-events-frontpage-event-content {
-        max-height: 37.2px;
-        overflow: hidden;
+    #EventDrivingDirectionSubmit {
+        margin-left: 0px;
     }
 }
\ No newline at end of file

diff --git a/scss/plugins/_glm-member-db-packaging.scss b/scss/plugins/_glm-member-db-packaging.scss
index f06b53b..f471e29 100644 (file)
--- a/scss/plugins/_glm-member-db-packaging.scss
+++ b/scss/plugins/_glm-member-db-packaging.scss
@@ -12,7 +12,7 @@
 .glm-member-package-detail-container {
     .glm-member-title,
     .glm-member-title a {
-        color: $light-green;
+        color: $maroon;
         text-transform: none;
         font-style: normal;
         font-size: 24px;

diff --git a/scss/plugins/_glm-member-db.scss b/scss/plugins/_glm-member-db.scss
index 8c9ceb1..821bf1b 100644 (file)
--- a/scss/plugins/_glm-member-db.scss
+++ b/scss/plugins/_glm-member-db.scss
@@ -45,7 +45,7 @@ body {
     }
     .glm-member-title,
     .glm-member-title a {
-        color: $light-green;
+        color: $maroon;
         text-transform: none;
         font-style: normal;
         font-size: 24px;
@@ -113,7 +113,7 @@ body {
 // 3.0 Member Detail
 #glm-member-detail-container {
     #glm-member-detail-contact-info {
-        background-color: $tan;
+        background-color: $maroon;
         color: $maroon;
     }
     .glm-member-list-image-wrapper a {
@@ -126,11 +126,11 @@ body {
         color: $maroon;
     }
     .glm-member-db-package-title > a {
-        color: $light-green;
+        color: $maroon;
     }
     #glm-member-detail-side-box {
         #glm-member-detail-website-link {
-            background-color: $light-green;
+            background-color: $maroon;
         }
     }
     .glm-member-detail-content-toggle {
@@ -153,13 +153,13 @@ body {
         background-color: $primary-color;
     }
     #glm-member-detail-map-button {
-        background-color: $light-green;
+        background-color: $maroon;
     }
     #glm-locationMap-container {
         margin: 0;
     }
     #MemberDrivingDirectionSubmit {
-        background-color: $light-green;
+        background-color: $maroon;
     }
     .glm-member-db-socials > a {
         text-decoration: none;
@@ -174,10 +174,10 @@ body {
 }
 .members-only-template {
     #side-links {
-        background-color: $light-green;
-        border: 1px solid $gold;
+        background-color: $maroon;
+        border: 1px solid $l-blue;
         border-radius: 5px;
-        color: $gold;
+        color: $l-blue;
         list-style: outside none none;
         padding: 20px;
     }
@@ -193,8 +193,8 @@ body {
         font-size: 18px;
     }
     #side-links li a:hover {
-        color: $gold;
-        border-bottom: 1px solid $gold;
+        color: $l-blue;
+        border-bottom: 1px solid $l-blue;
     }
 }
 #glm-member-front-header .glm-button.button {