Squashed merge of site/frontera/main at commit 65d5757

TACC · Aug 13, 2021 · 87cf588 · 87cf588
1 parent 03590e9
commit 87cf588
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/taccsite_cms/static/site_cms/css/src/_imports/elements/html-elements.css b/taccsite_cms/static/site_cms/css/src/_imports/elements/html-elements.css
@@ -31,13 +31,11 @@ body {
   /* To avoid negative whitespace at right on horz scroll on tiny screen */
   min-width: 290px; /* developer-decided value */
 
+  /* To overwrite Bootstrap */
   color: var(--global-color-primary--dark);
-
   font-family: var(--global-font-family);
-  font-size: var(--global-font-size--small);
-  font-weight: var(--global-font-weight--medium);
-
-  line-height: 1.4; /* overwrite Bootstrap */
+  font-size: var(--global-font-size--medium);
+  line-height: 1.4;
 }
 
 

diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-header.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-header.css
@@ -160,3 +160,11 @@ Styleguide Trumps.Scopes.Header
     width: 27px; /* NO-R/EM: 1.25em (from Portal `.fa`—FP-228 will deprecate it) */
     text-align: center;
 }
+
+
+
+/* Dropdown */
+
+.dropdown-menu {
+  font-size: 16px; /* NO-R/EM: 1rem (from Bootstrap via `.dropdown-menu`) */
+}
diff --git a/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-portal-nav.css b/taccsite_cms/static/site_cms/css/src/_imports/trumps/s-portal-nav.css
@@ -19,6 +19,3 @@ Styleguide Trumps.Scopes.PortalNav
   /* Override `.navbar` */
   text-transform: none;
 }
-.s-portal-nav .dropdown-menu {
-  font-size: 16px; /* NO-R/EM: 1rem (from Bootstrap via `.dropdown-menu`) */
-}
diff --git a/taccsite_custom b/taccsite_custom