[css][xs]: fix conflict with main branch

datopian · Jun 12, 2023 · 52c671d · 52c671d
2 parents 8327a4f + 12259a1
commit 52c671d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/ckanext/nhs/fanstatic/css/nhs.css b/ckanext/nhs/fanstatic/css/nhs.css
@@ -1,6 +1,6 @@
 body {
   font-family: Frutiger W01, Arial, sans-serif;
-  font-size: 19px;
+  font-size: 17px;
   background: #fff;
 }
 body main,
@@ -18,7 +18,7 @@ body footer {
 [role=main] a,
 [role=main] li,
 [role=main] label {
-  font-size: 19px;
+  font-size: 17px;
 }
 
 .bg-white {
@@ -611,6 +611,9 @@ a.btn-primary.active.focus {
   color: #fff;
 }
 
+.ckanext-pages-content {
+  font-size: 17px;
+}
 .ckanext-pages-content ol li {
   padding-bottom: 20px;
 }
@@ -1067,9 +1070,15 @@ search_submit::-moz-focus-inner {
   padding-bottom: 0;
   padding-top: 25px;
 }
+.secondary .module-content {
+  font-size: 17px;
+}
 .secondary .module-content p {
   margin-bottom: 15px;
 }
+.secondary .blog-content {
+  font-size: 17px;
+}
 .secondary .badge {
   background-color: #d5d5d5;
   color: #454545;
@@ -1513,7 +1522,7 @@ ul.nav.nav-tabs {
 }
 .resource-item .heading {
   color: #005eb8;
-  font-size: 19px;
+  font-size: 17px;
   font-weight: 400;
 }
 .resource-item:hover {

diff --git a/ckanext/nhs/fanstatic/css/nhs.min.css b/ckanext/nhs/fanstatic/css/nhs.min.css
diff --git a/ckanext/nhs/fanstatic/sass/theme/_dataset.scss b/ckanext/nhs/fanstatic/sass/theme/_dataset.scss
@@ -33,10 +33,14 @@
         padding-top: 25px;
     }
     .module-content {
+        font-size: $fontXMedium;
         p {
             margin-bottom: 15px;
         }
     }
+    .blog-content {
+        font-size: $fontXMedium;
+    }
     .badge {
         background-color: #d5d5d5;
         color: #454545;
@@ -547,7 +551,7 @@ ul.nav.nav-tabs {
     padding-left: 10px;
     .heading {
         color: #005eb8;
-        font-size: $fontLarge;
+        font-size: $fontXMedium;
         font-weight: 400;
     }
     &:hover {

diff --git a/ckanext/nhs/fanstatic/sass/theme/_general.scss b/ckanext/nhs/fanstatic/sass/theme/_general.scss
@@ -1,6 +1,6 @@
 body {
     font-family: Frutiger W01, Arial, sans-serif;
-    font-size: $fontLarge;
+    font-size: $fontXMedium;
     background: $whiteColor;
     main,
     [role="main"],
@@ -17,7 +17,7 @@ body {
     a,
     li,
     label {
-        font-size: $fontLarge;
+        font-size: $fontXMedium;  
     }
 }
 
@@ -694,6 +694,7 @@ a.btn-primary.active.focus {
     }
 }
 .ckanext-pages-content {
+    font-size: $fontXMedium;
     ol {
         li {
             padding-bottom: 20px;

diff --git a/ckanext/nhs/fanstatic/sass/theme/_variables.scss b/ckanext/nhs/fanstatic/sass/theme/_variables.scss
@@ -10,6 +10,7 @@ $darkShadeBlueColor: #384853;
 // Font Size
 $fontSmall: 14px;
 $fontMedium: 16px;
+$fontXMedium: 17px;
 $fontLarge: 19px;
 $fontXLarge: 20px;
 $fontXXLarge: 22px;