From 86ff2136f7dede29af0da0011acf793efba6ebeb Mon Sep 17 00:00:00 2001
From: --headM <amanitoussaintgreen@gmail.com>
Date: Wed, 4 Mar 2020 19:46:51 -0500
Subject: [PATCH 1/6] Added Abbreviations and Ellispis-Based Truncation

Added shortening of titles based on OED abbreviations
Added ellispsis-based truncation

Truncation currently removes ability to break text at word boundaries (haven't found a way to resolve this).
---
 package-lock.json          |   5 +
 package.json               |   1 +
 src/components/Class.vue   |  36 +++-
 src/utils/abbreviations.js | 330 +++++++++++++++++++++++++++++++++++++
 4 files changed, 366 insertions(+), 6 deletions(-)
 create mode 100644 src/utils/abbreviations.js

diff --git a/package-lock.json b/package-lock.json
index f363baa8..d0faff4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16102,6 +16102,11 @@
         "vue-template-es2015-compiler": "^1.6.0"
       }
     },
+    "vue-line-clamp": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/vue-line-clamp/-/vue-line-clamp-1.3.2.tgz",
+      "integrity": "sha512-SuZlRDBKsTlMOSLsJsceJPM7Sd2wcaKayyMEsf65b33chuK1zgTIU1RqlbAXSxO2R+FOQV5rYHLiAopdwVjroQ=="
+    },
     "vue-loader": {
       "version": "15.7.0",
       "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.0.tgz",
diff --git a/package.json b/package.json
index ce6b97f4..0eef9cfe 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "ua-parser-js": "^0.7.19",
     "vue-context": "^3.4.0",
     "vue-cookies": "^1.5.12",
+    "vue-line-clamp": "^1.3.2",
     "vue-router": "^3.0.4",
     "vue-scrolling-table": "^0.2.2",
     "vuetify": "^1.5.12",
diff --git a/src/components/Class.vue b/src/components/Class.vue
index cddd18de..91c83f93 100644
--- a/src/components/Class.vue
+++ b/src/components/Class.vue
@@ -33,16 +33,16 @@
             <v-icon style="margin: 4px" small @click="$store.commit('removeClass', {classInfo: classInfo, classIndex: classIndex}); $event.stopPropagation();">
               cancel
             </v-icon>
-            <v-card-text class="card-text">
-              <span style="font-weight: bold; font-size: 1.1em;">{{ classInfo.id }}</span> {{ classInfo.title }}
+            <v-card-text class="card-text" ref="title" v-line-clamp:20="3">
+            	<span style="font-weight: bold; font-size: 1.1em;">{{ classInfo.id }}</span> {{ shortenedTitle }}
             </v-card-text>
           </div>
         </v-card>
-        <v-btn v-if="warnings.length>0&&(!classInfo.overrideWarnings||hover)" slot="badge" icon @click="warningDialog = true">
+        <!--<v-btn v-if="warnings.length>0&&(!classInfo.overrideWarnings||hover)" slot="badge" icon @click="warningDialog = true">
           <v-icon medium>
             warning
           </v-icon>
-        </v-btn>
+        </v-btn>-->
       </v-badge>
     </v-hover>
     <v-dialog v-model="warningDialog" max-width="600">
@@ -74,6 +74,12 @@
 
 <script>
 import colorMixin from './../mixins/colorMixin.js';
+import Vue from 'vue';
+import lineClamp from 'vue-line-clamp';
+import {abbreviations} from './../utils/abbreviations.js';
+
+Vue.use(lineClamp, {});
+const abbrevChar = '.';
 
 export default {
   name: 'Class',
@@ -99,7 +105,7 @@ export default {
   data () {
     return {
       warningDialog: false,
-      shouldOverrideWarnings: this.classInfo.overrideWarnings
+	  shouldOverrideWarnings: this.classInfo.overrideWarnings
     };
   },
   methods: {
@@ -119,7 +125,25 @@ export default {
     },
     cardClass: function (classInfo) {
       return `classbox ${this.courseColor(classInfo)}`;
-    }
+	}
+  },
+  computed: {
+    shortenedTitle: function(){
+      var title = this.classInfo.title.split(/([^A-Za-z])/);//Keep separators
+      var words = [];
+      for(const word of title){
+        let lookup = word.toLowerCase();
+        let abbr = abbreviations[lookup];
+        if(abbr){
+          //Match capitalization
+          words.push(word.charAt(0) === lookup.charAt(0) ? abbr : abbr.charAt(0).toUpperCase() + abbr.slice(1) + abbrevChar);
+        }
+        else{
+          words.push(word);
+        }
+	  }
+	  return words.join('');
+	}
   }
 };
 </script>
diff --git a/src/utils/abbreviations.js b/src/utils/abbreviations.js
new file mode 100644
index 00000000..4b052d40
--- /dev/null
+++ b/src/utils/abbreviations.js
@@ -0,0 +1,330 @@
+const abbreviations = {
+	'and': '&',
+	'i': '1',
+	'ii': '2',
+	'iii': '3',
+	'iv': '4',
+	'v': '5',
+    'vi': '6',
+    'undergraduate': 'undergrad',
+    'materials': 'mat',
+    'computer': 'comp',
+
+	'special': 'spec',
+	'engineering': 'engin',
+	'subject': 'subj',
+	'science': 'sci',
+	'introduction': 'intro',
+	'advanced': 'adv',
+	'research': 'res',
+	'technology': 'tech',
+	'management': 'managem',
+	'studies': 'stud',
+	'biology': 'bio',
+	'analysis': 'anal',
+	'development': 'dev',
+	'history': 'hist',
+	'economics': 'econ',
+	'laboratory': 'lab',
+	'principles': 'princ',
+	'methods': 'meth',
+	'sciences': 'sci',
+	'architecture': 'archit',
+	'writing': 'writ',
+	'practice': 'pract',
+	'chemistry': 'chem',
+	'chemical': 'chem',
+	'electrical': 'elec',
+	'society': 'soc',
+	'fundamentals': 'fund',
+	'mechanics': 'mech',
+	'biological': 'bio',
+	'modern': 'mod',
+	'literature': 'lit',
+	'music': 'mus',
+	'communication': 'communic',
+	'political': 'poli',
+	'politics': 'poli',
+	'nuclear': 'nuc',
+	'american': 'amer',
+	'mechanical': 'mech',
+	'public': 'pub',
+	'applications': 'applic',
+	'applied': 'appl',
+	'system': 'syst',
+	'oceanography': 'oceanogr',
+	'international': 'internat',
+	'philosophy': 'philos',
+	'language': 'lang',
+	'medical': 'med',
+	'comparative': 'compar',
+	'from': 'fr',
+	'economic': 'econ',
+	'mathematics': 'math',
+	'building': 'build',
+	'structural': 'struct',
+	'medicine': 'med',
+	'structure': 'struct',
+	'geology': 'geol',
+	'statistical': 'statist',
+	'french': 'fr',
+	'probability': 'prob',
+	'spanish': 'span',
+	'evolution': 'evol',
+	'foundations': 'found',
+	'experimental': 'exper',
+	'selected': 'sel',
+	'practical': 'pract',
+	'manufacturing': 'manuf',
+	'machine': 'mach',
+	'america': 'amer',
+	'architectural': 'archit',
+	'contemporary': 'contemp',
+	'ancient': 'anc',
+	'introductory': 'introd',
+	'anthropology': 'anthropol',
+	'industrial': 'industr',
+	'present': 'pres',
+	'east': 'e',
+	'mathematical': 'math',
+	'latin': 'lat',
+	'japanese': 'jap',
+	'calculus': 'calc',
+	'ecology': 'ecol',
+	'regular': 'reg',
+	'geometry': 'geom',
+	'organic': 'org',
+	'product': 'prod',
+	'naval': 'nav',
+	'german': 'ger',
+	'composition': 'compos',
+	'photography': 'photogr',
+	'intelligence': 'intell',
+	'microbiology': 'microbiol',
+	'disease': 'dis',
+	'theoretical': 'theoret',
+	'future': 'fut',
+	'education': 'educ',
+	'work': 'wk',
+	'africa': 'afr',
+	'physiology': 'physiol',
+	'portuguese': 'port',
+	'linguistics': 'ling',
+	'properties': 'prop',
+	'clinical': 'clin',
+	'popular': 'pop',
+	'century': 'cent',
+	'criticism': 'crit',
+	'machines': 'mach',
+	'russian': 'russ',
+	'revolution': 'revol',
+	'languages': 'langs',
+	'good': 'gd',
+	'conflict': 'confl',
+	'classical': 'class',
+	'natural': 'nat',
+	'medieval': 'med',
+	'aeronautics': 'aeronaut',
+	'astronautics': 'astronaut',
+	'algebra': 'alg',
+	'narrative': 'narrat',
+	'hydrology': 'hydrol',
+	'general': 'gen',
+	'artificial': 'artific',
+	'measurement': 'measurem',
+	'linguistic': 'ling',
+	'critical': 'crit',
+	'south': 's',
+	'rhetoric': 'rhet',
+	'magnetic': 'magn',
+	'related': 'rel',
+	'diseases': 'dis',
+	'school': 'sch',
+	'spectroscopy': 'spectrosc',
+	'educational': 'educ',
+	'investment': 'investm',
+	'military': 'milit',
+	'western': 'west',
+	'advances': 'adv',
+	'biochemical': 'biochem',
+	'technical': 'techn',
+	'immunology': 'immunol',
+	'inquiry': 'inq',
+	'electric': 'electr',
+	'knowledge': 'knowl',
+	'geometric': 'geom',
+	'objects': 'obj',
+	'phonology': 'phonol',
+	'exploration': 'explor',
+	'problem': 'probl',
+	'elements': 'elem',
+	'astronomy': 'astron',
+	'psychology': 'psychol',
+	'method': 'meth',
+	'communications': 'communic',
+	'shakespeare': 'shaks',
+	'optics': 'opt',
+	'ecological': 'ecol',
+	'industry': 'ind',
+	'construction': 'constr',
+	'college': 'coll',
+	'discovery': 'discov',
+	'india': 'ind',
+	'aerodynamics': 'aerodynam',
+	'past': 'pa',
+	'african': 'afr',
+	'animals': 'anim',
+	'literary': 'lit',
+	'musical': 'mus',
+	'memoir': 'mem',
+	'metallurgy': 'metall',
+	'inorganic': 'inorg',
+	'biochemistry': 'biochem',
+	'pathology': 'pathol',
+	'philosophical': 'philos',
+	'products': 'prod',
+	'archaeological': 'archaeol',
+	'geomorphology': 'geomorphol',
+	'series': 'ser',
+	'congress': 'congr',
+	'number': 'no',
+	'element': 'elem',
+	'family': 'fam',
+	'academic': 'acad',
+	'english': 'eng',
+	'conversation': 'conversat',
+	'north': 'n',
+	'anatomy': 'anat',
+	'word': 'wd',
+	'ceramics': 'ceram',
+	'selection': 'select',
+	'archaeology': 'archaeol',
+	'oceanographic': 'oceanogr',
+	'sociology': 'sociol',
+	'geographic': 'geogr',
+	'petrology': 'petrol',
+	'record': 'rec',
+	'seismology': 'seismol',
+	'technological': 'technol',
+	'essential': 'essent',
+	'analytical': 'analyt',
+	'navigation': 'navig',
+	'historical': 'hist',
+	'between': 'betw',
+	'russia': 'russ',
+	'year': 'yr',
+	'analytic': 'analyt',
+	'cryptography': 'cryptogr',
+	'religion': 'relig',
+	'translation': 'transl',
+	'intellectual': 'intellect',
+	'books': 'bks',
+	'authors': 'auth',
+	'museum': 'mus',
+	'metaphysics': 'metaph',
+	'evolutionary': 'evol',
+	'affairs': 'aff',
+	'reproductive': 'reprod',
+	'concrete': 'concr',
+	'limnology': 'limnol',
+	'pharmaceutical': 'pharmaceut',
+	'metropolis': 'metrop',
+	'representing': 'repr',
+	'against': 'agst',
+	'property': 'prop',
+	'scientific': 'sci',
+	'great': 'gt',
+	'terrestrial': 'terrestr',
+	'lectures': 'lect',
+	'magnetism': 'magn',
+	'geological': 'geol',
+	'influence': 'infl',
+	'junior': 'jun',
+	'constitutional': 'constit',
+	'doctrine': 'doctr',
+	'king': 'k',
+	'traditional': 'trad',
+	'works': 'wks',
+	'indian': 'ind',
+	'invention': 'invent',
+	'pronunciation': 'pronunc',
+	'italian': 'ital',
+	'roman': 'rom',
+	'british': 'brit',
+	'interpretation': 'interpr',
+	'chamber': 'chamb',
+	'autobiography': 'autobiogr',
+	'essay': 'ess',
+	'biography': 'biogr',
+	'book': 'bk',
+	'apocalyptic': 'apoc',
+	'dissertation': 'diss',
+	'morphology': 'morphol',
+	'furniture': 'furnit',
+	'application': 'applic',
+	'psychological': 'psychol',
+	'imagination': 'imag',
+	'archives': 'arch',
+	'agriculture': 'agric',
+	'pharmacology': 'pharmacol',
+	'inventions': 'invent',
+	'evaluation': 'eval',
+	'assembly': 'assemb',
+	'geography': 'geogr',
+	'transactions': 'trans',
+	'southern': 's',
+	'geologic': 'geol',
+	'origin': 'orig',
+	'observations': 'observ',
+	'hydraulic': 'hydraul',
+	'tropical': 'trop',
+	'meteorology': 'meteorol',
+	'commerce': 'comm',
+	'collective': 'collect',
+	'prediction': 'predict',
+	'central': 'cent',
+	'fundamental': 'fund',
+	'journal': 'jrnl',
+	'article': 'art',
+	'reflection': 'refl',
+	'review': 'rev',
+	'lecture': 'lect',
+	'several': 'sev',
+	'measure': 'meas',
+	'arithmetic': 'arithm',
+	'instruction': 'instr',
+	'england': 'eng',
+	'calligraphy': 'calligr',
+	'expository': 'expos',
+	'brazilian': 'braz',
+	'lines': 'll',
+	'west': 'w',
+	'survey': 'surv',
+	'tradition': 'trad',
+	'saints': 'ss',
+	'publication': 'publ',
+	'republic': 'repub',
+	'original': 'orig',
+	'accounts': 'accts',
+	'antiquity': 'antiq',
+	'london': 'lond',
+	'grammar': 'gram',
+	'familiar': 'famil',
+	'palaeontology': 'palaeontol',
+	'meeting': 'mtg',
+	'assemblies': 'assemb',
+	'march': 'mar',
+	'vegetable': 'veg',
+	'intelligent': 'intell',
+	'experiment': 'exper',
+	'orders': 'ord',
+	'animal': 'anim',
+	'nervous': 'nerv',
+	'electricity': 'electr',
+	'certificate': 'certif',
+	'exercise': 'exerc',
+	'physiological': 'physiol',
+	'company': 'comp'
+};
+
+export {abbreviations};
\ No newline at end of file

From cd1371bfffe3c55270337b689f4099d0cc99c190 Mon Sep 17 00:00:00 2001
From: HeadMerchant <amanitoussaintgreen@gmail.com>
Date: Thu, 9 Apr 2020 16:21:04 -0700
Subject: [PATCH 2/6] Removed Dependence on vue-line-clamp

Can now specify abbreviations that won't be abbreviated by a '.'
No longer using line-clamp
Fixed ascender text peaking in classes w/ >4 lines
---
 src/components/Class.vue   |  55 ++--
 src/utils/abbreviations.js | 655 +++++++++++++++++++------------------
 2 files changed, 355 insertions(+), 355 deletions(-)

diff --git a/src/components/Class.vue b/src/components/Class.vue
index 91c83f93..528c35fc 100644
--- a/src/components/Class.vue
+++ b/src/components/Class.vue
@@ -74,12 +74,7 @@
 
 <script>
 import colorMixin from './../mixins/colorMixin.js';
-import Vue from 'vue';
-import lineClamp from 'vue-line-clamp';
-import {abbreviations} from './../utils/abbreviations.js';
-
-Vue.use(lineClamp, {});
-const abbrevChar = '.';
+import { abbreviations, nonAbbreviator } from './../utils/abbreviations.js';
 
 export default {
   name: 'Class',
@@ -105,9 +100,31 @@ export default {
   data () {
     return {
       warningDialog: false,
-	  shouldOverrideWarnings: this.classInfo.overrideWarnings
+      shouldOverrideWarnings: this.classInfo.overrideWarnings
     };
   },
+  computed: {
+    shortenedTitle: function () {
+      var title = this.classInfo.title.split(/([^A-Za-z])/);// Keep separators
+      var words = [];
+      for (const word of title) {
+        const lookup = word.toLowerCase();
+        var abbr = abbreviations[lookup];
+        if (abbr) {
+          var abbrevChar = '.';
+          if (abbr.startsWith(nonAbbreviator)) {
+            abbr = abbr.substring(nonAbbreviator.length);
+            abbrevChar = '';
+          }
+          // Match capitalization
+          words.push((word.charAt(0) === lookup.charAt(0) ? abbr : abbr.charAt(0).toUpperCase() + abbr.slice(1)) + abbrevChar);
+        } else {
+          words.push(word);
+        }
+      }
+      return words.join('');
+    }
+  },
   methods: {
     dragStart: function (event) {
       event.dataTransfer.setData('classData', JSON.stringify({ isNew: false, classInfo: this.classInfo, classIndex: this.classIndex }));
@@ -125,25 +142,7 @@ export default {
     },
     cardClass: function (classInfo) {
       return `classbox ${this.courseColor(classInfo)}`;
-	}
-  },
-  computed: {
-    shortenedTitle: function(){
-      var title = this.classInfo.title.split(/([^A-Za-z])/);//Keep separators
-      var words = [];
-      for(const word of title){
-        let lookup = word.toLowerCase();
-        let abbr = abbreviations[lookup];
-        if(abbr){
-          //Match capitalization
-          words.push(word.charAt(0) === lookup.charAt(0) ? abbr : abbr.charAt(0).toUpperCase() + abbr.slice(1) + abbrevChar);
-        }
-        else{
-          words.push(word);
-        }
-	  }
-	  return words.join('');
-	}
+    }
   }
 };
 </script>
@@ -155,14 +154,14 @@ export default {
     padding: 0;
     margin: .2em .4em 0em .2em;
     height: 100%;
+    overflow: hidden;
   }
 
   .classbox {
     display: flex;
     align-items: flex-start;
     height: 5.8em; /* Chosen for three lines in the card, working with the set padding and margins. */
-    overflow: hidden;
-    padding: .2em .4em .4em .2em;
+    padding: .2em .4em .5em .2em;
     /* Multi-line truncation is not a supported feature of CSS right now.
        Optimally, we would have multi-line truncation within the cards, but
        currently extra words are clipped.
diff --git a/src/utils/abbreviations.js b/src/utils/abbreviations.js
index 4b052d40..27188573 100644
--- a/src/utils/abbreviations.js
+++ b/src/utils/abbreviations.js
@@ -1,330 +1,331 @@
+// Abbreviations starting with '|' don't receive a delimeter (eg. '.') after them
+const nonAbbreviator = '|';
 const abbreviations = {
-	'and': '&',
-	'i': '1',
-	'ii': '2',
-	'iii': '3',
-	'iv': '4',
-	'v': '5',
-    'vi': '6',
-    'undergraduate': 'undergrad',
-    'materials': 'mat',
-    'computer': 'comp',
-
-	'special': 'spec',
-	'engineering': 'engin',
-	'subject': 'subj',
-	'science': 'sci',
-	'introduction': 'intro',
-	'advanced': 'adv',
-	'research': 'res',
-	'technology': 'tech',
-	'management': 'managem',
-	'studies': 'stud',
-	'biology': 'bio',
-	'analysis': 'anal',
-	'development': 'dev',
-	'history': 'hist',
-	'economics': 'econ',
-	'laboratory': 'lab',
-	'principles': 'princ',
-	'methods': 'meth',
-	'sciences': 'sci',
-	'architecture': 'archit',
-	'writing': 'writ',
-	'practice': 'pract',
-	'chemistry': 'chem',
-	'chemical': 'chem',
-	'electrical': 'elec',
-	'society': 'soc',
-	'fundamentals': 'fund',
-	'mechanics': 'mech',
-	'biological': 'bio',
-	'modern': 'mod',
-	'literature': 'lit',
-	'music': 'mus',
-	'communication': 'communic',
-	'political': 'poli',
-	'politics': 'poli',
-	'nuclear': 'nuc',
-	'american': 'amer',
-	'mechanical': 'mech',
-	'public': 'pub',
-	'applications': 'applic',
-	'applied': 'appl',
-	'system': 'syst',
-	'oceanography': 'oceanogr',
-	'international': 'internat',
-	'philosophy': 'philos',
-	'language': 'lang',
-	'medical': 'med',
-	'comparative': 'compar',
-	'from': 'fr',
-	'economic': 'econ',
-	'mathematics': 'math',
-	'building': 'build',
-	'structural': 'struct',
-	'medicine': 'med',
-	'structure': 'struct',
-	'geology': 'geol',
-	'statistical': 'statist',
-	'french': 'fr',
-	'probability': 'prob',
-	'spanish': 'span',
-	'evolution': 'evol',
-	'foundations': 'found',
-	'experimental': 'exper',
-	'selected': 'sel',
-	'practical': 'pract',
-	'manufacturing': 'manuf',
-	'machine': 'mach',
-	'america': 'amer',
-	'architectural': 'archit',
-	'contemporary': 'contemp',
-	'ancient': 'anc',
-	'introductory': 'introd',
-	'anthropology': 'anthropol',
-	'industrial': 'industr',
-	'present': 'pres',
-	'east': 'e',
-	'mathematical': 'math',
-	'latin': 'lat',
-	'japanese': 'jap',
-	'calculus': 'calc',
-	'ecology': 'ecol',
-	'regular': 'reg',
-	'geometry': 'geom',
-	'organic': 'org',
-	'product': 'prod',
-	'naval': 'nav',
-	'german': 'ger',
-	'composition': 'compos',
-	'photography': 'photogr',
-	'intelligence': 'intell',
-	'microbiology': 'microbiol',
-	'disease': 'dis',
-	'theoretical': 'theoret',
-	'future': 'fut',
-	'education': 'educ',
-	'work': 'wk',
-	'africa': 'afr',
-	'physiology': 'physiol',
-	'portuguese': 'port',
-	'linguistics': 'ling',
-	'properties': 'prop',
-	'clinical': 'clin',
-	'popular': 'pop',
-	'century': 'cent',
-	'criticism': 'crit',
-	'machines': 'mach',
-	'russian': 'russ',
-	'revolution': 'revol',
-	'languages': 'langs',
-	'good': 'gd',
-	'conflict': 'confl',
-	'classical': 'class',
-	'natural': 'nat',
-	'medieval': 'med',
-	'aeronautics': 'aeronaut',
-	'astronautics': 'astronaut',
-	'algebra': 'alg',
-	'narrative': 'narrat',
-	'hydrology': 'hydrol',
-	'general': 'gen',
-	'artificial': 'artific',
-	'measurement': 'measurem',
-	'linguistic': 'ling',
-	'critical': 'crit',
-	'south': 's',
-	'rhetoric': 'rhet',
-	'magnetic': 'magn',
-	'related': 'rel',
-	'diseases': 'dis',
-	'school': 'sch',
-	'spectroscopy': 'spectrosc',
-	'educational': 'educ',
-	'investment': 'investm',
-	'military': 'milit',
-	'western': 'west',
-	'advances': 'adv',
-	'biochemical': 'biochem',
-	'technical': 'techn',
-	'immunology': 'immunol',
-	'inquiry': 'inq',
-	'electric': 'electr',
-	'knowledge': 'knowl',
-	'geometric': 'geom',
-	'objects': 'obj',
-	'phonology': 'phonol',
-	'exploration': 'explor',
-	'problem': 'probl',
-	'elements': 'elem',
-	'astronomy': 'astron',
-	'psychology': 'psychol',
-	'method': 'meth',
-	'communications': 'communic',
-	'shakespeare': 'shaks',
-	'optics': 'opt',
-	'ecological': 'ecol',
-	'industry': 'ind',
-	'construction': 'constr',
-	'college': 'coll',
-	'discovery': 'discov',
-	'india': 'ind',
-	'aerodynamics': 'aerodynam',
-	'past': 'pa',
-	'african': 'afr',
-	'animals': 'anim',
-	'literary': 'lit',
-	'musical': 'mus',
-	'memoir': 'mem',
-	'metallurgy': 'metall',
-	'inorganic': 'inorg',
-	'biochemistry': 'biochem',
-	'pathology': 'pathol',
-	'philosophical': 'philos',
-	'products': 'prod',
-	'archaeological': 'archaeol',
-	'geomorphology': 'geomorphol',
-	'series': 'ser',
-	'congress': 'congr',
-	'number': 'no',
-	'element': 'elem',
-	'family': 'fam',
-	'academic': 'acad',
-	'english': 'eng',
-	'conversation': 'conversat',
-	'north': 'n',
-	'anatomy': 'anat',
-	'word': 'wd',
-	'ceramics': 'ceram',
-	'selection': 'select',
-	'archaeology': 'archaeol',
-	'oceanographic': 'oceanogr',
-	'sociology': 'sociol',
-	'geographic': 'geogr',
-	'petrology': 'petrol',
-	'record': 'rec',
-	'seismology': 'seismol',
-	'technological': 'technol',
-	'essential': 'essent',
-	'analytical': 'analyt',
-	'navigation': 'navig',
-	'historical': 'hist',
-	'between': 'betw',
-	'russia': 'russ',
-	'year': 'yr',
-	'analytic': 'analyt',
-	'cryptography': 'cryptogr',
-	'religion': 'relig',
-	'translation': 'transl',
-	'intellectual': 'intellect',
-	'books': 'bks',
-	'authors': 'auth',
-	'museum': 'mus',
-	'metaphysics': 'metaph',
-	'evolutionary': 'evol',
-	'affairs': 'aff',
-	'reproductive': 'reprod',
-	'concrete': 'concr',
-	'limnology': 'limnol',
-	'pharmaceutical': 'pharmaceut',
-	'metropolis': 'metrop',
-	'representing': 'repr',
-	'against': 'agst',
-	'property': 'prop',
-	'scientific': 'sci',
-	'great': 'gt',
-	'terrestrial': 'terrestr',
-	'lectures': 'lect',
-	'magnetism': 'magn',
-	'geological': 'geol',
-	'influence': 'infl',
-	'junior': 'jun',
-	'constitutional': 'constit',
-	'doctrine': 'doctr',
-	'king': 'k',
-	'traditional': 'trad',
-	'works': 'wks',
-	'indian': 'ind',
-	'invention': 'invent',
-	'pronunciation': 'pronunc',
-	'italian': 'ital',
-	'roman': 'rom',
-	'british': 'brit',
-	'interpretation': 'interpr',
-	'chamber': 'chamb',
-	'autobiography': 'autobiogr',
-	'essay': 'ess',
-	'biography': 'biogr',
-	'book': 'bk',
-	'apocalyptic': 'apoc',
-	'dissertation': 'diss',
-	'morphology': 'morphol',
-	'furniture': 'furnit',
-	'application': 'applic',
-	'psychological': 'psychol',
-	'imagination': 'imag',
-	'archives': 'arch',
-	'agriculture': 'agric',
-	'pharmacology': 'pharmacol',
-	'inventions': 'invent',
-	'evaluation': 'eval',
-	'assembly': 'assemb',
-	'geography': 'geogr',
-	'transactions': 'trans',
-	'southern': 's',
-	'geologic': 'geol',
-	'origin': 'orig',
-	'observations': 'observ',
-	'hydraulic': 'hydraul',
-	'tropical': 'trop',
-	'meteorology': 'meteorol',
-	'commerce': 'comm',
-	'collective': 'collect',
-	'prediction': 'predict',
-	'central': 'cent',
-	'fundamental': 'fund',
-	'journal': 'jrnl',
-	'article': 'art',
-	'reflection': 'refl',
-	'review': 'rev',
-	'lecture': 'lect',
-	'several': 'sev',
-	'measure': 'meas',
-	'arithmetic': 'arithm',
-	'instruction': 'instr',
-	'england': 'eng',
-	'calligraphy': 'calligr',
-	'expository': 'expos',
-	'brazilian': 'braz',
-	'lines': 'll',
-	'west': 'w',
-	'survey': 'surv',
-	'tradition': 'trad',
-	'saints': 'ss',
-	'publication': 'publ',
-	'republic': 'repub',
-	'original': 'orig',
-	'accounts': 'accts',
-	'antiquity': 'antiq',
-	'london': 'lond',
-	'grammar': 'gram',
-	'familiar': 'famil',
-	'palaeontology': 'palaeontol',
-	'meeting': 'mtg',
-	'assemblies': 'assemb',
-	'march': 'mar',
-	'vegetable': 'veg',
-	'intelligent': 'intell',
-	'experiment': 'exper',
-	'orders': 'ord',
-	'animal': 'anim',
-	'nervous': 'nerv',
-	'electricity': 'electr',
-	'certificate': 'certif',
-	'exercise': 'exerc',
-	'physiological': 'physiol',
-	'company': 'comp'
+  'and': nonAbbreviator + '&',
+  'i': nonAbbreviator + '1',
+  'ii': nonAbbreviator + '2',
+  'iii': nonAbbreviator + '3',
+  'iv': nonAbbreviator + '4',
+  'v': nonAbbreviator + '5',
+  'vi': nonAbbreviator + '6',
+  'undergraduate': 'undergrad',
+  'materials': 'mat',
+  'computer': 'comp',
+  'special': 'spec',
+  'engineering': 'engin',
+  'subject': 'subj',
+  'science': 'sci',
+  'introduction': 'intro',
+  'advanced': 'adv',
+  'research': 'res',
+  'technology': 'tech',
+  'management': 'managem',
+  'studies': 'stud',
+  'biology': 'bio',
+  'analysis': 'anal',
+  'development': 'dev',
+  'history': 'hist',
+  'economics': 'econ',
+  'laboratory': 'lab',
+  'principles': 'princ',
+  'methods': 'meth',
+  'sciences': 'sci',
+  'architecture': 'archit',
+  'writing': 'writ',
+  'practice': 'pract',
+  'chemistry': 'chem',
+  'chemical': 'chem',
+  'electrical': 'elec',
+  'society': 'soc',
+  'fundamentals': 'fund',
+  'mechanics': 'mech',
+  'biological': 'bio',
+  'modern': 'mod',
+  'literature': 'lit',
+  'music': 'mus',
+  'communication': 'communic',
+  'political': 'poli',
+  'politics': 'poli',
+  'nuclear': 'nuc',
+  'american': 'amer',
+  'mechanical': 'mech',
+  'public': 'pub',
+  'applications': 'applic',
+  'applied': 'appl',
+  'system': 'syst',
+  'oceanography': 'oceanogr',
+  'international': 'internat',
+  'philosophy': 'philos',
+  'language': 'lang',
+  'medical': 'med',
+  'comparative': 'compar',
+  'from': 'fr',
+  'economic': 'econ',
+  'mathematics': 'math',
+  'building': 'build',
+  'structural': 'struct',
+  'medicine': 'med',
+  'structure': 'struct',
+  'geology': 'geol',
+  'statistical': 'statist',
+  'french': 'fr',
+  'probability': 'prob',
+  'spanish': 'span',
+  'evolution': 'evol',
+  'foundations': 'found',
+  'experimental': 'exper',
+  'selected': 'sel',
+  'practical': 'pract',
+  'manufacturing': 'manuf',
+  'machine': 'mach',
+  'america': 'amer',
+  'architectural': 'archit',
+  'contemporary': 'contemp',
+  'ancient': 'anc',
+  'introductory': 'introd',
+  'anthropology': 'anthropol',
+  'industrial': 'industr',
+  'present': 'pres',
+  'east': 'e',
+  'mathematical': 'math',
+  'latin': 'lat',
+  'japanese': 'jap',
+  'calculus': 'calc',
+  'ecology': 'ecol',
+  'regular': 'reg',
+  'geometry': 'geom',
+  'organic': 'org',
+  'product': 'prod',
+  'naval': 'nav',
+  'german': 'ger',
+  'composition': 'compos',
+  'photography': 'photogr',
+  'intelligence': 'intell',
+  'microbiology': 'microbiol',
+  'disease': 'dis',
+  'theoretical': 'theoret',
+  'future': 'fut',
+  'education': 'educ',
+  'work': 'wk',
+  'africa': 'afr',
+  'physiology': 'physiol',
+  'portuguese': 'port',
+  'linguistics': 'ling',
+  'properties': 'prop',
+  'clinical': 'clin',
+  'popular': 'pop',
+  'century': 'cent',
+  'criticism': 'crit',
+  'machines': 'mach',
+  'russian': 'russ',
+  'revolution': 'revol',
+  'languages': 'langs',
+  'good': 'gd',
+  'conflict': 'confl',
+  'classical': 'class',
+  'natural': 'nat',
+  'medieval': 'med',
+  'aeronautics': 'aeronaut',
+  'astronautics': 'astronaut',
+  'algebra': 'alg',
+  'narrative': 'narrat',
+  'hydrology': 'hydrol',
+  'general': 'gen',
+  'artificial': 'artific',
+  'measurement': 'measurem',
+  'linguistic': 'ling',
+  'critical': 'crit',
+  'south': 's',
+  'rhetoric': 'rhet',
+  'magnetic': 'magn',
+  'related': 'rel',
+  'diseases': 'dis',
+  'school': 'sch',
+  'spectroscopy': 'spectrosc',
+  'educational': 'educ',
+  'investment': 'investm',
+  'military': 'milit',
+  'western': 'west',
+  'advances': 'adv',
+  'biochemical': 'biochem',
+  'technical': 'techn',
+  'immunology': 'immunol',
+  'inquiry': 'inq',
+  'electric': 'electr',
+  'knowledge': 'knowl',
+  'geometric': 'geom',
+  'objects': 'obj',
+  'phonology': 'phonol',
+  'exploration': 'explor',
+  'problem': 'probl',
+  'elements': 'elem',
+  'astronomy': 'astron',
+  'psychology': 'psychol',
+  'method': 'meth',
+  'communications': 'communic',
+  'shakespeare': 'shaks',
+  'optics': 'opt',
+  'ecological': 'ecol',
+  'industry': 'ind',
+  'construction': 'constr',
+  'college': 'coll',
+  'discovery': 'discov',
+  'india': 'ind',
+  'aerodynamics': 'aerodynam',
+  'past': 'pa',
+  'african': 'afr',
+  'animals': 'anim',
+  'literary': 'lit',
+  'musical': 'mus',
+  'memoir': 'mem',
+  'metallurgy': 'metall',
+  'inorganic': 'inorg',
+  'biochemistry': 'biochem',
+  'pathology': 'pathol',
+  'philosophical': 'philos',
+  'products': 'prod',
+  'archaeological': 'archaeol',
+  'geomorphology': 'geomorphol',
+  'series': 'ser',
+  'congress': 'congr',
+  'number': 'no',
+  'element': 'elem',
+  'family': 'fam',
+  'academic': 'acad',
+  'english': 'eng',
+  'conversation': 'conversat',
+  'north': 'n',
+  'anatomy': 'anat',
+  'word': 'wd',
+  'ceramics': 'ceram',
+  'selection': 'select',
+  'archaeology': 'archaeol',
+  'oceanographic': 'oceanogr',
+  'sociology': 'sociol',
+  'geographic': 'geogr',
+  'petrology': 'petrol',
+  'record': 'rec',
+  'seismology': 'seismol',
+  'technological': 'technol',
+  'essential': 'essent',
+  'analytical': 'analyt',
+  'navigation': 'navig',
+  'historical': 'hist',
+  'between': 'betw',
+  'russia': 'russ',
+  'year': 'yr',
+  'analytic': 'analyt',
+  'cryptography': 'cryptogr',
+  'religion': 'relig',
+  'translation': 'transl',
+  'intellectual': 'intellect',
+  'books': 'bks',
+  'authors': 'auth',
+  'museum': 'mus',
+  'metaphysics': 'metaph',
+  'evolutionary': 'evol',
+  'affairs': 'aff',
+  'reproductive': 'reprod',
+  'concrete': 'concr',
+  'limnology': 'limnol',
+  'pharmaceutical': 'pharmaceut',
+  'metropolis': 'metrop',
+  'representing': 'repr',
+  'against': 'agst',
+  'property': 'prop',
+  'scientific': 'sci',
+  'great': 'gt',
+  'terrestrial': 'terrestr',
+  'lectures': 'lect',
+  'magnetism': 'magn',
+  'geological': 'geol',
+  'influence': 'infl',
+  'junior': 'jun',
+  'constitutional': 'constit',
+  'doctrine': 'doctr',
+  'king': 'k',
+  'traditional': 'trad',
+  'works': 'wks',
+  'indian': 'ind',
+  'invention': 'invent',
+  'pronunciation': 'pronunc',
+  'italian': 'ital',
+  'roman': 'rom',
+  'british': 'brit',
+  'interpretation': 'interpr',
+  'chamber': 'chamb',
+  'autobiography': 'autobiogr',
+  'essay': 'ess',
+  'biography': 'biogr',
+  'book': 'bk',
+  'apocalyptic': 'apoc',
+  'dissertation': 'diss',
+  'morphology': 'morphol',
+  'furniture': 'furnit',
+  'application': 'applic',
+  'psychological': 'psychol',
+  'imagination': 'imag',
+  'archives': 'arch',
+  'agriculture': 'agric',
+  'pharmacology': 'pharmacol',
+  'inventions': 'invent',
+  'evaluation': 'eval',
+  'assembly': 'assemb',
+  'geography': 'geogr',
+  'transactions': 'trans',
+  'southern': 's',
+  'geologic': 'geol',
+  'origin': 'orig',
+  'observations': 'observ',
+  'hydraulic': 'hydraul',
+  'tropical': 'trop',
+  'meteorology': 'meteorol',
+  'commerce': 'comm',
+  'collective': 'collect',
+  'prediction': 'predict',
+  'central': 'cent',
+  'fundamental': 'fund',
+  'journal': 'jrnl',
+  'article': 'art',
+  'reflection': 'refl',
+  'review': 'rev',
+  'lecture': 'lect',
+  'several': 'sev',
+  'measure': 'meas',
+  'arithmetic': 'arithm',
+  'instruction': 'instr',
+  'england': 'eng',
+  'calligraphy': 'calligr',
+  'expository': 'expos',
+  'brazilian': 'braz',
+  'lines': 'll',
+  'west': 'w',
+  'survey': 'surv',
+  'tradition': 'trad',
+  'saints': 'ss',
+  'publication': 'publ',
+  'republic': 'repub',
+  'original': 'orig',
+  'accounts': 'accts',
+  'antiquity': 'antiq',
+  'london': 'lond',
+  'grammar': 'gram',
+  'familiar': 'famil',
+  'palaeontology': 'palaeontol',
+  'meeting': 'mtg',
+  'assemblies': 'assemb',
+  'march': 'mar',
+  'vegetable': 'veg',
+  'intelligent': 'intell',
+  'experiment': 'exper',
+  'orders': 'ord',
+  'animal': 'anim',
+  'nervous': 'nerv',
+  'electricity': 'electr',
+  'certificate': 'certif',
+  'exercise': 'exerc',
+  'physiological': 'physiol',
+  'company': 'comp'
 };
 
-export {abbreviations};
\ No newline at end of file
+export { abbreviations, nonAbbreviator };

From 221828ce790fc1679c3de1c82a9f19315c460821 Mon Sep 17 00:00:00 2001
From: HeadMerchant <amanitoussaintgreen@gmail.com>
Date: Thu, 9 Apr 2020 19:35:36 -0700
Subject: [PATCH 3/6] Smart Truncation

Shortened titles now only appear when the longer title would be truncated
Uses modified version of vue-line-clamp based on https://github.com/AndyDyer/vue-line-clamp/tree/add-options-change-fallback-logic
---
 src/components/Class.vue    | 11 +++--
 src/utils/vue-line-clamp.js | 89 +++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 src/utils/vue-line-clamp.js

diff --git a/src/components/Class.vue b/src/components/Class.vue
index 528c35fc..48e44e57 100644
--- a/src/components/Class.vue
+++ b/src/components/Class.vue
@@ -33,8 +33,8 @@
             <v-icon style="margin: 4px" small @click="$store.commit('removeClass', {classInfo: classInfo, classIndex: classIndex}); $event.stopPropagation();">
               cancel
             </v-icon>
-            <v-card-text class="card-text" ref="title" v-line-clamp:20="3">
-            	<span style="font-weight: bold; font-size: 1.1em;">{{ classInfo.id }}</span> {{ shortenedTitle }}
+            <v-card-text ref="title" v-line-clamp:20="3" class="card-text">
+              <span style="font-weight: bold; font-size: 1.1em;">{{ classInfo.id }}</span> {{ useShortenedTitle ? shortenedTitle : classInfo.title }}
             </v-card-text>
           </div>
         </v-card>
@@ -75,6 +75,10 @@
 <script>
 import colorMixin from './../mixins/colorMixin.js';
 import { abbreviations, nonAbbreviator } from './../utils/abbreviations.js';
+import Vue from 'vue';
+import VueLineClamp from './../utils/vue-line-clamp.js';
+
+Vue.use(VueLineClamp);
 
 export default {
   name: 'Class',
@@ -100,7 +104,8 @@ export default {
   data () {
     return {
       warningDialog: false,
-      shouldOverrideWarnings: this.classInfo.overrideWarnings
+      shouldOverrideWarnings: this.classInfo.overrideWarnings,
+      useShortenedTitle: false
     };
   },
   computed: {
diff --git a/src/utils/vue-line-clamp.js b/src/utils/vue-line-clamp.js
new file mode 100644
index 00000000..9c7f2bbf
--- /dev/null
+++ b/src/utils/vue-line-clamp.js
@@ -0,0 +1,89 @@
+//Credit to https://github.com/AndyDyer/vue-line-clamp/tree/add-options-change-fallback-logic
+const currentValueProp = 'vLineClampValue';
+
+function defaultFallbackFunc (el, bindings, vNode) {
+  const lines = parseInt(bindings.value);
+  if (lines) {
+    let lineHeight = parseInt(bindings.arg);
+    if (isNaN(lineHeight)) {
+      console.warn(
+        'line-height argument for vue-line-clamp must be a number (of pixels), falling back to 16px'
+      );
+      lineHeight = 16;
+    }
+
+    const maxHeight = lineHeight * lines;
+
+    el.style.maxHeight = maxHeight ? maxHeight + 'px' : '';
+    el.style.overflowX = 'hidden';
+    el.style.lineHeight = lineHeight + 'px'; // to ensure consistency
+  } else {
+    el.style.maxHeight = el.style.overflowX = '';
+  }
+  if (el.scrollHeight > el.offsetHeight) vNode.context.$data.useShortenedTitle = true;
+}
+
+const truncateText = function(el, bindings, vNode) {
+  let lines = parseInt(bindings.value);
+  if (isNaN(lines)) {
+    console.error('Parameter for vue-line-clamp must be a number');
+    return;
+  } else if (lines !== el[currentValueProp]) {
+    el[currentValueProp] = lines;
+    el.style.webkitLineClamp = lines ? lines : '';
+  }
+  if (el.scrollHeight > el.offsetHeight) vNode.context.$data.useShortenedTitle = true;
+};
+
+const VueLineClamp = {
+  install (Vue, options) {
+    options = Object.assign(
+      { importCss: false, textOverflow: 'ellipsis', wordBreak: 'break-word' },
+      options
+    );
+
+    const styles = `
+      display: block;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      word-break: ${options.wordBreak};
+      text-overflow: ${options.textOverflow};
+    `;
+
+    if (options.importCss) {
+      const stylesheets = window.document.styleSheets;
+      const rule = `.vue-line-clamp{${styles}}`;
+      if (stylesheets && stylesheets[0] && stylesheets.insertRule) {
+        stylesheets.insertRule(rule);
+      } else {
+        const link = window.document.createElement('style');
+        link.id = 'vue-line-clamp';
+        link.appendChild(window.document.createTextNode(rule));
+        window.document.head.appendChild(link);
+      }
+    }
+
+    const clampFunction =
+      'webkitLineClamp' in document.body.style
+        ? truncateText
+        : options.fallbackFunc || defaultFallbackFunc;
+
+    Vue.directive('line-clamp', {
+      currentValue: 0,
+      bind(el) {
+        if (!options.importCss) {
+          el.style.cssText += styles;
+        } else {
+          el.classList.add('vue-line-clamp');
+        }
+      },
+      inserted: (el, bindings, vNode) => clampFunction(el, bindings, vNode),
+      updated: (el, bindings, vNode) => clampFunction(el, bindings, vNode),
+      componentUpdated: (el, bindings, vNode) =>
+        clampFunction(el, bindings, vNode)
+    });
+  }
+};
+
+export default VueLineClamp;

From 93ad3bab42c68f825f170b524d058795e96dba5a Mon Sep 17 00:00:00 2001
From: Maximo Machado <maximomachado246@gmail.com>
Date: Fri, 10 Apr 2020 16:58:52 -0400
Subject: [PATCH 4/6] Suggest changes to abbreviations

---
 src/utils/abbreviations.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/utils/abbreviations.js b/src/utils/abbreviations.js
index 27188573..9821ce42 100644
--- a/src/utils/abbreviations.js
+++ b/src/utils/abbreviations.js
@@ -106,7 +106,7 @@ const abbreviations = {
   'theoretical': 'theoret',
   'future': 'fut',
   'education': 'educ',
-  'work': 'wk',
+  'work': 'wrk',
   'africa': 'afr',
   'physiology': 'physiol',
   'portuguese': 'port',
@@ -120,7 +120,6 @@ const abbreviations = {
   'russian': 'russ',
   'revolution': 'revol',
   'languages': 'langs',
-  'good': 'gd',
   'conflict': 'confl',
   'classical': 'class',
   'natural': 'nat',
@@ -161,7 +160,6 @@ const abbreviations = {
   'elements': 'elem',
   'astronomy': 'astron',
   'psychology': 'psychol',
-  'method': 'meth',
   'communications': 'communic',
   'shakespeare': 'shaks',
   'optics': 'opt',
@@ -172,7 +170,6 @@ const abbreviations = {
   'discovery': 'discov',
   'india': 'ind',
   'aerodynamics': 'aerodynam',
-  'past': 'pa',
   'african': 'afr',
   'animals': 'anim',
   'literary': 'lit',
@@ -242,10 +239,9 @@ const abbreviations = {
   'influence': 'infl',
   'junior': 'jun',
   'constitutional': 'constit',
-  'doctrine': 'doctr',
   'king': 'k',
   'traditional': 'trad',
-  'works': 'wks',
+  'works': 'wrks',
   'indian': 'ind',
   'invention': 'invent',
   'pronunciation': 'pronunc',
@@ -322,7 +318,7 @@ const abbreviations = {
   'animal': 'anim',
   'nervous': 'nerv',
   'electricity': 'electr',
-  'certificate': 'certif',
+  'certificate': 'cert',
   'exercise': 'exerc',
   'physiological': 'physiol',
   'company': 'comp'

From 6c54f9483ba18606e125cd19f3deccfc9b3aca82 Mon Sep 17 00:00:00 2001
From: HeadMerchant <amanitoussaintgreen@gmail.com>
Date: Fri, 10 Apr 2020 14:05:25 -0700
Subject: [PATCH 5/6] Abbreviation changes

Changed/removed some abbreviations
Fixed linter errors in vue-line-clamp.js
---
 src/utils/abbreviations.js  | 48 +++++++++++++++----------------------
 src/utils/vue-line-clamp.js | 10 ++++----
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/utils/abbreviations.js b/src/utils/abbreviations.js
index 27188573..c81e54d9 100644
--- a/src/utils/abbreviations.js
+++ b/src/utils/abbreviations.js
@@ -12,17 +12,16 @@ const abbreviations = {
   'materials': 'mat',
   'computer': 'comp',
   'special': 'spec',
-  'engineering': 'engin',
+  'engineering': 'eng',
   'subject': 'subj',
   'science': 'sci',
   'introduction': 'intro',
   'advanced': 'adv',
   'research': 'res',
   'technology': 'tech',
-  'management': 'managem',
+  'management': 'mgmt',
   'studies': 'stud',
   'biology': 'bio',
-  'analysis': 'anal',
   'development': 'dev',
   'history': 'hist',
   'economics': 'econ',
@@ -55,7 +54,7 @@ const abbreviations = {
   'system': 'syst',
   'oceanography': 'oceanogr',
   'international': 'internat',
-  'philosophy': 'philos',
+  'philosophy': 'phil',
   'language': 'lang',
   'medical': 'med',
   'comparative': 'compar',
@@ -82,14 +81,14 @@ const abbreviations = {
   'architectural': 'archit',
   'contemporary': 'contemp',
   'ancient': 'anc',
-  'introductory': 'introd',
+  'introductory': 'intro',
   'anthropology': 'anthropol',
   'industrial': 'industr',
   'present': 'pres',
   'east': 'e',
   'mathematical': 'math',
   'latin': 'lat',
-  'japanese': 'jap',
+  'japanese': 'jp',
   'calculus': 'calc',
   'ecology': 'ecol',
   'regular': 'reg',
@@ -109,7 +108,7 @@ const abbreviations = {
   'work': 'wk',
   'africa': 'afr',
   'physiology': 'physiol',
-  'portuguese': 'port',
+  'portuguese': 'pt',
   'linguistics': 'ling',
   'properties': 'prop',
   'clinical': 'clin',
@@ -120,7 +119,6 @@ const abbreviations = {
   'russian': 'russ',
   'revolution': 'revol',
   'languages': 'langs',
-  'good': 'gd',
   'conflict': 'confl',
   'classical': 'class',
   'natural': 'nat',
@@ -137,7 +135,7 @@ const abbreviations = {
   'critical': 'crit',
   'south': 's',
   'rhetoric': 'rhet',
-  'magnetic': 'magn',
+  'magnetic': 'mag',
   'related': 'rel',
   'diseases': 'dis',
   'school': 'sch',
@@ -159,11 +157,10 @@ const abbreviations = {
   'exploration': 'explor',
   'problem': 'probl',
   'elements': 'elem',
-  'astronomy': 'astron',
-  'psychology': 'psychol',
+  'astronomy': 'astro',
+  'psychology': 'psych',
   'method': 'meth',
   'communications': 'communic',
-  'shakespeare': 'shaks',
   'optics': 'opt',
   'ecological': 'ecol',
   'industry': 'ind',
@@ -182,7 +179,7 @@ const abbreviations = {
   'inorganic': 'inorg',
   'biochemistry': 'biochem',
   'pathology': 'pathol',
-  'philosophical': 'philos',
+  'philosophical': 'phil',
   'products': 'prod',
   'archaeological': 'archaeol',
   'geomorphology': 'geomorphol',
@@ -196,7 +193,6 @@ const abbreviations = {
   'conversation': 'conversat',
   'north': 'n',
   'anatomy': 'anat',
-  'word': 'wd',
   'ceramics': 'ceram',
   'selection': 'select',
   'archaeology': 'archaeol',
@@ -206,20 +202,19 @@ const abbreviations = {
   'petrology': 'petrol',
   'record': 'rec',
   'seismology': 'seismol',
-  'technological': 'technol',
+  'technological': 'techn',
   'essential': 'essent',
   'analytical': 'analyt',
   'navigation': 'navig',
   'historical': 'hist',
-  'between': 'betw',
-  'russia': 'russ',
+  'between': 'btw',
+  'russia': 'ru',
   'year': 'yr',
   'analytic': 'analyt',
   'cryptography': 'cryptogr',
   'religion': 'relig',
   'translation': 'transl',
   'intellectual': 'intellect',
-  'books': 'bks',
   'authors': 'auth',
   'museum': 'mus',
   'metaphysics': 'metaph',
@@ -228,22 +223,20 @@ const abbreviations = {
   'reproductive': 'reprod',
   'concrete': 'concr',
   'limnology': 'limnol',
-  'pharmaceutical': 'pharmaceut',
+  'pharmaceutical': 'pharma',
   'metropolis': 'metrop',
   'representing': 'repr',
   'against': 'agst',
   'property': 'prop',
   'scientific': 'sci',
-  'great': 'gt',
   'terrestrial': 'terrestr',
   'lectures': 'lect',
-  'magnetism': 'magn',
+  'magnetism': 'mag',
   'geological': 'geol',
   'influence': 'infl',
   'junior': 'jun',
   'constitutional': 'constit',
   'doctrine': 'doctr',
-  'king': 'k',
   'traditional': 'trad',
   'works': 'wks',
   'indian': 'ind',
@@ -257,17 +250,16 @@ const abbreviations = {
   'autobiography': 'autobiogr',
   'essay': 'ess',
   'biography': 'biogr',
-  'book': 'bk',
   'apocalyptic': 'apoc',
   'dissertation': 'diss',
   'morphology': 'morphol',
   'furniture': 'furnit',
   'application': 'applic',
-  'psychological': 'psychol',
+  'psychological': 'psych',
   'imagination': 'imag',
   'archives': 'arch',
   'agriculture': 'agric',
-  'pharmacology': 'pharmacol',
+  'pharmacology': 'pharma',
   'inventions': 'invent',
   'evaluation': 'eval',
   'assembly': 'assemb',
@@ -292,17 +284,15 @@ const abbreviations = {
   'lecture': 'lect',
   'several': 'sev',
   'measure': 'meas',
-  'arithmetic': 'arithm',
+  'arithmetic': 'arith',
   'instruction': 'instr',
   'england': 'eng',
   'calligraphy': 'calligr',
   'expository': 'expos',
-  'brazilian': 'braz',
-  'lines': 'll',
+  'brazilian': 'br',
   'west': 'w',
   'survey': 'surv',
   'tradition': 'trad',
-  'saints': 'ss',
   'publication': 'publ',
   'republic': 'repub',
   'original': 'orig',
diff --git a/src/utils/vue-line-clamp.js b/src/utils/vue-line-clamp.js
index 9c7f2bbf..9b30cb1f 100644
--- a/src/utils/vue-line-clamp.js
+++ b/src/utils/vue-line-clamp.js
@@ -1,4 +1,4 @@
-//Credit to https://github.com/AndyDyer/vue-line-clamp/tree/add-options-change-fallback-logic
+// Credit to https://github.com/AndyDyer/vue-line-clamp/tree/add-options-change-fallback-logic
 const currentValueProp = 'vLineClampValue';
 
 function defaultFallbackFunc (el, bindings, vNode) {
@@ -23,14 +23,14 @@ function defaultFallbackFunc (el, bindings, vNode) {
   if (el.scrollHeight > el.offsetHeight) vNode.context.$data.useShortenedTitle = true;
 }
 
-const truncateText = function(el, bindings, vNode) {
-  let lines = parseInt(bindings.value);
+const truncateText = function (el, bindings, vNode) {
+  const lines = parseInt(bindings.value);
   if (isNaN(lines)) {
     console.error('Parameter for vue-line-clamp must be a number');
     return;
   } else if (lines !== el[currentValueProp]) {
     el[currentValueProp] = lines;
-    el.style.webkitLineClamp = lines ? lines : '';
+    el.style.webkitLineClamp = lines || '';
   }
   if (el.scrollHeight > el.offsetHeight) vNode.context.$data.useShortenedTitle = true;
 };
@@ -71,7 +71,7 @@ const VueLineClamp = {
 
     Vue.directive('line-clamp', {
       currentValue: 0,
-      bind(el) {
+      bind (el) {
         if (!options.importCss) {
           el.style.cssText += styles;
         } else {

From eb7177303642b81ac18e7438e8b5fa65485d702e Mon Sep 17 00:00:00 2001
From: Miriam Rittenberg <mrittenb@mit.edu>
Date: Fri, 10 Apr 2020 17:13:57 -0400
Subject: [PATCH 6/6] Suggestions for abbreviation changes

---
 src/components/Class.vue   |  4 ++--
 src/utils/abbreviations.js | 29 ++++++++++++-----------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/components/Class.vue b/src/components/Class.vue
index 48e44e57..d8aa5bf9 100644
--- a/src/components/Class.vue
+++ b/src/components/Class.vue
@@ -38,11 +38,11 @@
             </v-card-text>
           </div>
         </v-card>
-        <!--<v-btn v-if="warnings.length>0&&(!classInfo.overrideWarnings||hover)" slot="badge" icon @click="warningDialog = true">
+        <v-btn v-if="warnings.length>0&&(!classInfo.overrideWarnings||hover)" slot="badge" icon @click="warningDialog = true">
           <v-icon medium>
             warning
           </v-icon>
-        </v-btn>-->
+        </v-btn>
       </v-badge>
     </v-hover>
     <v-dialog v-model="warningDialog" max-width="600">
diff --git a/src/utils/abbreviations.js b/src/utils/abbreviations.js
index 837057ac..e07e9563 100644
--- a/src/utils/abbreviations.js
+++ b/src/utils/abbreviations.js
@@ -9,7 +9,6 @@ const abbreviations = {
   'v': nonAbbreviator + '5',
   'vi': nonAbbreviator + '6',
   'undergraduate': 'undergrad',
-  'materials': 'mat',
   'computer': 'comp',
   'special': 'spec',
   'engineering': 'eng',
@@ -17,7 +16,6 @@ const abbreviations = {
   'science': 'sci',
   'introduction': 'intro',
   'advanced': 'adv',
-  'research': 'res',
   'technology': 'tech',
   'management': 'mgmt',
   'studies': 'stud',
@@ -41,7 +39,6 @@ const abbreviations = {
   'biological': 'bio',
   'modern': 'mod',
   'literature': 'lit',
-  'music': 'mus',
   'communication': 'communic',
   'political': 'poli',
   'politics': 'poli',
@@ -51,7 +48,7 @@ const abbreviations = {
   'public': 'pub',
   'applications': 'applic',
   'applied': 'appl',
-  'system': 'syst',
+  'system': 'sys',
   'oceanography': 'oceanogr',
   'international': 'internat',
   'philosophy': 'phil',
@@ -65,12 +62,12 @@ const abbreviations = {
   'structural': 'struct',
   'medicine': 'med',
   'structure': 'struct',
-  'geology': 'geol',
-  'statistical': 'statist',
+  'geology': 'geo',
+  'statistical': 'stat',
   'french': 'fr',
   'probability': 'prob',
   'spanish': 'span',
-  'evolution': 'evol',
+  'evolution': 'evo',
   'foundations': 'found',
   'experimental': 'exper',
   'selected': 'sel',
@@ -85,7 +82,6 @@ const abbreviations = {
   'anthropology': 'anthropol',
   'industrial': 'industr',
   'present': 'pres',
-  'east': 'e',
   'mathematical': 'math',
   'latin': 'lat',
   'japanese': 'jp',
@@ -99,9 +95,8 @@ const abbreviations = {
   'german': 'ger',
   'composition': 'compos',
   'photography': 'photogr',
-  'intelligence': 'intell',
-  'microbiology': 'microbiol',
-  'disease': 'dis',
+  'intelligence': 'intel',
+  'microbiology': 'microbio',
   'theoretical': 'theoret',
   'future': 'fut',
   'education': 'educ',
@@ -127,7 +122,7 @@ const abbreviations = {
   'astronautics': 'astronaut',
   'algebra': 'alg',
   'narrative': 'narrat',
-  'hydrology': 'hydrol',
+  'hydrology': 'hydro',
   'general': 'gen',
   'artificial': 'artific',
   'measurement': 'measurem',
@@ -140,7 +135,7 @@ const abbreviations = {
   'diseases': 'dis',
   'school': 'sch',
   'spectroscopy': 'spectrosc',
-  'educational': 'educ',
+  'educational': 'edu',
   'investment': 'investm',
   'military': 'milit',
   'western': 'west',
@@ -162,7 +157,7 @@ const abbreviations = {
   'method': 'meth',
   'communications': 'communic',
   'optics': 'opt',
-  'ecological': 'ecol',
+  'ecological': 'eco',
   'industry': 'ind',
   'construction': 'constr',
   'college': 'coll',
@@ -210,20 +205,20 @@ const abbreviations = {
   'russia': 'ru',
   'year': 'yr',
   'analytic': 'analyt',
-  'cryptography': 'cryptogr',
+  'cryptography': 'crypto',
   'religion': 'relig',
   'translation': 'transl',
   'intellectual': 'intellect',
   'authors': 'auth',
   'museum': 'mus',
   'metaphysics': 'metaph',
-  'evolutionary': 'evol',
+  'evolutionary': 'evo',
   'affairs': 'aff',
   'reproductive': 'reprod',
   'concrete': 'concr',
   'limnology': 'limnol',
   'pharmaceutical': 'pharma',
-  'metropolis': 'metrop',
+  'metropolis': 'metro',
   'representing': 'repr',
   'against': 'agst',
   'property': 'prop',