From: Laury GvR <laury@gaslightmedia.com>
Date: Wed, 15 Jun 2016 13:45:08 +0000 (-0400)
Subject: Merge branch 'feature/frontpage' into develop
X-Git-Tag: v1.0.17^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=de4cbf62ae39ca5f9cb8a9efa285242a1011d211;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'feature/frontpage' into develop

Conflicts:
	css/front.css
---

de4cbf62ae39ca5f9cb8a9efa285242a1011d211
diff --cc css/front.css
index a0aab80,9ba46da..62b65bc
--- a/css/front.css
+++ b/css/front.css
@@@ -222,7 -210,52 +222,55 @@@ input[name='contact_fname'], input[name
          width: 35%;
      }
  }
 +.hasDatepicker {
-   height: 34px;
-   max-width: 100%;
++    height: 34px;
++    max-width: 100%;
+ /* Front page styles */
+ #glm-events-frontpage-wrapper {
 -	font-size: 1rem;
 -	line-height: 1.2;
 -	width: 100%;
++    font-size: 1rem;
++    line-height: 1.2;
++    width: 100%;
+ }
+ .glm-events-frontpage-day {
 -	background-color: grey;
 -	color: white;
 -	border-radius: 5px;
 -	margin: 0 0 10px 0;
 -	padding: 5px;
 -	text-align: center;
 -	font-size: .7em;
 -	font-weight: bold;
++    background-color: grey;
++    color: white;
++    border-radius: 5px;
++    margin: 0 0 10px 0;
++    padding: 5px;
++    text-align: center;
++    font-size: .7em;
++    font-weight: bold;
+ }
+ .glm-events-frontpage-event-image {
 -	float: left;
 -	height: 100%;
 -	width: 30%;
++    float: left;
++    height: 100%;
++    width: 30%;
+ }
+ .glm-events-frontpage-event-image img {
 -	min-width: 90px;
 -	float: left;
 -	height: 100%;
++    min-width: 90px;
++    float: left;
++    height: 100%;
+ }
+ .glm-events-frontpage-event-container {
 -	border: lightgrey solid 1px;
 -	border-radius: 5px;
 -	background-color: white;
 -	height: 90px;
++    border: lightgrey solid 1px;
++    border-radius: 5px;
++    background-color: white;
++    height: 90px;
+ }
+ .glm-events-frontpage-event-title {
 -	font-size: .66em;
 -	font-weight: bold;
 -	float: right;
 -	width: 70%;
++    font-size: .66em;
++    font-weight: bold;
++    float: right;
++    width: 70%;
+ }
+ .glm-events-frontpage-event-dates {
 -	font-size: .63em;
 -	font-weight: bold;
 -	float: right;
 -	width: 70%;
++    font-size: .63em;
++    font-weight: bold;
++    float: right;
++    width: 70%;
+ }
+ .glm-events-frontpage-event-content {
 -	font-size: .63em;
 -	float: right;
 -	width: 70%;
++    font-size: .63em;
++    float: right;
++    width: 70%;
  }