diff --git a/lib/modules/apostrophe-assets/public/css/main.css b/lib/modules/apostrophe-assets/public/css/main.css index f1a4055..eee54f0 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css +++ b/lib/modules/apostrophe-assets/public/css/main.css @@ -248,8 +248,8 @@ blockquote p { } .alert { - margin: 1.4rem 0; - padding: 0.4rem 0 0.4rem 0; + margin: 1.2rem 0; + padding: 0.3rem 0 0.3rem 0; font-size: 1.3rem; font-family: Montserrat-ExtraBold; line-height: 1.4rem; @@ -258,12 +258,11 @@ blockquote p { } .alert:before { content: "Alert:"; - border-radius: 0.5rem/1rem; padding: 0.5rem; letter-spacing: 0.2rem; margin-right: 1rem; color: #98025c; - border: 1px black solid; + border: 0; } .alert a { font-size: 1.2rem; @@ -271,6 +270,11 @@ blockquote p { text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3); } +.alert + .alert { + margin-top: 0; + padding-top: 0; +} + .date { background: black; color: white; diff --git a/lib/modules/apostrophe-assets/public/css/main.css.map b/lib/modules/apostrophe-assets/public/css/main.css.map index c44b199..3308790 100644 --- a/lib/modules/apostrophe-assets/public/css/main.css.map +++ b/lib/modules/apostrophe-assets/public/css/main.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["common.sass","main.sass"],"names":[],"mappings":";AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EAGA;EACA;EACA;EACA;EACA;;;AACD;EACC;;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACD;EACC;EACA;;;AAEF;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;AACD;EACC;;;AACF;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAGD;EACC;EACA;;;AAEF;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;;AACD;EACC;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;EACA;EACA;;;AAEF;EACC;;;AAED;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAEF;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EAIA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;EACA;;;AAEF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;;AAOD;EACC;;;AACD;EACC;EACA;;;AACD;EACC,kBAPU;;;AASV;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC,kBAnBQ;;AAoBT;EACC;;;AACF;EACC,kBAvBS;;;AAwBV;EACC;IACC;IACA;IACA;;;AAKF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC","file":"main.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["common.sass","main.sass"],"names":[],"mappings":";AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EAGA;EACA;EACA;EACA;EACA;;;AACD;EACC;;;AAGA;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACF;EACC;;AACD;EACC;EACA;;;AAEF;EACC;EACA;;;AAED;EACC;;;AAED;EACC;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAIA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;;AACD;EACC;;;AACF;EACC;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAGD;EACC;EACA;;;AAEF;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;;;AAED;EACC;;;AAED;EACC;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AACD;EACC;EACA;EACA;EACA;;;AAED;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;;AACD;EACC;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;EACA;EACA;;;AAEF;EACC;;;AAED;EACC;;;AAGD;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;;;AAEF;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EAKA;EACA;EACA;EACA;EAEA;;AACD;EACC;EACA;EACA;;;AACF;EACC;EACA;;;AACD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;;;AAOD;EACC;;;AACD;EACC;EACA;;;AACD;EACC,kBAPU;;;AASV;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC;;AACD;EACC,kBAnBQ;;AAoBT;EACC;;;AACF;EACC,kBAvBS;;;AAwBV;EACC;IACC;IACA;IACA;;;AAKF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC;;;AAEF;EACC;IACC","file":"main.css"} \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/main.sass b/lib/modules/apostrophe-assets/public/css/main.sass index 00940ea..6f4973b 100644 --- a/lib/modules/apostrophe-assets/public/css/main.sass +++ b/lib/modules/apostrophe-assets/public/css/main.sass @@ -189,8 +189,8 @@ blockquote .alert //background: #581d17 - margin: 1.4rem 0 - padding: 0.4rem 0 0.4rem 0 + margin: 1.2rem 0 + padding: 0.3rem 0 0.3rem 0 font-size: 1.3rem font-family: Montserrat-ExtraBold line-height: 1.4rem @@ -201,17 +201,20 @@ blockquote //color: #FFF //background: #98025c //background-image: linear-gradient(45deg, #3023AE 0%, #98025C 100%) - border-radius: .5rem/1rem + //border-radius: .5rem/1rem padding: 0.5rem letter-spacing: 0.2rem margin-right: 1rem color: #98025c - border: 1px black solid + //border: 1px black solid + border: 0 a font-size: 1.2rem line-height: 1.3rem text-shadow: 0 0 0.6rem rgba(158, 243, 113, 0.3) - +.alert+.alert + margin-top: 0 + padding-top: 0 .date background: black color: white diff --git a/lib/modules/apostrophe-assets/public/css/menu.css.map b/lib/modules/apostrophe-assets/public/css/menu.css.map index f1dd054..faa8da6 100644 --- a/lib/modules/apostrophe-assets/public/css/menu.css.map +++ b/lib/modules/apostrophe-assets/public/css/menu.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["common.sass","menu.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AACD;EACC;EACA;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;;AACA;EACC;;AACD;EACC;EACA;;AACD;EACC;;AAGD;EACC;EACA;EACA;;AACD;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EAGC;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;;AACD;EAGC;EACA;EACA;EACA;EACA;EACA;EACA;;AACD;EACC;;AACD;EAEC;EAEA;EACA;EACA;EACA;EACA;EACA;;AACA;EACC;EACA;;AACD;EACC;EACA;EACA;EACA;;;AAiBJ;EACC;IACC;;EAEC;IACC;;EACD;IACC;;EACD;IACC","file":"menu.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["common.sass","menu.sass"],"names":[],"mappings":"AAAA;EACC;;AACA;EACC;EACA;;AAED;EACC;EACA;EACA;;;AACF;EACC;EACA;EACA;EACA;EACA;EACA;;;ACdD;EACC;EACA;;AAED;EACC;EACA;;AAED;EACC;EACA;;AAED;EACC;EACA;;AAED;EACC;EACA;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;;AAEA;EACC;;AAED;EACC;EACA;;AAED;EACC;;AAGD;EACC;EACA;EACA;;AAED;EAEC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EACA;EACA;EACA;EACA;;AAED;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;;AAEF;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EAGC;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;;AAED;EAGC;EACA;EACA;EACA;EACA;EACA;EACA;;AAED;EACC;;AAED;EAEC;EAEA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACC;EACA;;AAED;EACC;EACA;EACA;EACA;;;AAiBJ;EACC;IACC;;EAGC;IACC;;EAED;IACC;;EAED;IACC","file":"menu.css"} \ No newline at end of file diff --git a/lib/modules/apostrophe-assets/public/css/menu.sass b/lib/modules/apostrophe-assets/public/css/menu.sass index b8c19a5..cc55adf 100644 --- a/lib/modules/apostrophe-assets/public/css/menu.sass +++ b/lib/modules/apostrophe-assets/public/css/menu.sass @@ -3,15 +3,19 @@ @font-face font-family: "OpenSans" src: url('/modules/theme/fonts/OpenSans-Regular.ttf') format("truetype") + @font-face font-family: "OpenSansLight" src: url('/modules/theme/fonts/OpenSans-Light.ttf') format("truetype") + @font-face font-family: "OpenSansSemiBold" src: url('/modules/theme/fonts/OpenSans-SemiBold.ttf') format("truetype") + @font-face font-family: "OpenSansBold" src: url('/modules/theme/fonts/OpenSans-Bold.ttf') format("truetype") + @font-face font-family: "OpenSansExtraBold" src: url('/modules/theme/fonts/OpenSans-ExtraBold.ttf') format("truetype") @@ -23,16 +27,20 @@ font-family: Arial sans-serif font-size: 1rem position: relative + ul list-style: none margin: 0 padding-left: 0 background: inherit + li:hover cursor: pointer + li:hover, li:focus-within background: #33492b text-shadow: 0 0 20px rgb(255, 255, 255) + li:focus-within outline: none //li:hover div.dropdown-content, li div.dropdown-content:hover, li:hover div.dropdown-chevron, li div.dropdown-chevron:hover, @@ -41,6 +49,7 @@ visibility: visible opacity: 1 display: block + li @extend .noselect color: white @@ -52,6 +61,7 @@ transition-property: background transition-duration: 0.5s cursor: pointer + > a text-decoration: none color: white @@ -59,6 +69,7 @@ font-size: .8rem letter-spacing: .1rem text-transform: uppercase + div.dropdown-chevron cursor: default text-shadow: none @@ -71,6 +82,7 @@ text-align: center font-size: 2rem cursor: pointer + i top: 0 left: 0 @@ -83,6 +95,7 @@ //color: #333 z-index: 9999 color: white + div.dropdown-content tab-index: -1 cursor: default @@ -103,8 +116,9 @@ display: none width: 100% z-index: 9998 - box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2) + box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2) border-top: white 1rem solid + .dropdown-content h1 //font-size: 3rem @@ -118,6 +132,7 @@ //background-color: #555 border-bottom: 2px solid grey width: 100% + h2 //font-size: 1.5rem //font-family: Roboto Arial sans-serif @@ -128,8 +143,10 @@ margin: .6rem 0 .4rem 0 border-bottom: #656565 1.5px dashed color: #CCC + .row width: 100% + a @extend .noselect font-size: 0.9rem @@ -140,9 +157,11 @@ text-decoration: none margin: .5rem 0 .5rem .6rem display: block + &:hover color: #ff7700 text-decoration: underline + sup font-size: 0.6rem font-family: OpenSansLight @@ -167,10 +186,13 @@ @media only screen and (max-width: 500px) .navbar font-size: 1.4rem + .dropdown-content h1 font-size: 2rem + h2 font-size: 2rem + a font-size: 1.5rem diff --git a/views/layout.html b/views/layout.html index c3462c8..23599fc 100644 --- a/views/layout.html +++ b/views/layout.html @@ -53,7 +53,9 @@