templates-bootstrapclass: cleaning up xs sizes on cols - missed after…

… update
liqd · May 26, 2020 · 1bc7e80 · 1bc7e80
1 parent ecb8b34
commit 1bc7e80
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 18 deletions.
diff --git a/euth/communitydebate/templates/euth_communitydebate/topic_form.html b/euth/communitydebate/templates/euth_communitydebate/topic_form.html
@@ -117,10 +117,10 @@ <h3>{% trans 'Downloads' %}</h3>
             {% block additional_fields %}{% endblock %}
             {% block post_form %}
             <div class="row button-row">
-                <div class="col-xs-6 col-sm-2">
+                <div class="col-6 col-sm-2">
                     <button type="submit" class="submit-button">{% trans 'post'%}</button>
                 </div>
-                <div class="col-xs-6">
+                <div class="col-6">
                     {% if mode == 'create' %}
                     <a href="{% url 'project-detail' project.slug %}" class="cancel-button">{% trans 'cancel'%}</a>
                     {% elif mode == 'update' %}

diff --git a/euth/ideas/templates/euth_ideas/idea_form.html b/euth/ideas/templates/euth_ideas/idea_form.html
@@ -81,10 +81,10 @@ <h3 class="sans-serif">
             {% block additional_fields %}{% endblock %}
             {% block post_form %}
             <div class="row button-row">
-                <div class="col-xs-6 col-sm-2">
+                <div class="col-6 col-sm-2">
                     <button type="submit" class="submit-button">{% trans 'post'%}</button>
                 </div>
-                <div class="col-xs-6">
+                <div class="col-6">
                     {% if mode == 'create' %}
                     <a href="{% url 'project-detail' project.slug %}" class="cancel-button">{% trans 'cancel'%}</a>
                     {% elif mode == 'update' %}

diff --git a/euth/maps/templates/euth_maps/mapidea_form.html b/euth/maps/templates/euth_maps/mapidea_form.html
@@ -15,10 +15,10 @@
 {% endblock %}
 {% block post_form %}
 <div class="row button-row">
-    <div class="col-xs-6 col-sm-2">
+    <div class="col-6 col-sm-2">
         <button type="submit" class="submit-button">{% trans 'post'%}</button>
     </div>
-    <div class="col-xs-6">
+    <div class="col-6">
         {% if mode == 'create' %}
         <a href="{% url 'project-detail' project.slug %}" class="cancel-button">{% trans 'cancel'%}</a>
         {% elif mode == 'update' %}
@@ -27,4 +27,3 @@
     </div>
 </div>
 {% endblock %}
-
diff --git a/euth/offlinephases/templates/euth_offlinephases/offlinephase_form.html b/euth/offlinephases/templates/euth_offlinephases/offlinephase_form.html
@@ -107,7 +107,7 @@ <h3>{% trans 'Downloads' %}</h3>
 
         {% block post_form %}
         <div class="row button-row">
-            <div class="col-xs-6 col-sm-2">
+            <div class="col-6 col-sm-2">
                 <button type="submit" class="submit-button">{% trans 'Save changes' %}</button>
             </div>
         </div>

diff --git a/euth/projects/templates/euth_projects/includes/project_tile.html b/euth/projects/templates/euth_projects/includes/project_tile.html
@@ -21,10 +21,10 @@
         <h2 class="project-tile-title"><a href="{% url 'project-detail' project.slug %}" {% if open_in_new_tab %}target="_blank"{% endif %}>{{ project }}</a></h2>
         <p class="project-tile-teaser">{{ project.description|truncatechars:200 }}</p>
         <div class="row project-tile-org">
-            <div class="col-md-2 col-sm-2 col-xs-2 project-tile-org-image">
+            <div class="col-md-2 col-2 project-tile-org-image">
                 <img src="{{ project.organisation.logo|thumbnail_url:'org_avatar_medium' }}" class="project-tile-org-avatar" height="30" width="30" />
             </div>
-            <a href="{% url 'organisation-detail' project.organisation.slug %}" class="col-md-10 col-sm-10 col-xs-10 project-tile-org-name" {% if open_in_new_tab %}target="_blank"{% endif %}>{{ project.organisation.name }}</a>
+            <a href="{% url 'organisation-detail' project.organisation.slug %}" class="col-10 project-tile-org-name" {% if open_in_new_tab %}target="_blank"{% endif %}>{{ project.organisation.name }}</a>
         </div>
     </div>
 </div>
diff --git a/euth_wagtail/assets/scss/components/_projects.scss b/euth_wagtail/assets/scss/components/_projects.scss
@@ -123,13 +123,11 @@
     min-height: 0;
     display: block;
 
-    .col-md-9,
-    .col-xs-11 {
+    .col-md-9 {
         padding-left: 0;
     }
 
-    .col-md-1,
-    .col-xs-1 {
+    .col-md-1 {
         padding-right: 10px;
         padding-left: 0;
     }

diff --git a/euth_wagtail/assets/scss/core/_buttons.scss b/euth_wagtail/assets/scss/core/_buttons.scss
@@ -202,7 +202,7 @@ span.btn-dark:focus {
     }
 
     @media (min-width: $screen-xs) {
-        .col-xs-6 {
+        .col-6 {
             width: auto;
         }
     }

diff --git a/home/templates/home/blocks/page_collection_block.html b/home/templates/home/blocks/page_collection_block.html
@@ -3,14 +3,14 @@
     <h2 class="h5 sans-serif"
         id="{{ self.title|slugify }}">{{ self.title }}</h2>
     <div class="row">
-        <div class="col-xs-3">
+        <div class="col-sm-3">
             {% image self.image width-270 as image %}
             <img src="{{ image.url }}" alt="" class="img-fluid">
         </div>
-        <div class="col-xs-4">
+        <div class="col-sm-4">
             <p>{{ self.intro_text }}</p>
         </div>
-        <div class="col-xs-5">
+        <div class="col-sm-5">
             <ul class="linklist">
                 {% for page in self.pages %}
                     {% if page %}