wcrisman/avusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the issues with the custom fonts not being used (sometimes they are ignored if other options exist); Added more OpenSans options; Switched to OpenSans in the menus for clarity and size reasons; Fixed the menu closing on focus lost issues.

Browse Source
This commit is contained in:
DESKTOP-C9V2M01\Zeeri
2021-03-17 13:55:04 -07:00
parent 93292040f2
commit 2610b82439
12 changed files with 191 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/modules/apostrophe-assets/public/css/main.sass
View File

@@ -22,7 +22,7 @@ p
// Remove !important if we can figure out how to remove the style CKEditor outputs.
margin: 0.3rem 0 0.7rem 0 !important
padding: 0 !important
font-family: "Merriweather", "serif"
font-family: Merriweather
font-size: 1.1rem
line-height: 1.4rem
p.indent
@@ -33,7 +33,7 @@ p.indent
text-indent: 0
margin: 0.3rem 0 0.7rem 0
padding: 0.25rem 0
font-family: "Merriweather", "serif"
font-family: Merriweather
font-size: 1.1rem
line-height: 1.4rem
p
@@ -42,11 +42,11 @@ p.indent
td + td, th + th // All table data elements following another table data element should have a bit of space between element contents.
padding-left: 1rem
th
font-family: "MerriweatherSans", "sans-serif"
font-family: MerriweatherSans
font-weight: 700
h2.h2, h3.h3, h4.h4
font-family: "MerriweatherSans", "sans-serif"
font-family: MerriweatherSans
margin-bottom: 1rem
// Remove the margin-top from the paragraphs that follow a heading. Make !important because we have to override the styles set by CKEditor.
h2.h2 + p, h3.h3 + p, h4.h4 + p
@@ -57,24 +57,24 @@ p + h2.h2, p + h3.h3, p + h4.h4, ul + h2.h2, ul + h3.h3, ul + h4.h4, ol + h2.h2,
h2.h2
font-size: 2.2rem
line-height: 2.8rem
font-family: "MerriweatherSans", "sans-serif"
font-family: MerriweatherSans
font-weight: 700
h3.h3
font-size: 1.5rem
line-height: 2rem
font-family: "MerriweatherSans", "sans-serif"
font-family: MerriweatherSans
font-weight: 700
h4.h4
font-size: 1.2rem
line-height: 1.5rem
font-family: "MerriweatherSans", "sans-serif"
font-family: MerriweatherSans
font-weight: 900
//Links using Apostrophe Files or Rich Text Widgets
div[data-apos-widget='apostrophe-files'], .apos-rich-text
a
margin: 0.3rem 0 0.7rem 0 !important
font-family: "MerriweatherSans", 'sans-serif'
font-family: MerriweatherSans
font-size: 1.4rem
line-height: 1.6rem
color: #1c1cc4
@@ -123,7 +123,7 @@ h5
margin: 0.3rem 0 0.7rem 2rem
text-indent: -1.5rem
padding: 0
font-family: "Merriweather", "serif"
font-family: Merriweather
font-size: 1.1rem
line-height: 1.4rem
.apos-rich-text ul ul
@@ -138,7 +138,7 @@ h5
margin: 0.3rem 0 0.7rem 2rem
text-indent: -1.5rem
padding: 0
font-family: "Merriweather", "serif"
font-family: Merriweather
font-size: 1.1rem
line-height: 1.4rem
.apos-rich-text ol ol
@@ -148,7 +148,7 @@ h5
list-style-position: inside
blockquote
font-family: AlexBrush, Serif
font-family: AlexBrush
font-size: 1.2rem
line-height: 1.3rem
margin: .2rem 0
@@ -163,7 +163,7 @@ blockquote
top: 0.5rem
color: lighten(#000, 40%)
p
font-family: AlexBrush, Serif
font-family: AlexBrush
font-size: 2rem
line-height: 2rem
display: inline
@@ -189,10 +189,10 @@ blockquote
.alert
//background: #581d17
margin: 0
padding: 0.4rem 0 0.4rem 1rem
margin: 1.4rem 0
padding: 0.4rem 0 0.4rem 0
font-size: 1.3rem
font-family: "Montserrat-ExtraBold", "sans-serif"
font-family: Montserrat-ExtraBold
line-height: 1.4rem
font-weight: 700
color: #000