Merge branch 'master' of https://github.com/redacademy/wild-spring-2018

themes/wav-theme/functions.php

@@ -170,8 +170,8 @@ function wav_tribe_meta_event_tags( $label = null, $separator = ' ', $echo = tru
 function tribe_custom_theme_text ( $translation, $text, $domain ) {
 
 	$custom_text = array(
-		'Keyword' => 'search by tags',
-		'Date' => 'date'
+		'Keyword' => 'Search by tags',
+		'Date' => 'Date'
 	);
 	// If this text domain starts with "tribe-", "the-events-", or "event-" and we have replacement text
     	if( (strpos($domain, 'tribe-') === 0 || strpos($domain, 'the-events-') === 0 || strpos($domain, 'event-') === 0) && array_key_exists($translation, $custom_text) ) {

themes/wav-theme/page-templates/about.php

@@ -37,7 +37,7 @@
 
                     <div><?php echo wp_kses(CFS()->get( 'video_about_test' ));?></div>
 
-                    <p><?php echo esc_html(CFS()->get( 'text_about_video' )); ?></p>
+                    <p><?php echo esc_url(CFS()->get( 'text_about_video' )); ?></p>
 
                 </div>
 

themes/wav-theme/sass/_events-calendar.scss

@@ -30,27 +30,33 @@ Please check the Skeleton style from Events/Setting/Display in dashboard and the
             @include tablet{
                 display:flex;
                 flex-wrap: wrap;
+                justify-content: space-between;
             }
-        }
-        .tribe-events-list-event-description a{
-                margin-top: auto;
-                color:$color__green;
-                &:hover:visited{
-                    color:$color__green;;
+            .event-item{
+                display: flex;
+                // flex-direction: column;
+                // justify-content: space-between;
+                border:1px solid $color__green;
+                padding: 1rem;
+                // margin-top: auto;
+                @include tablet{
+                    width: 33.33%;
+                }
+                .type-tribe_events{
+                    display:flex;
+                    flex-direction:column;
+                    justify-content: center;
+                    margin-top: auto;
                 }
+            }
         }
-        .type-tribe_events{
-            display: flex;
-            flex-direction: column;
-            justify-content: space-between;
-            border:1px solid $color__green;
-            padding: 1rem;
+        .tribe-events-list-event-description a{
             margin-top: auto;
-            @include tablet{
-                width: 33%;
+            color:$color__green;
+            &:hover:visited{
+                color:$color__green;;
             }
-
-        }
+    }
     }
     .tribe-events-sub-nav{
         display: none;