Update to conflict issues after pulling Programs updates

redacademy · Jun 19, 2019 · 52905a9 · 52905a9
2 parents 6994ada + 2f07726
commit 52905a9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/themes/best-bc/archive-program.php b/themes/best-bc/archive-program.php
@@ -21,6 +21,7 @@
 
       <?php /* Start the Loop */ ?>
       <div class="programs">
+
 			  <?php while ( have_posts() ) : the_post(); ?>
 
          <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
@@ -32,14 +33,15 @@
 
           <?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( CFS()->get('program_url') ) ), '</a></h2>' ); ?>
 
-        </div> <!-- entry -->
 
       <div class="overlay">
  <h3 class="overlay-title"> <?php the_title() ?></h3>
 <p class="overlay-content"><?php the_content()?></p>
 <a class="visit-btn" href="<?php echo esc_url( CFS()->get('program_url'))?>">Visit Website</a>
 
 </div>
+        </div> <!-- entry -->
+
 
 
       </article><!-- #post-## -->

diff --git a/themes/best-bc/sass/archive.scss b/themes/best-bc/sass/archive.scss
@@ -3,6 +3,23 @@
 .archive{
     margin: 0 auto;
     .programs{
+        .program{
+            position: relative;
+            &:hover{
+                .overlay{
+                    opacity:1;
+                    top:0;
+                } 
+
+            }
+            .overlay{
+                opacity: 0;
+                position: absolute;
+
+            }
+
+        }
+
         // margin: 100px;
         display: flex;
         flex-direction: column;
@@ -19,6 +36,7 @@
         position: relative;
         width: 340px;
         height: 300px;
+
         .article-thumbnail{
             width:100%;
             height: 100%;
@@ -39,7 +57,7 @@
 
 
     // overlay content
-    .overlay{
+    .overlay   {
         background-color: $color__main;
         width: 340px;
         height: 300px;
@@ -56,7 +74,7 @@
             color: white;
             font-weight:100;
 
-    }
+         }
 
     }
 }
diff --git a/themes/best-bc/style.css b/themes/best-bc/style.css
@@ -1340,6 +1340,14 @@ object {
             flex-direction: column;
     -ms-flex-line-pack: distribute;
         align-content: space-around; }
+    .archive .programs .program {
+      position: relative; }
+      .archive .programs .program:hover .overlay {
+        opacity: 1;
+        top: 0; }
+      .archive .programs .program .overlay {
+        opacity: 0;
+        position: absolute; }
     @media (min-width: 620px) {
       .archive .programs {
         display: -webkit-box;