Use default autosizing width of button for sort dropdown

WeblateOrg · May 2, 2020 · 461f014 · 461f014
1 parent 6d6ead7
commit 461f014
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/weblate/static/style-bootstrap.css b/weblate/static/style-bootstrap.css
@@ -475,16 +475,12 @@ legend {
     }
 }
 #query-sort-toggle {
-    width: 40px;
-    padding-left: 0;
-    padding-right: 0;
+    padding-left: 1rem;
+    padding-right: 1rem;
 }
 #query-sort-toggle span:not(.active) {
     display: none;
 }
-#query-sort-dropdown {
-    width: 200px;
-}
 #is-exact span {
     margin: 4px 4px 0 4px;
 }

diff --git a/weblate/templates/snippets/query-field.html b/weblate/templates/snippets/query-field.html
@@ -30,8 +30,8 @@
   <div class="col-sm-3">
     <div class="form-group">
       <div class="search-group sort-field" role="group">
-        <div class="input-group">
-          <div class="input-group-btn">
+        <div class="btn-group">
+          <div class="btn-group">
             <button type="button" id="query-sort-dropdown" class="btn btn-default dropdown-toggle search-field" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               {% if sort_name %}
               <span class="search-label">{{ sort_name }}</span>
@@ -43,14 +43,14 @@
             <input type="hidden" id="id_sort_by" name="sort_by" value="{{ sort_query|default:'position,-priority' }}" aria-label="{% trans "Sort By" %}" />
             <input type="hidden" id="id_sort_direction" name="sort_by_direction" value="{{ sort_direction|default:'' }}" aria-label="{% trans "Sort By" %}" />
             <ul class="dropdown-menu">
-              <li><a data-sort="position,-priority">{% trans "Position and Priority" %}</a></li>
+              <li><a data-sort="position,-priority">{% trans "Position and priority" %}</a></li>
               <li><a data-sort="position">{% trans "Position" %}</a></li>
               <li><a data-sort="priority">{% trans "Priority" %}</a></li>
               <li><a data-sort="num_words">{% trans "Word count" %}</a></li>
               <li><a data-sort="context">{% trans "Context" %}</a></li>
             </ul>
           </div>
-          <span class="input-group-btn">
+          <span class="btn-group">
             <button type="button" id="query-sort-toggle" class="btn btn-default search-field">
               <span class="search-label asc {% if not sort_direction %}active{% endif %}">
                 {% icon "sort-ascending.svg" %}

diff --git a/weblate/utils/views.py b/weblate/utils/views.py
@@ -87,12 +87,12 @@ def get_sort_name(request):
         "priority": _("Priority"),
         "num_words": _("Word count"),
         "context": _("Context"),
-        "position,-priority": _("Position and Priority"),
+        "position,-priority": _("Position and priority"),
     }
     result = {
         "query": request.GET.get("sort_by", "position,-priority"),
         "name": sort_dict.get(
-            request.GET.get("sort_by", ""), _("Position and Priority")
+            request.GET.get("sort_by", ""), _("Position and priority")
         ),
         "direction": request.GET.get("sort_by_direction", ""),
     }