fix other catalog path URLs

src/_includes/docs/catalogpage-material-2.html → src/_includes/docs/catalogpage-material.html

@@ -1,3 +1,4 @@
+<!-- Material 3 Catalog Page -->
 {% for section in site.data.catalog.index %}
     {% if section.name == include.category %}
         {% assign category = section %}
@@ -17,30 +18,10 @@
     </ul>
     {% endif -%}
 
-    <p>{{ category.pagecontent }}</p>
-
-    <p>See more widgets in the <a href="{{site.url}}/development/ui/widgets">widget catalog</a>.</p>
+    <p> {{ category.pagecontent }}</p>
 
     {% assign components = site.data.catalog.widgets | where_exp:"comp","comp.categories contains include.category" -%}
 
-    {% if components.size != 0 -%}
-        <div class="card-deck card-deck--responsive">
-            {% for comp in components -%}
-                <div class="card">
-                    <a href="{{comp.link}}">
-                        <div class="card-image-holder">
-                            {{comp.image}}
-                        </div>
-                    </a>
-                    <div class="card-body">
-                        <a href="{{comp.link}}"><header class="card-title">{{comp.name}}</header></a>
-                        <p class="card-text">{{ comp.description | truncatewords: 25 }}</p>
-                    </div>
-                </div>
-            {% endfor -%}
-        </div>
-    {% endif -%}
-
     {% if category.subcategories and category.subcategories.size != 0 -%}
     {% for sub in category.subcategories -%}
         {% assign components = site.data.catalog.widgets | where_exp:"comp","comp.subcategories contains sub.name" -%}
@@ -50,12 +31,15 @@ <h2 id="{{sub.name}}">{{sub.name}}</h2>
             {% for comp in components -%}
                 <div class="card">
                     <a href="{{comp.link}}">
-                        <div class="card-image-holder">
-                            {{comp.image}}
+                        <div class="card-image-holder-material-3" style="--bg-color: {{sub.color}}">
+                                {{ comp.image }}
+                            <div class="card-image-material-3-hover">
+                                {{ comp.hoverimage }}
+                            </div>
                         </div>
                     </a>
                     <div class="card-body">
-                        <a href="{{comp.link}}"><header class="card-title">{{comp.name}}</header></a>
+                        <a href="{{comp.link}}"><header class="card-title card-title-material-3">{{comp.name}}</header></a>
                         <p class="card-text">{{ comp.description | truncatewords: 25 }}</p>
                     </div>
                 </div>
@@ -65,5 +49,5 @@ <h2 id="{{sub.name}}">{{sub.name}}</h2>
     {% endfor -%}
     {% endif -%}
 
-    <p>See more widgets in the <a href="{{site.url}}/development/ui/widgets">widget catalog</a>.</p>
+    <p>Check out more widgets in the <a href="{{site.url}}/development/ui/widgets">widget catalog</a>.</p>
 </div>

src/_includes/docs/catalogpage.html

@@ -1,4 +1,3 @@
-<!-- Material 3 Catalog Page -->
 {% for section in site.data.catalog.index %}
     {% if section.name == include.category %}
         {% assign category = section %}
@@ -18,10 +17,30 @@
     </ul>
     {% endif -%}
 
-    <p> {{ category.pagecontent }}</p>
+    <p>{{ category.pagecontent }}</p>
+
+    <p>See more widgets in the <a href="{{site.url}}/development/ui/widgets">widget catalog</a>.</p>
 
     {% assign components = site.data.catalog.widgets | where_exp:"comp","comp.categories contains include.category" -%}
 
+    {% if components.size != 0 -%}
+        <div class="card-deck card-deck--responsive">
+            {% for comp in components -%}
+                <div class="card">
+                    <a href="{{comp.link}}">
+                        <div class="card-image-holder">
+                            {{comp.image}}
+                        </div>
+                    </a>
+                    <div class="card-body">
+                        <a href="{{comp.link}}"><header class="card-title">{{comp.name}}</header></a>
+                        <p class="card-text">{{ comp.description | truncatewords: 25 }}</p>
+                    </div>
+                </div>
+            {% endfor -%}
+        </div>
+    {% endif -%}
+
     {% if category.subcategories and category.subcategories.size != 0 -%}
     {% for sub in category.subcategories -%}
         {% assign components = site.data.catalog.widgets | where_exp:"comp","comp.subcategories contains sub.name" -%}
@@ -31,15 +50,12 @@ <h2 id="{{sub.name}}">{{sub.name}}</h2>
             {% for comp in components -%}
                 <div class="card">
                     <a href="{{comp.link}}">
-                        <div class="card-image-holder-material-3" style="--bg-color: {{sub.color}}">
-                                {{ comp.image }}
-                            <div class="card-image-material-3-hover">
-                                {{ comp.hoverimage }}
-                            </div>
+                        <div class="card-image-holder">
+                            {{comp.image}}
                         </div>
                     </a>
                     <div class="card-body">
-                        <a href="{{comp.link}}"><header class="card-title card-title-material-3">{{comp.name}}</header></a>
+                        <a href="{{comp.link}}"><header class="card-title">{{comp.name}}</header></a>
                         <p class="card-text">{{ comp.description | truncatewords: 25 }}</p>
                     </div>
                 </div>
@@ -49,5 +65,5 @@ <h2 id="{{sub.name}}">{{sub.name}}</h2>
     {% endfor -%}
     {% endif -%}
 
-    <p>Check out more widgets in the <a href="{{site.url}}/development/ui/widgets">widget catalog</a>.</p>
+    <p>See more widgets in the <a href="{{site.url}}/development/ui/widgets">widget catalog</a>.</p>
 </div>

src/development/ui/widgets/material.md

@@ -5,4 +5,4 @@ description: >
   A catalog of Flutter's widgets implementing Material 3 design guidelines.
 ---
 
-{% include docs/catalogpage.html category="Material Components" %}
+{% include docs/catalogpage-material.html category="Material Components" %}

src/development/ui/widgets/material2.md

@@ -13,4 +13,4 @@ description: >
   A catalog of Flutter's widgets implementing the Material 2 design guidelines.
 ---
 
-{% include docs/catalogpage-material-2.html category="Material 2 Components" %}
+{% include docs/catalogpage.html category="Material 2 Components" %}