From d38c3c662ef30d6a3bb1dc081b07f07b0da7afa1 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Sat, 23 Dec 2017 19:30:00 -0600
Subject: [PATCH] Remove (first) sort label, replace (last) with icon

---
 _locales/en/messages.json |  8 --------
 manage/manage.css         | 11 +++--------
 manage/sort.js            |  5 +----
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index b74809ca..37cb43ba 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -848,14 +848,6 @@
     "message": "oldest first",
     "description": "Text added to indicate that sorting a date would add the oldest entries at the top"
   },
-  "sortLabelFirst": {
-    "message": "first",
-    "description": "Text added to indicate that entry with a disabled or usercss label will be sorted first (at the top)"
-  },
-  "sortLabelLast": {
-    "message": "last",
-    "description": "Text added to indicate that entry with a disabled or usercss label will be sorted last (at the bottom)"
-  },
   "sortLabelTitleAsc": {
     "message": "Title Ascending",
     "description": "Text added to option group to indicate a block of options that apply a title ascending (A to Z) sort"
diff --git a/manage/manage.css b/manage/manage.css
index f0360979..d5f27649 100644
--- a/manage/manage.css
+++ b/manage/manage.css
@@ -848,7 +848,7 @@ input[id^="manage.newUI"] {
 
 #sort-wrapper .sorter-selection {
   position: relative;
-  max-width: calc(100% - 15px);
+  width: calc(100% - 15px);
 }
 
 #search, #sort-select {
@@ -866,6 +866,7 @@ input[id^="manage.newUI"] {
 
 #sort-select {
   padding-right: 18px;
+  width: 100%;
 }
 
 #search-help, #sorter-help {
@@ -972,13 +973,7 @@ input[id^="manage.newUI"] {
 }
 
 #sort-select {
-  font-family: 'sorticon', arial;
-  speak: none;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
+  font-family: 'sorticon', Arial;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
diff --git a/manage/sort.js b/manage/sort.js
index 98f61709..2e151888 100644
--- a/manage/sort.js
+++ b/manage/sort.js
@@ -88,8 +88,6 @@ var sorter = (() => {
       disabled: t('genericDisabledLabel'),
       dateNew: ` (${t('sortDateNewestFirst')})`,
       dateOld: ` (${t('sortDateOldestFirst')})`,
-      labelFirst: ` (${t('sortLabelFirst')})`,
-      labelLast: ` (${t('sortLabelLast')})`,
       groupAsc: t('sortLabelTitleAsc'),
       groupDesc: t('sortLabelTitleDesc')
     };
@@ -111,8 +109,7 @@ var sorter = (() => {
           return acc + (acc !== '' ? ' + ' : '') + tagData[val].text;
         }
         if (lastTag.indexOf('date') > -1) return acc + meta[val === 'desc' ? 'dateNew' : 'dateOld'];
-        if (lastTag === 'disabled') return acc + meta[val === 'desc' ? 'enabled' : 'disabled'] + meta['labelFirst'];
-        if (lastTag !== 'title') return acc + meta[val === 'desc' ? 'labelLast' : 'labelFirst'];
+        if (lastTag === 'disabled') return acc + meta[val === 'desc' ? 'enabled' : 'disabled'];
         return acc + (meta[val] || '');
       }, '');
       opt.value = sort;