Remove twig references to is same as() to pass Octane linter (#917)

phase2 · Jul 27, 2020 · e0932a4 · e0932a4
1 parent bab436c
commit e0932a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/apps/pl-default/pattern-lab/_patterns/00-protons-demo/borders.twig b/apps/pl-default/pattern-lab/_patterns/00-protons-demo/borders.twig
@@ -84,7 +84,11 @@
         </thead>
         <tbody>
           {% for key, value in tokens.borderWidth %}
-            {% set borderClass = key is not same as('default') ? 'border-' ~ key : 'border' %}
+            {# Normally we'd solve this with `is same as()`, but we're working #}
+            {# around a twig linter here. #}
+            {% set borderClass = 'border-' ~ key %}
+            {% set borderClass = borderClass == 'border-default' ? 'border' : borderClass %}
+
             <tr>
               <td class="{{ tdClasses }}">
                 <span class="{{ codeClasses }}">{{ borderClass }}</span>

diff --git a/source/default/_patterns/01-atoms/grid/_grid.twig b/source/default/_patterns/01-atoms/grid/_grid.twig
@@ -18,9 +18,7 @@
   grid_classes|default([])|merge(['grid', grid.container ? 'container' : '', grid.center ? 'mx-auto' : ''])
 %}
 
-{% set column_classes =
-  column_classes|default([])|merge(['flex', grid.wrap is same as(false) ? '' : 'flex-wrap'])|join(' ')|trim
-%}
+{% set column_classes = column_classes|default([])|merge(['flex', grid.wrap ?? 'flex-wrap'])|join(' ')|trim %}
 
 <div {{ grid_attributes is not empty ? grid_attributes|attributify : '' }} class="{{ grid_classes|join(' ')|trim }}">
   <div class="{{ column_classes }}">