resolved conflict

themes/rcforward/footer.php

@@ -16,14 +16,19 @@
 <?php endif; ?>
 
 <footer id="colophon" class="site-footer" role="contentinfo">
+	<div class="footer-site-logo">
+		<a href="<?php echo home_url('/'); ?>" rel="home">
+			<h2 class="rcforward-logo">Rc Forward</h2>
+		</a>
+	</div>
 	<div class="footer-nav">
 		<?php wp_nav_menu(array('theme_location' => 'footer-menu', 'menu_id' => 'footer-menu')); ?>
 	</div><!-- .footer-nav -->
 	<div class="footer-info">
 		<?php $front_page_id = get_option('page-on-front'); ?>
 		<p><?php echo CFS()->get('footer_info', $front_page_id) ?></p>
 		<img src="<?php echo CFS()->get('footer_info_icon', $front_page_id) ?>">
-			<!-- Insert Icon -->
+		<!-- Insert Icon -->
 	</div><!-- .footer-info -->
 	<div class="footer-info-sm">
 		<p>RC Forward is a project of:</p>

themes/rcforward/functions.php

@@ -128,3 +128,8 @@ function red_starter_scripts()
  * Custom functions that act independently of the theme templates.
  */
 require get_template_directory() . '/inc/extras.php';
+
+function custom_add_google_fonts() {
+	wp_enqueue_style( 'rc-montserrat', 'https://fonts.googleapis.com/css?family=Montserrat:400,600,700,800&display=swap', false );
+	}
+	add_action( 'wp_enqueue_scripts', 'custom_add_google_fonts' );

themes/rcforward/sass/_content.scss

@@ -47,33 +47,37 @@
 // .bypostauthor {
 // 	display: block;
 // }
-body{
-    background: $credible__blue;
+
+body {
+  background: $credible__blue;
+  color: $grounded__green;
+  font-family: $montserrat__font;
 }
-.site{
-    max-width: $max-screen-size;
-    background: white;
+.site {
+  max-width: $max-screen-size;
+  margin: 0 auto;
+  background: white;
 }
-.site-content{
-    padding:1rem;
-    @include tablet{
-        padding:2rem;
-    }
-    @include desktop{
-        padding:5rem;
-    }
+.site-content {
+  @include tablet {
+    padding: 2rem;
+  }
+  @include desktop {
+    padding: 5rem;
+  }
 }
-<<<<<<< HEAD
 
-=======
 /* Chimp Donate Button */
-  .chimp-donate-form {
-        background: $code__blue;
-        margin-top: 10px;
-        width: 160px;
-        height: 60px;
-        border-radius: 6px;
-        color: $grounded__green;
-        font-weight: bold;
-      }
->>>>>>> 13446c5441c5a41af894e506924c9b3ec9456ae3
+.chimp-donate-form {
+  background-color: $code__blue;
+  font-size: 1.6rem;
+  font-weight: 700;
+  padding: 1.6rem 5.3rem;
+  color: $grounded__green;
+  border-radius: 8px;
+  margin-top: 10px;
+  @include tablet {
+  }
+  @include desktop {
+  }
+}

themes/rcforward/sass/_footer.scss

@@ -1,3 +1,20 @@
-.footer-sidebar, .site-footer {
-    background-color: $credible__blue;
-}
+.site-footer {
+  .footer-site-logo {
+    a {
+      .rcforward-logo {
+        color: $white;
+        text-transform: uppercase;
+        text-align: center;
+      }
+    }
+  }
+  .footer-nav {
+      display: none;
+  }
+  .footer-info {
+
+  }
+  .footer-info-sm {
+
+  }
+}

themes/rcforward/sass/_mixins.scss

@@ -16,7 +16,7 @@
         @content;
     }
 }
-
+    
 @mixin desktop {
     @media (min-width: $desktop-width) {
         @content;

themes/rcforward/sass/_page-templates.scss

@@ -3,26 +3,20 @@
 --------------------------------------------------------------*/
 
 /* Default Page styling (for all pages) */
-body {
-  color: $grounded__green;
+* {
+  box-sizing: border-box;
 }
 
 /* Front page */
 
 /* Single Fund Pages */
-* {
-  box-sizing: border-box;
-}
-
 .single-fund {
   .hfeed {
     .site-content {
-      max-width: 100%;
       .type-fund {
         display: flex;
         flex-direction: column;
         text-align: center;
-
         .fund-header {
           position: relative;
           .fund-image {
@@ -49,50 +43,101 @@ body {
           .entry-title {
             font-size: 2rem;
             color: $credible__blue;
+            width: 50%;
+            display: flex;
+            margin: 2rem auto;
           }
           .amount-funded {
             background-color: rgba(216, 216, 216, 0.18);
             font-size: 4rem;
             color: $innovative__purple;
-            margin: none;
+            margin: 0;
+            padding: 1rem 1.2rem;
+            p .counter {
+              letter-spacing: 0.25rem;
+              &:before {
+                content: ' ';
+              }
+            }
+            p .counter,
+            p {
+              font-weight: 700;
+            }
+            p {
+              &:nth-child(2n) {
+                font-weight: 600;
+                font-size: 2.8rem;
+              }
+            }
             p,
             .chimp-donate-form {
-              margin: 0;
-            }
-            & p:last-child {
-              font-size: 2rem;
+              margin: 0.6rem 0;
             }
           }
           .fund-description {
-            margin-top: 3rem;
+            margin: 3rem 0;
             p {
-              width: 50%;
-              font-size: 1.7rem;
+              width: 80%;
+              line-height: 2.4rem;
+              font-size: 1.6rem;
               font-weight: lighter;
               word-wrap: break-word;
               margin: 0 auto;
             }
           }
           .main-content {
-              margin-top: 2rem;
+            margin-top: 2rem;
+            padding: 3rem 0;
+            background-color: $cream__background;
             .fund-allowcation {
+              display: flex;
+              justify-content: center;
+              flex-direction: column;
+              width: 100%;
               h3 {
-                  width: 65%;
+                width: 70%;
                 word-wrap: break-word;
-                margin: 0 auto;
                 color: $credible__blue;
+                margin: 0 auto;
                 font-size: 2rem;
+                font-weight: 600;
               }
               .fund-allowcations {
-                    display: flex;
-                    justify-content: center;
-                  .single-allocation {
-                     display: flex;
-                     flex-direction: row;
-                     .allocation-text {
-
-                     } 
+                display: flex;
+                justify-content: center;
+                flex-direction: column;
+                margin-top: 4rem;
+                .single-allocation {
+                  margin-top: 2rem;
+                  margin-bottom: 3.5rem;
+                  .charity-logo {
+                    max-width: 230px;
+                    max-height: 330px;
+                    width: 45%;
+                  }
+                  .allocation-text {
+                      .percentage {
+                          font-size: 5rem;
+                          font-weight: bolder;
+                          margin: 2rem 0;
+                      }
+                      .description {
+                          font-size: 1.6rem;
+                          margin: 0 4rem;
+                          line-height: 2.3rem;
+                      }
                   }
+
+                }
+              }
+            }
+            .entry-content {
+              width: 80%;
+              margin: 0 auto 4rem;
+              p {
+                font-size: 1.6rem;
+              line-height: 2.4rem;
+              margin-top: 0;
               }
             }
           }

themes/rcforward/sass/_variables.scss

@@ -34,10 +34,10 @@ $black: #000;
 $white: #fff;
 
 // RC Fonts
-$gotham__font: 'Montserrat Light', sans-serif;
+$montserrat__font: 'Montserrat', sans-serif;
 
 // RC Mixins
-$tablet-width: 600px;
+$tablet-width: 650px;
 $desktop-width: 1000px;
 $max-screen-size: 1440px;
 

themes/rcforward/sass/_widgets.scss

@@ -2,16 +2,51 @@
 # Widgets
 --------------------------------------------------------------*/
 
-.widget {
-	margin: 0 0 $base__space-unit;
-
-	/* Make sure select elements fit in widgets. */
-	select {
-		max-width: 100%;
-	}
-}
-
 /* Search widget. */
 .widget_search .search-submit {
-	display: none;
+  display: none;
+}
+
+.footer-sidebar {
+  background: linear-gradient(rgba(0, 0, 0, 0.13), rgba(0, 0, 0, 0.13)),
+    url('../../assets/images/nw-mobile.png');
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: cover;
+  .widget {
+    @include display-flex();
+    flex-direction: column;
+    margin: 0;
+    height: 14rem;
+    /* Make sure select elements fit in widgets. */
+    select {
+      max-width: 100%;
+    }
+    .widget-title {
+      color: $white;
+	  font-weight: 400;
+	  font-size: 1.5rem;
+      letter-spacing: 0.099rem;
+      margin-bottom: 1.5rem;
+    }
+    .mc4wp-form {
+      .mc4wp-form-fields {
+        @include display-flex();
+        p {
+          margin: 0;
+        }
+        input[type='email'] {
+		  padding: 0.7rem 1rem;
+		  border-radius: 6px 0 0 6px;
+		  border: none;
+        }
+        input[type='submit'] {
+		  background-color: $code__blue;
+		  padding: 0.7rem 1rem;
+		  border-radius: 0 6px 6px 0;
+		  border: none;
+        }
+      }
+    }
+  }
 }