switched to template

templates/shortcodes/row.html

@@ -9,10 +9,6 @@ Parameters:
 - bgPath: if bgPath is passed, the row has a full width background
 -->
 
-<<<<<<< HEAD
-{% set columns = body | safe | markdown | split(pat="|||") %}
-{% set row_class =  "relative pt-12 flex flex-col sm:grid sm:grid-cols-2 sm:gap-10 md:flex md:flex-row md:py-4 lg:py-8"%}
-=======
 
 <!-- This fixes link & img paths in local, prod, and wth prefix -->
 {% if page %}
@@ -40,7 +36,6 @@ Parameters:
 {% set columns = body | safe | markdown | split(pat="<p>|||</p>") %}
 
 {% set row_class =  "relative py-12 flex flex-col sm:grid sm:grid-cols-2 sm:gap-10 md:flex md:flex-row flex-wrap max-w-fit "%}
->>>>>>> template/master
 
 <!-- aligns columns depending on col number-->
 {% if 2 < columns | length %}
@@ -49,9 +44,6 @@ Parameters:
     {% set row_class = row_class ~ " lg:items-center" %}
 {% endif %}
 
-<<<<<<< HEAD
-{% set col_class = "flex-1 mb-20 lg:mb-0 " %}
-=======
 {% set col_class = "flex-1 mb-4 md:mb-12 lg:mb-0 " %}
 {% set col_class = col_class ~ " lg:mx-8 " %}
 
@@ -82,7 +74,6 @@ Parameters:
 {% endif %}
 
 {% set row_class =  row_class ~ margin_class %}
->>>>>>> template/master
 
 {% if style %}
 
@@ -97,34 +88,21 @@ Parameters:
             {% set col_class = col_class ~ " last:px-20 lg:max-w-[50%] " %}
             {% set row_class = row_class ~ " sm:gap-0 " %}
         {% elif "lean-right" in style %}
-<<<<<<< HEAD
-            {% set col_class = col_class ~ " first:px-20 lg:max-w-[50%] " %}
-=======
             {% set col_class = col_class ~ " first:px-20 lg:max-w-[50%] -mr-8 md:-mr-12 lg:-mr-16 xl:-mr-20 " %}
->>>>>>> template/master
             {% set row_class = row_class ~ " sm:gap-0 " %}
         {% else %}
             {% set row_class = row_class ~ " md:py-0 " %}
             {% set col_class = col_class ~ " lg:m-0" %}
         {% endif %}    
     {% else %}
-<<<<<<< HEAD
-        {% set row_class = row_class ~ " mx-8" %}
-        {% set col_class = col_class ~ " lg:mx-8 " %}
-=======
         {% set row_class = row_class ~ " w-screen " %}
->>>>>>> template/master
     {% endif %}
 
      <!-- makes row semi-full screen width, strips margins -->
      {% if "between" in style %}
      {% set row_class = row_class ~ " lg:max-w-6xl " %}
  {% elif "moderate" in style %}
-<<<<<<< HEAD
-     {% set row_class = row_class ~ " lg:mx-20 " %}
-=======
      {% set row_class = row_class ~ " " %}
->>>>>>> template/master
  {% endif %}
 
         <!-- makes row full screen width, strips margins -->
@@ -133,11 +111,7 @@ Parameters:
     {% elif "tight" in style %}
         {% set row_class = row_class ~ " lg:max-w-sm " %}
     {% elif "moderate" in style %}
-<<<<<<< HEAD
-        {% set row_class = row_class ~ " lg:mx-20 " %}
-=======
         {% set row_class = row_class ~ " mx-20 " %}
->>>>>>> template/master
     {% endif %}
 
     {% if "invert-color" in style %}
@@ -145,14 +119,8 @@ Parameters:
                 {% set row_class = row_class ~ " text-white lg:text-white " %}
 
     {% endif %}
-<<<<<<< HEAD
-
-    {% else %}
-        {% set row_class = row_class ~ " mx-12 " %}
-=======
     {% else %}
         {% set row_class = row_class ~ " " %}
->>>>>>> template/master
 {% endif %}
 
 {% set anchor_link = ""%}
@@ -165,15 +133,10 @@ Parameters:
 {% set styles = ""  %}
 {% set div_class = " " %}
 {% if bgPath %}
-<<<<<<< HEAD
-    {% set styles = "background: url('" ~ bgPath ~ "'); background-size: cover; background-position: center;"  %}
-    {% if "#desktop" in bgPath %}
-=======
     {% set background_url = page.permalink ~ bgPath %}
     {% set styles = "background: url('" ~ background_url ~ "'); background-size: cover; background-position: center;"  %}
     {% if "#desktop" in bgPath %}
         {% set bgStyle = false %}
->>>>>>> template/master
         {% set div_class = " !bg-[length:0px_0px] !bg-no-repeat lg:!bg-cover " %}
         {% set row_class = row_class | replace(from='text-white', to='text-black') %}
         {% if "invert-color" in style %}
@@ -186,11 +149,8 @@ Parameters:
 {% if bgStyle %}
     {% if "full" in bgStyle %}
         {% set styles = styles ~ "height: -webkit-fill-available; height: 100vh;"  %}
-<<<<<<< HEAD
-=======
     {% elif "hero" in bgStyle %}
         {% set div_class = div_class ~ " -mt-24 pt-24 " %}
->>>>>>> template/master
     {% endif %}
 {% endif %}
 {% if bgColor %}
@@ -198,11 +158,6 @@ Parameters:
     {% set row_class = row_class ~ " py-0 " %}
 {% endif %}
 
-<<<<<<< HEAD
-
-<div id="{{anchor_link}}" class="{{'w-screen justify-center flex ' ~ div_class}}" style="{{styles}}">
-    <div class="{{row_class}}" style="width: -webkit-fill-available"> 
-=======
 <!-- Cancels page margins so that rows can have separate margins -->
 {% set no_margins = " -mx-8 md:-mx-12 lg:-mx-16 xl:-mx-20" %}
 
@@ -210,7 +165,6 @@ Parameters:
 <div id="{{anchor_link}}" class="{{'w-screen relative justify-center flex ' ~ div_class ~ no_margins}}" style="{{styles}}">
     <div class="{{row_class}}" style="min-width: -webkit-fill-available; min-width: -moz-available"> 
         
->>>>>>> template/master
         {% for column in columns%} 
 
             <!-- Hides empty columns if displayed vertically in small screen -->

templates/shortcodes/space.html

@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-<div class="h-20 lg:h-52"></div>
-=======
 
 {% set height = 52 %}
 {% if size %}
@@ -8,5 +5,4 @@
         {% set height = 28 %}
     {% endif %}
 {% endif %}
-<div class="h-20 lg:h-{{height}}"></div>
->>>>>>> template/master
+<div class="h-20 lg:h-{{height}}"></div>