Merge pull request #3331 from tulibraries/MAN-1380-address-performanc…

…e-issues-found-in-speed-tests MAN-1380 address performance issues found in speed tests
tulibraries · Apr 19, 2024 · 165d2a5 · 165d2a5
2 parents dec7156 + 921eddf
commit 165d2a5
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 76 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -39,7 +39,7 @@ $sizes: map-merge(
 @import "bootstrap/scss/bootstrap";
 @import "bootstrap-icons/font/bootstrap-icons";
 @import "selectize.bootstrap5.scss";
-@import "font-awesome/css/font-awesome";
+@import '@fortawesome/fontawesome-free/css/all.css';
 
 @import "partials/_categories.scss";
 @import "partials/_filter-tags.scss";

diff --git a/app/assets/stylesheets/events.scss b/app/assets/stylesheets/events.scss
@@ -74,11 +74,6 @@
 .events {
   h2 {
     padding-top: 0;
-    a {
-      color: $black;
-      font-weight: 600;
-      text-decoration: underline;
-    }
   }
   .upcoming-header {
     background-color:$footer-gray;
@@ -136,7 +131,7 @@
   }
   .exhibit {
     font-family: "Roboto";
-    font-weight: 700;
+    font-weight: 500;
     padding: 21px;
     margin-bottom: 14px;
     border-bottom: solid $light-grey 1px;

diff --git a/app/assets/stylesheets/exhibitions.scss b/app/assets/stylesheets/exhibitions.scss
@@ -13,22 +13,22 @@
 	}
 	.dates {
 		font-size: 1.3rem;
-		font-weight: 700;
+		font-weight: 500;
 		margin-bottom: 14px;
 	}
 	.event-location {
 		h3 {
 			font-size: 1.25rem;
       font-family: "Roboto";
-      font-weight: 700;
+      font-weight: 500;
 		}
 		border: solid $seagreen 1px;
 	  border-radius: 7px;
 	  background-color: transparent;
 	  padding: 21px;
 	  margin-bottom: 14px;
     font-family: "Roboto";
-    font-weight: 700;
+    font-weight: 500;
 	  a {
 	  	color: $black;
 	  	text-decoration: underline;

diff --git a/app/assets/stylesheets/finding_aids.scss b/app/assets/stylesheets/finding_aids.scss
@@ -60,19 +60,8 @@
 			font-weight: 700;
 		}
 	}
-	a[data-bs-toggle="collapse"]:after {
-		content: "\f105";
-	  font-family: "FontAwesome";
-	  font-size: larger;
-		float: right;
-		padding-right: 7px;
-	}
-	a[aria-expanded="true"]:after {
-		content: "\f107";
-	  font-family: "FontAwesome";
-	  font-size: larger;
-		float: right;
-		padding-right: 7px;
+	.finding-aids-subjects, .finding-aids-collections {
+		color: $white;
 	}		
 	.filter_reset {
 		margin-top: 21px;

diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
@@ -4,9 +4,6 @@ form {
 	label.collection_check_boxes {
 		font-weight: 100;
 	}
-	legend {
-		font-weight: 600;
-	}
 }
 .form {
 	margin-top: 21px;

diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
@@ -17,7 +17,7 @@ h1 {
   font-size: 220%;
   margin-bottom: 21px;
   font-family: "Faustina";
-  font-weight: 800;
+  font-weight: 600;
 }
 h2 {
   font-size: 160%;
@@ -31,7 +31,7 @@ h4,h5,h6 {
 
 strong, .strong {
   font-family: "Roboto";
-  font-weight: 700;
+  font-weight: 600;
 }
 
 .flash {
@@ -104,7 +104,7 @@ form {
      font-size: 85%;
    }
  label {
-   font-weight: 600;
+   font-weight:  500;
    padding-right: 10px;
  }
 }
@@ -241,8 +241,6 @@ marquee {
   color: $red;
 }
 i.fa-search {
-  content: "\f002";
-  font-family: "FontAwesome";
   display: inline-block;
   position:relative;
 }

diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss
@@ -91,10 +91,6 @@
 
 #home {
   overflow: hidden;
-  // a {
-  //   font-family: "Roboto";
-  //   font-weight: 400;
-  // }
   .page-search-container {
     .fa.fa-search {
       display: inline-block;
@@ -577,20 +573,12 @@
 
 .access-link {
   a {
-    color: $royal-blue;
     background-color: $crystal-blue;
+    color: $royal-blue;
     font-family: faustina;
     padding: 7px 14px;
     display: inline-block;
   }
-  a::after {
-    padding-left: 10px;
-    padding-top: 3px;
-    content: "\f0da";
-    font-family: FontAwesome;
-    position: relative;
-    top: 2px;
-  }
   h2 {
     margin: 28px 0;
   }

diff --git a/app/assets/stylesheets/partials/_footer.scss b/app/assets/stylesheets/partials/_footer.scss
@@ -61,7 +61,7 @@ a.donate {
   background-color: $crystal-blue;
   color: $royal-blue !important;
   font-family: "faustina";
-  font-weight: 600;
+  font-weight:  500;
   font-size: 20px;
   @media(max-width: 500px) {
     margin-right: 21px;

diff --git a/app/assets/stylesheets/partials/_hours.scss b/app/assets/stylesheets/partials/_hours.scss
@@ -2,7 +2,7 @@
 
 
 .today {
-  font-weight: 600;
+  font-weight: 500;
   border-left: solid $red 1px;
   border-right: solid $red 1px;
   background-color: #efefef;
@@ -95,13 +95,13 @@
 }
 
 .hours-month-name {
-  font-weight: 600;
+  font-weight: 500;
   font-size: 150%;
 }
 
 .mobile-hours {
   .today {
-    font-weight: 600;
+    font-weight: 500;
     border-left: solid $red 1px;
     border-right: solid $red 1px;
     background-color: $white;
@@ -184,7 +184,7 @@
   input[type="submit"] {
     background-color: $red;
     color: $white;
-    font-weight: 600;
+    font-weight: 500;
     border-radius: 4px;
     padding: 4px 14px;
     border: solid $red 1px;
@@ -193,7 +193,7 @@
 
 .space-show, .building-show {
   .today {
-    font-weight: 600;
+    font-weight: 500;
     border-bottom: solid $red 3px;
     border-left: 0;
     border-right: 0;
@@ -212,7 +212,7 @@
   .hours-dates {
     padding: 7px;
     border-bottom: solid $new-gold 3px;
-    font-weight: 700;
+    font-weight:  500;
   }
   .hours-times {
     .time {
@@ -255,7 +255,7 @@
     padding-left: 10px;
     padding-top: 3px;
     content: "\f0da";
-    font-family: FontAwesome;
+    font-family: "Font Awesome 6 Free";
     position: relative;
     top: 2px;
   }
@@ -299,7 +299,7 @@
   margin-bottom: 14px;
 }
 .hours-location, .hours-month-name {
-  font-weight: 600;
+  font-weight:  500;
   font-size: 120%;
 }
 .hours-month-name {
@@ -309,7 +309,7 @@
 
 .mobile-hours {
   .today {
-    font-weight: 600;
+    font-weight:  500;
     border-left: solid $red 1px;
     border-right: solid $red 1px;
     background-color: $white;
@@ -395,7 +395,7 @@
   input[type="submit"] {
     background-color: $red;
     color: $white;
-    font-weight: 600;
+    font-weight:  500;
     border-radius: 4px;
     padding: 4px 14px;
     border: solid $red 1px;

diff --git a/app/assets/stylesheets/partials/_responsive.scss b/app/assets/stylesheets/partials/_responsive.scss
@@ -62,7 +62,7 @@
 		    	background-color: transparent!important;
 		    	color: $black!important;
 		    	font-size: 200%!important;
-		    	font-weight: 600 !important;
+		    	font-weight:  500 !important;
 		    }
 				#time {
 					width: 100%!important;

diff --git a/app/assets/stylesheets/partials/_typography.scss b/app/assets/stylesheets/partials/_typography.scss
@@ -1,7 +1,3 @@
-.fa, .far, .fas {
-  font-family: "Font Awesome 5 Free";
-}
-
 .roboto-thin {
   font-family: "Roboto", sans-serif;
   font-weight: 100;

diff --git a/app/assets/stylesheets/persons.scss b/app/assets/stylesheets/persons.scss
@@ -101,7 +101,7 @@
     font-size: 1.15rem !important;
     .p-name {
       font-size: 135%;
-      font-weight: 600;
+      font-weight:  500;
       font-family: Roboto;
       color: $red;
       @media (max-width: 750px) {

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
@@ -28,7 +28,11 @@
       <% unless @event.registration_link.blank? %>
 
         <div class="col access-link">
-          <h2><%= link_to t("manifold.events.show.register"), strip_tags(@event.registration_link) %></h2>
+          <h2>
+            <%= link_to strip_tags(@event.registration_link) do %>
+                <%= t("manifold.events.show.register") %> <i class="fas fa-caret-right"></i>
+            <% end %>
+          </h2>
         </div>
 
       <% end %>

diff --git a/app/views/finding_aids/_collections.html.erb b/app/views/finding_aids/_collections.html.erb
@@ -1,7 +1,5 @@
-<h2>
-  <a class="pointer" data-bs-toggle="collapse" data-bs-target="#collections" aria-expanded="true" aria-controls="collections"> 
-  	<%= t("manifold.finding_aids.collection_heading") %>
-  </a>
+<h2 class="finding-aids-collections">
+  <%= t("manifold.finding_aids.collection_heading") %>
 </h2>
 
   <ul class="list-unstyled navbar-collapse collapse show" id="collections">

diff --git a/app/views/finding_aids/_subjects.html.erb b/app/views/finding_aids/_subjects.html.erb
@@ -1,7 +1,5 @@
-<h2>
-  <a class="pointer" data-bs-toggle="collapse" data-bs-target="#subjects" aria-expanded="true" aria-controls="subjects"> 
-  	<%= t("manifold.finding_aids.subjects_heading") %>
-  </a>
+<h2 class="finding-aids-subjects">
+  <%= t("manifold.finding_aids.subjects_heading") %>
 </h2>
 
 <ul class="list-unstyled navbar-collapse collapse show" id="subjects">

diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "app",
   "private": "true",
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.5.2",
     "@hotwired/stimulus": "^3.2.1",
     "@hotwired/turbo-rails": "^7.2.4",
     "@popperjs/core": "^2.11.6",
@@ -10,7 +11,6 @@
     "bootstrap-icons": "^1.10.2",
     "esbuild": "^0.16.7",
     "esbuild-rails": "^1.0.3",
-    "font-awesome": "^4.7.0",
     "jquery": "^3.7.1",
     "sass": "^1.56.2",
     "stimulus-use": "^0.51.1",

diff --git a/yarn.lock b/yarn.lock
@@ -112,6 +112,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091"
   integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==
 
+"@fortawesome/fontawesome-free@^6.5.2":
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz#310fe90cb5a8dee9698833171b98e7835404293d"
+  integrity sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==
+
 "@hotwired/stimulus@^3.2.1":
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608"
@@ -280,11 +285,6 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==
-
 fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"