diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a9faf8e..49419eb1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,8 +64,6 @@ jobs: - name: Run Spec Tests run: bundle exec rake spec publish: - needs: - - test if: ${{ (!github.event.pull_request) && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/deploy/') || startsWith(github.ref, 'refs/heads/build/')) }} runs-on: ubuntu-latest env: diff --git a/Dockerfile b/Dockerfile index 182c5f76..c90a3118 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,11 @@ ENV BUILD_DEPS="build-essential libpq-dev libsqlite3-dev tzdata locales git curl RUN useradd -m -U app && \ su -s /bin/bash -c "mkdir -p /home/app" app +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list && \ + sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list && \ + sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \ + echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until + RUN apt-get update -qq && \ apt-get install -y $BUILD_DEPS --no-install-recommends @@ -40,8 +45,9 @@ RUN \ unzip -o /tmp/fits-${FITS_VERSION}.zip && \ \ # Update bundler - gem update --system && \ - gem update bundler + gem install rubygems-update --version 3.3.24 && \ + update_rubygems && \ + gem install bundler --version 2.3.8 USER app WORKDIR /home/app @@ -73,6 +79,11 @@ ENV RUNTIME_DEPS="imagemagick libexif12 libexpat1 libgif7 glib-2.0 libgsf-1-114 LANG="en_US.UTF-8" \ FITS_VERSION="1.0.5" +RUN sed -i '/stretch-updates/d' /etc/apt/sources.list && \ + sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list && \ + sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \ + echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99no-check-valid-until + RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 && \ apt-get update -qq && \ apt-get install -y curl gnupg2 --no-install-recommends && \ @@ -103,8 +114,9 @@ RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 && \ apt-get clean -y && \ rm -rf /var/lib/apt/lists/* /tmp/*.deb && \ # Update Bundler - gem update --system && \ - gem update bundler + gem install rubygems-update --version 3.3.24 && \ + update_rubygems && \ + gem install bundler --version 2.3.8 COPY --from=base /tmp/stage/bin/* /usr/local/bin/ COPY --from=base /tmp/stage/fits-${FITS_VERSION} /usr/local/fits @@ -122,5 +134,5 @@ RUN bundle config set path 'vendor/gems' && \ EXPOSE 3000 ENV PATH="/home/app/bin:${PATH}" -CMD bin/boot_container +CMD bundle exec bin/boot_container HEALTHCHECK --start-period=60s CMD curl -f http://localhost:3000/ diff --git a/app/assets/stylesheets/nuwebcomm/base/_core.scss b/app/assets/stylesheets/nuwebcomm/base/_core.scss index 45a45f35..162b4dfc 100644 --- a/app/assets/stylesheets/nuwebcomm/base/_core.scss +++ b/app/assets/stylesheets/nuwebcomm/base/_core.scss @@ -1,347 +1,358 @@ // core * { - box-sizing: border-box; + box-sizing: border-box; } html { - overflow-y: scroll; // prevents scrollbar jumping on small pages + overflow-y: scroll; // prevents scrollbar jumping on small pages } body { - font: 62.5%/1.7em $AkkuratProRegular; - text-rendering: optimizeLegibility; // enables kerning - -webkit-font-smoothing: antialiased; // fixes blurry fonts on chrome/safari - -moz-osx-font-smoothing: grayscale; // fixes blurry fonts on firefox for osx - -webkit-text-size-adjust: 100%; // disables auto-zoom text, allows user zoom - -moz-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; - color: $rich-black-80; - background: $white; - min-width: 98%; - height: 100%; - overflow-x: hidden; + font: 62.5%/1.7em $AkkuratProRegular; + text-rendering: optimizeLegibility; // enables kerning + -webkit-font-smoothing: antialiased; // fixes blurry fonts on chrome/safari + -moz-osx-font-smoothing: grayscale; // fixes blurry fonts on firefox for osx + -webkit-text-size-adjust: 100%; // disables auto-zoom text, allows user zoom + -moz-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + color: $rich-black-80; + background: $white; + min-width: 98%; + height: 100%; + overflow-x: hidden; } -a:focus { // for accessible links - outline: 1px dashed; +a:focus { + // for accessible links + outline: 1px dashed; } -a:active { // remove outline from mouse clicks - outline: none; +a:active { + // remove outline from mouse clicks + outline: none; } a.screen-reader-shortcut { - left: .5em; - position: absolute; - top: -99px; - - &:focus { - background-color: $white; - box-shadow: 0 0 .3rem .3rem rgba(0, 0, 0, 0.6); - color: $nu-purple-120; - font: bold 1.5em sans-serif; - padding: 1rem; - top: .5rem; - z-index: 5; - } + left: 0.5em; + position: absolute; + top: -99px; + + &:focus { + background-color: $white; + box-shadow: 0 0 0.3rem 0.3rem rgba(0, 0, 0, 0.6); + color: $nu-purple-120; + font: bold 1.5em sans-serif; + padding: 1rem; + top: 0.5rem; + z-index: 5; + } } -#container { - position: relative; - background: $white; +#container { + position: relative; + background: $white; } #main-content { - font-size: 16px; - line-height: 1.7em; - outline: none !important; // removes outline from tabindex + font-size: 16px; + line-height: 1.7em; + outline: none !important; // removes outline from tabindex } - + // centered containers -.contain-780 { // small text regions for section-top - margin: 0 auto; - max-width: 780px; - box-sizing: content-box; +.contain-780 { + // small text regions for section-top + margin: 0 auto; + max-width: 780px; + box-sizing: content-box; } -.contain-850 { // medium text regions for section-top - margin: 0 auto; - max-width: 850px; - box-sizing: content-box; +.contain-850 { + // medium text regions for section-top + margin: 0 auto; + max-width: 850px; + box-sizing: content-box; } -.contain-970 { // big text regions for section-top - margin: 0 auto; - max-width: 970px; - box-sizing: content-box; +.contain-970 { + // big text regions for section-top + margin: 0 auto; + max-width: 970px; + box-sizing: content-box; } -.contain-1120 { - margin: 0 auto; - max-width: 1120px; - box-sizing: content-box; +.contain-1120 { + margin: 0 auto; + max-width: 1120px; + box-sizing: content-box; } .contain-1440 { - margin: 0 auto; - max-width: 1440px; + margin: 0 auto; + max-width: 1440px; } // breadcrumbs ul#breadcrumbs { - list-style: none; - font: 12px/1.5rem $AkkuratProBold; - text-transform: uppercase; - padding: 0 0 .5rem 0; - margin-bottom: 2rem; - border-bottom: 4px solid $light-grey; - min-height: 30px; - - li { - display: inline; - background: url("#{$path-images}/icons/arrow-right-ltpurple.svg") no-repeat center left 8px / 8px 8px; - padding-left: 2em; - - &:first-child { - background: none; - padding-left: 0; - } - - &.active { - color: $nu-purple-120; - } - - a { - color: $rich-black-50; - border: none; - text-decoration: none; - - &:hover { - text-decoration: underline; - border: none; - } - } + list-style: none; + font: 12px/1.5rem $AkkuratProBold; + text-transform: uppercase; + padding: 0 0 0.5rem 0; + margin-bottom: 2rem; + border-bottom: 4px solid $light-grey; + min-height: 30px; + + li { + display: inline; + background: url("#{$path-images}/icons/arrow-right-ltpurple.svg") no-repeat + center left 8px / 8px 8px; + padding-left: 2em; + + &:first-child { + background: none; + padding-left: 0; + } + + &.active { + color: $nu-purple-120; + } + + a { + color: $rich-black-50; + border: none; + text-decoration: none; + + &:hover { + text-decoration: underline; + border: none; + } } + } } // misc img { - display: inline-block; - max-width: 100%; - height: auto; - - .outline { // adds border around images - border: 1px solid $medium-grey; - } + display: inline-block; + max-width: 100%; + height: auto; + + .outline { + // adds border around images + border: 1px solid $medium-grey; + } } // scroll to top a#scrollup { - display: none; - opacity: .9; - width: 50px; - height: 50px; - text-indent: -9999px; - position: fixed; - z-index: 999; - right: 2rem; - bottom: 2rem; - background: $nu-purple-120 url("#{$path-images}/icons/arrow-right-white.svg") no-repeat 50% / 14px 18px; - border: 1px solid $white; - transform: rotate(270deg); + display: none; + opacity: 0.9; + width: 50px; + height: 50px; + text-indent: -9999px; + position: fixed; + z-index: 999; + right: 2rem; + bottom: 2rem; + background: $nu-purple-120 url("#{$path-images}/icons/arrow-right-white.svg") + no-repeat 50% / 14px 18px; + border: 1px solid $white; + transform: rotate(270deg); } a:hover#scrollup { - background-color: $nu-purple-60; - transition: .3s + background-color: $nu-purple-60; + transition: 0.3s; } a:focus#scrollup { - border: 2px dashed $white; - outline: none; + border: 2px dashed $white; + outline: none; } -.responsive-table { // enables horizontal scrolling on large tables for small screens - overflow-x: auto; - overflow-y: hidden; - -webkit-overflow-scrolling: touch; - width: 100%; - margin: 1em 0 2em 0; +.responsive-table { + // enables horizontal scrolling on large tables for small screens + overflow-x: auto; + overflow-y: hidden; + -webkit-overflow-scrolling: touch; + width: 100%; + margin: 1em 0 2em 0; } -.responsive-container { // makes iframes, objects and embeds responsive - position: relative; - height: 0; - overflow: hidden; - padding-bottom: 56.25%; - - iframe, - object, - embed { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; +.responsive-container { + // makes iframes, objects and embeds responsive + position: relative; + height: 0; + overflow: hidden; + padding-bottom: 56.25%; + iframe, + object, + embed { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + } + .overlay { + position: absolute; + bottom: 20%; + width: 100%; + text-align: center; + z-index: 5000; + cursor: default; + + h2 { + color: white; + font: 60px/1.2em $PoppinsBold; + margin-bottom: 1rem; + position: relative; + text-shadow: 2px 2px 0 black; } - .overlay { - position: absolute; - bottom: 20%; - width: 100%; - text-align: center; - z-index: 5000; - cursor: default; - - h2 { - color: white; - font: 60px/1.2em $CamptonBold; - margin-bottom: 1rem; - position: relative; - text-shadow: 2px 2px 0 black; - } - } + } } .hide-label { - position: absolute; - left: -10000px; - top: auto; - width: 1px; - height: 1px; - overflow: hidden; + position: absolute; + left: -10000px; + top: auto; + width: 1px; + height: 1px; + overflow: hidden; } -.group:after { // clearfix - content: ""; - display: table; - clear: both; +.group:after { + // clearfix + content: ""; + display: table; + clear: both; } // adds icons to matched file type a[href$=".pdf"], a[href$=".PDF"] { - padding-right: 1.25rem; - background: url("#{$path-images}/icons/pdf.png") no-repeat right center; + padding-right: 1.25rem; + background: url("#{$path-images}/icons/pdf.png") no-repeat right center; } a[href$=".docx"], a[href$=".DOCX"], a[href$=".doc"], a[href$=".DOC"] { - padding-right: 1.25rem; - background: url("#{$path-images}/icons/word.png") no-repeat right center; + padding-right: 1.25rem; + background: url("#{$path-images}/icons/word.png") no-repeat right center; } a[href$=".xlsx"], a[href$=".XLSX"], a[href$=".xls"], a[href$=".XLS"] { - padding-right: 1.25rem; - background: url("#{$path-images}/icons/excel.png") no-repeat right center; + padding-right: 1.25rem; + background: url("#{$path-images}/icons/excel.png") no-repeat right center; } // media queries -@media screen and (max-width: 1140px) { // adds left/right margin for smaller screen widths - - #main-content .contain-1120 { - margin-left: 1rem; - margin-right: 1rem; +@media screen and (max-width: 1140px) { + // adds left/right margin for smaller screen widths + + #main-content .contain-1120 { + margin-left: 1rem; + margin-right: 1rem; + } + + .responsive-container { + .overlay { + bottom: 20%; + + h2 { + font-size: 48px; + } } - - .responsive-container { - - .overlay { - bottom: 20%; - - h2 { - font-size: 48px; - } - } - } + } } @media screen and (max-width: 768px) { - - a#scrollup { - right: 1rem; - bottom: 1rem; + a#scrollup { + right: 1rem; + bottom: 1rem; + } + + .hide-mobile { + display: none; + } + + #page { + // sets stage to reorder #left-nav for mobile + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-direction: column; + flex-direction: column; + -webkit-justify-content: flex-start; + justify-content: flex-start; + } + + .responsive-container { + .overlay { + bottom: 15%; + + h2 { + font-size: 36px; + margin-bottom: 0.5rem; + } } - - .hide-mobile { - display: none; + } + + #back-to-top { + display: block; + font: 18px $AkkuratProBold; + color: $nu-purple-120; + text-align: center; + text-transform: uppercase; + margin: 2rem 0; + + &:before { + background: url("#{$path-images}/icons/arrow-down-ltpurple.svg") no-repeat + 50% / 15px 19px; + padding: 0 25px; + content: " "; } - - #page { // sets stage to reorder #left-nav for mobile - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-flex-direction: column; - flex-direction: column; - -webkit-justify-content: flex-start; - justify-content: flex-start; - } - - .responsive-container { - - .overlay { - bottom: 15%; - - h2 { - font-size: 36px; - margin-bottom: .5rem; - } - } - } - - #back-to-top { - display: block; - font: 18px $AkkuratProBold; - color: $nu-purple-120; - text-align: center; - text-transform: uppercase; - margin: 2rem 0; - - &:before { - background: url("#{$path-images}/icons/arrow-down-ltpurple.svg") no-repeat 50% / 15px 19px; - padding: 0 25px; - content: " "; - } - - &:after { - background: url("#{$path-images}/icons/arrow-down-ltpurple.svg") no-repeat 50% / 15px 19px; - background-size: 15px 19px; - padding: 0 25px; - content: " "; - } + + &:after { + background: url("#{$path-images}/icons/arrow-down-ltpurple.svg") no-repeat + 50% / 15px 19px; + background-size: 15px 19px; + padding: 0 25px; + content: " "; } - - #back-to-top { - margin: 2rem 0 2rem 0; - - &:before { - background: url("#{$path-images}/icons/arrow-up-ltpurple.svg") no-repeat 50% / 15px 19px; - } - - &:after { - background: url("#{$path-images}/icons/arrow-up-ltpurple.svg") no-repeat 50% / 15px 19px; - } + } + + #back-to-top { + margin: 2rem 0 2rem 0; + + &:before { + background: url("#{$path-images}/icons/arrow-up-ltpurple.svg") no-repeat + 50% / 15px 19px; + } + + &:after { + background: url("#{$path-images}/icons/arrow-up-ltpurple.svg") no-repeat + 50% / 15px 19px; } + } } @media screen and (max-width: 480px) { - - .responsive-container { - - .overlay { - bottom: 10%; - - h2 { - font-size: 24px; - margin-bottom: .5rem; - } - } - } -} \ No newline at end of file + .responsive-container { + .overlay { + bottom: 10%; + + h2 { + font-size: 24px; + margin-bottom: 0.5rem; + } + } + } +} diff --git a/app/assets/stylesheets/nuwebcomm/base/_typography.scss b/app/assets/stylesheets/nuwebcomm/base/_typography.scss index 26e0e2ec..6d840a53 100644 --- a/app/assets/stylesheets/nuwebcomm/base/_typography.scss +++ b/app/assets/stylesheets/nuwebcomm/base/_typography.scss @@ -2,19 +2,19 @@ // headers h2 { - font: 46px/1.2em $CamptonExtraLight; + font: 46px/1.2em $PoppinsExtraLight; color: $nu-purple; margin-bottom: 1rem; } h3 { - font: 30px/1.2em $CamptonBold; + font: 30px/1.2em $PoppinsBold; color: $nu-purple; margin-bottom: 0.5rem; &.demo { // used only for boilerplate.html (not for production!) - font: 26px/1.2em $CamptonBold; + font: 26px/1.2em $PoppinsBold; background: $nu-purple-120; color: $white; padding: 1rem; @@ -35,7 +35,7 @@ h5 { } h6 { - font: 18px/1.3em $CamptonBold; + font: 18px/1.3em $PoppinsBold; color: $rich-black-50; margin-bottom: 0.5rem; } @@ -125,7 +125,7 @@ h6 { > li { list-style: none; - background: url('#{$path-images}/icons/bullet.png') 0 0.6em no-repeat; + background: url("#{$path-images}/icons/bullet.png") 0 0.6em no-repeat; padding: 0 0 0.5em 1.5em; &:last-child { @@ -361,71 +361,71 @@ h6 { // web fonts @font-face { - font-family: 'Akkurat Pro Light'; - src: url('#{$path-fonts}/AkkuratProLight.woff') format('woff'); + font-family: "Akkurat Pro Light"; + src: url("#{$path-fonts}/AkkuratProLight.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Light Italic'; - src: url('#{$path-fonts}/AkkuratProLightItalic.woff') format('woff'); + font-family: "Akkurat Pro Light Italic"; + src: url("#{$path-fonts}/AkkuratProLightItalic.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Regular'; - src: url('#{$path-fonts}/AkkuratProRegular.woff') format('woff'); + font-family: "Akkurat Pro Regular"; + src: url("#{$path-fonts}/AkkuratProRegular.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Italic'; - src: url('#{$path-fonts}/AkkuratProItalic.woff') format('woff'); + font-family: "Akkurat Pro Italic"; + src: url("#{$path-fonts}/AkkuratProItalic.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Bold'; - src: url('#{$path-fonts}/AkkuratProBold.woff') format('woff'); + font-family: "Akkurat Pro Bold"; + src: url("#{$path-fonts}/AkkuratProBold.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Bold Italic'; - src: url('#{$path-fonts}/AkkuratProBoldItalic.woff') format('woff'); + font-family: "Akkurat Pro Bold Italic"; + src: url("#{$path-fonts}/AkkuratProBoldItalic.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Campton Book'; - src: url('#{$path-fonts}/CamptonBook.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Light"; + src: url("#{$path-fonts}/Poppins-Light.woff") format("woff"); + font-weight: 300; font-style: normal; } @font-face { - font-family: 'Campton Bold'; - src: url('#{$path-fonts}/CamptonBold.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Bold"; + src: url("#{$path-fonts}/Poppins-Bold.woff") format("woff"); + font-weight: 700; font-style: normal; } @font-face { - font-family: 'Campton Extra Bold'; - src: url('#{$path-fonts}/CamptonExtraBold.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Extra Bold"; + src: url("#{$path-fonts}/Poppins-ExtraBold.woff") format("woff"); + font-weight: 800; font-style: normal; } @font-face { - font-family: 'Campton Extra Light'; - src: url('#{$path-fonts}/CamptonExtraLight.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Extra Light"; + src: url("#{$path-fonts}/Poppins-ExtraLight.woff") format("woff"); + font-weight: 100; font-style: normal; } diff --git a/app/assets/stylesheets/nuwebcomm/base/_variables.scss b/app/assets/stylesheets/nuwebcomm/base/_variables.scss index 17371356..9934f717 100644 --- a/app/assets/stylesheets/nuwebcomm/base/_variables.scss +++ b/app/assets/stylesheets/nuwebcomm/base/_variables.scss @@ -62,7 +62,7 @@ $AkkuratProRegular: "Akkurat Pro Regular", Arial, sans-serif; $AkkuratProItalic: "Akkurat Pro Italic", Arial, sans-serif; $AkkuratProBold: "Akkurat Pro Bold", "Arial Black", sans-serif; $AkkuratProBoldItalic: "Akkurat Pro Bold Italic", "Arial Black", sans-serif; -$CamptonBook: "Campton Book", Tahoma, sans-serif; -$CamptonBold: "Campton Bold", Impact, sans-serif; -$CamptonExtraBold: "Campton Extra Bold", Impact, sans-serif; -$CamptonExtraLight: "Campton Extra Light", "Courier New", sans-serif; \ No newline at end of file +$PoppinsLight: "Poppins Light", Tahoma, sans-serif; +$PoppinsBold: "Poppins Bold", Impact, sans-serif; +$PoppinsExtraBold: "Poppins Extra Bold", Impact, sans-serif; +$PoppinsExtraLight: "Poppins Extra Light", "Courier New", sans-serif; diff --git a/app/assets/stylesheets/nuwebcomm/overrides/_typography.scss b/app/assets/stylesheets/nuwebcomm/overrides/_typography.scss index 7e631e34..afc5d3be 100644 --- a/app/assets/stylesheets/nuwebcomm/overrides/_typography.scss +++ b/app/assets/stylesheets/nuwebcomm/overrides/_typography.scss @@ -2,19 +2,19 @@ // headers h2 { - font: 46px/1.2em $CamptonExtraLight; + font: 46px/1.2em $PoppinsExtraLight; color: $nu-purple; margin-bottom: 1rem; } h3 { - font: 30px/1.2em $CamptonBold; + font: 30px/1.2em $PoppinsBold; color: $nu-purple; margin-bottom: 0.5rem; &.demo { // used only for boilerplate.html (not for production!) - font: 26px/1.2em $CamptonBold; + font: 26px/1.2em $PoppinsBold; background: $nu-purple-120; color: $white; padding: 1rem; @@ -35,7 +35,7 @@ h5 { } h6 { - font: 18px/1.3em $CamptonBold; + font: 18px/1.3em $PoppinsBold; color: $rich-black-50; margin-bottom: 0.5rem; } @@ -365,71 +365,71 @@ h6 { // web fonts @font-face { - font-family: 'Akkurat Pro Light'; - src: url('#{$path-fonts}/AkkuratProLight.woff') format('woff'); + font-family: "Akkurat Pro Light"; + src: url("#{$path-fonts}/AkkuratProLight.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Light Italic'; - src: url('#{$path-fonts}/AkkuratProLightItalic.woff') format('woff'); + font-family: "Akkurat Pro Light Italic"; + src: url("#{$path-fonts}/AkkuratProLightItalic.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Regular'; - src: url('#{$path-fonts}/AkkuratProRegular.woff') format('woff'); + font-family: "Akkurat Pro Regular"; + src: url("#{$path-fonts}/AkkuratProRegular.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Italic'; - src: url('#{$path-fonts}/AkkuratProItalic.woff') format('woff'); + font-family: "Akkurat Pro Italic"; + src: url("#{$path-fonts}/AkkuratProItalic.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Bold'; - src: url('#{$path-fonts}/AkkuratProBold.woff') format('woff'); + font-family: "Akkurat Pro Bold"; + src: url("#{$path-fonts}/AkkuratProBold.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Akkurat Pro Bold Italic'; - src: url('#{$path-fonts}/AkkuratProBoldItalic.woff') format('woff'); + font-family: "Akkurat Pro Bold Italic"; + src: url("#{$path-fonts}/AkkuratProBoldItalic.woff") format("woff"); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Campton Book'; - src: url('#{$path-fonts}/CamptonBook.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Light"; + src: url("#{$path-fonts}/Poppins-Light.woff") format("woff"); + font-weight: 300; font-style: normal; } @font-face { - font-family: 'Campton Bold'; - src: url('#{$path-fonts}/CamptonBold.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Bold"; + src: url("#{$path-fonts}/Poppins-Bold.woff") format("woff"); + font-weight: 700; font-style: normal; } @font-face { - font-family: 'Campton Extra Bold'; - src: url('#{$path-fonts}/CamptonExtraBold.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Extra Bold"; + src: url("#{$path-fonts}/Poppins-ExtraBold.woff") format("woff"); + font-weight: 800; font-style: normal; } @font-face { - font-family: 'Campton Extra Light'; - src: url('#{$path-fonts}/CamptonExtraLight.woff') format('woff'); - font-weight: normal; + font-family: "Poppins Extra Light"; + src: url("#{$path-fonts}/Poppins-ExtraLight.woff") format("woff"); + font-weight: 100; font-style: normal; } diff --git a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_alternate-photo-float.scss b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_alternate-photo-float.scss index 8c20aa7a..4e30fd95 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_alternate-photo-float.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_alternate-photo-float.scss @@ -1,252 +1,243 @@ // alternating photo float (images and text) .landing-page { + .alternate-photo-float { + margin-bottom: 5rem; + @extend %clearfix; + + h4 { + font: 30px $AkkuratProRegular; + color: $rich-black-50; + border-bottom: 4px solid $medium-grey; + text-transform: none; + padding-bottom: 0.5rem; + } - .alternate-photo-float { - margin-bottom: 5rem; - @extend %clearfix; - - h4 { - font: 30px $AkkuratProRegular; - color: $rich-black-50; - border-bottom: 4px solid $medium-grey; - text-transform: none; - padding-bottom: .5rem; + .image-left, + .image-right, + .text { + width: 550px / 1120px * 100%; + max-width: 550px; + margin-right: 40px / 1120px * 100%; + float: left; + position: relative; + max-height: 310px; + + &:last-child { + margin-right: 0; + } + } + + .text { + width: 530px / 1120px * 100%; + max-width: 530px; + margin-right: 40px / 1120px * 100%; + max-height: none; + + &:last-child { + margin-right: 0; + } + + &.tl-text { + color: #4e2a84; + font: 24px/1.2em $PoppinsLight; + margin-bottom: 1em; + } + + ul { + list-style: none; + margin: 0; + padding: 0; + -moz-column-count: 2; + -webkit-column-count: 2; + column-count: 2; + -webkit-column-gap: 2em; + -moz-column-gap: 3em; + column-gap: 2em; + margin: 0; + padding: 0; + + li { + background: none; + padding: 0 0 0.5em 0; + line-height: 1.5em; + -webkit-column-break-inside: avoid; + page-break-inside: avoid; + break-inside: avoid; } - - .image-left, .image-right, .text { - width: 550px / 1120px * 100%; - max-width: 550px; - margin-right: 40px / 1120px * 100%; - float: left; - position: relative; - max-height: 310px; - - &:last-child { - margin-right: 0; - } + } + + .column { + // multiple column option + width: 45%; + margin-right: 5%; + float: left; + + &:last-child { + margin-right: 0; } - - .text { - width: 530px / 1120px * 100%; - max-width: 530px; - margin-right: 40px / 1120px * 100%; - max-height: none; - - &:last-child { - margin-right: 0; - } - - &.tl-text { - color: #4e2a84; - font: 24px/1.2em "Campton Book",Tahoma,sans-serif; - margin-bottom: 1em; - } - - ul { - list-style: none; - margin: 0; - padding: 0; - -moz-column-count: 2; - -webkit-column-count: 2; - column-count: 2; - -webkit-column-gap: 2em; - -moz-column-gap: 3em; - column-gap: 2em; - margin: 0; - padding: 0; - - li { - background: none; - padding: 0 0 .5em 0; - line-height: 1.5em; - -webkit-column-break-inside: avoid; - page-break-inside: avoid; - break-inside: avoid; - } - } - - .column { // multiple column option - width: 45%; - margin-right: 5%; - float: left; - - &:last-child { - margin-right: 0; - } - - ul { - -moz-column-count: 1; - -webkit-column-count: 1; - column-count: 1; - -webkit-column-gap: normal; - -moz-column-gap: normal; - column-gap: normal; - } - } - - img { - z-index: 30; - } + + ul { + -moz-column-count: 1; + -webkit-column-count: 1; + column-count: 1; + -webkit-column-gap: normal; + -moz-column-gap: normal; + column-gap: normal; } - - .text-over-image { - position: absolute; - top: 20%; - width: 100%; - color: $white; - text-align: center; - z-index: 31; - padding: 0 1em; - font: 24px $CamptonExtraBold; - - p { - margin: 0; - } - - .big { - font: 72px/1em $CamptonBold; - } - } + } + + img { + z-index: 30; + } } - // media queries - @media screen and (max-width: 1150px) { - - .alternate-photo-float { - - .quote { - font-size: 20px; - } - } + .text-over-image { + position: absolute; + top: 20%; + width: 100%; + color: $white; + text-align: center; + z-index: 31; + padding: 0 1em; + font: 24px $PoppinsExtraBold; + + p { + margin: 0; + } + + .big { + font: 72px/1em $PoppinsBold; + } } - - @media screen and (max-width: 900px) { - - .alternate-photo-float { - - .quote { - font-size: 18px; - } - - .text-over-image { - top: 5%; // positions text - font-size: 24px; - - .big { - font-size: 60px; - line-height: 1em; - } - } - } + } + + // media queries + @media screen and (max-width: 1150px) { + .alternate-photo-float { + .quote { + font-size: 20px; + } } - - @media screen and (max-width: 875px) { - - .alternate-photo-float { - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-flex-direction: column; - flex-direction: column; - -webkit-justify-content: flex-start; - justify-content: flex-start; - margin-bottom: 2rem; - margin-left: auto; - margin-right: auto; - max-width: 550px; - - h4 { - font-size: 24px; - margin-top: 1rem; - } - - .image-left, .image-right, .text { - width: 100%; - float: none; - position: relative; - margin-right: 0; - - &:last-child { - margin-right: auto; - } - } - - .image-right { - -webkit-order: -1; - -ms-flex-order: -1; - order: -1; // flexbox moves content to top - } - - .text-over-image { - top: 20%; // positions text - } + } + + @media screen and (max-width: 900px) { + .alternate-photo-float { + .quote { + font-size: 18px; + } + + .text-over-image { + top: 5%; // positions text + font-size: 24px; + + .big { + font-size: 60px; + line-height: 1em; } + } } - - @media screen and (max-width: 768px) { - - .alternate-photo-float .text.tl-text { - font-size: 22px; + } + + @media screen and (max-width: 875px) { + .alternate-photo-float { + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-direction: column; + flex-direction: column; + -webkit-justify-content: flex-start; + justify-content: flex-start; + margin-bottom: 2rem; + margin-left: auto; + margin-right: auto; + max-width: 550px; + + h4 { + font-size: 24px; + margin-top: 1rem; + } + + .image-left, + .image-right, + .text { + width: 100%; + float: none; + position: relative; + margin-right: 0; + + &:last-child { + margin-right: auto; } + } + + .image-right { + -webkit-order: -1; + -ms-flex-order: -1; + order: -1; // flexbox moves content to top + } + + .text-over-image { + top: 20%; // positions text + } } - - @media screen and (max-width: 480px) { - - .alternate-photo-float { - - .text.tl-text { - font-size: 18px; - } - - .text-over-image { - top: 1em; // positions text - font-size: 20px; - - .big { - font-size: 42px; - } - } - - .text { - .column { // multiple column option - width: 100%; - } - } - } + } + + @media screen and (max-width: 768px) { + .alternate-photo-float .text.tl-text { + font-size: 22px; } + } + + @media screen and (max-width: 480px) { + .alternate-photo-float { + .text.tl-text { + font-size: 18px; + } + + .text-over-image { + top: 1em; // positions text + font-size: 20px; + + .big { + font-size: 42px; + } + } - @media screen and (max-width: 420px) { - - .alternate-photo-float { - - .text { - - ul { - -moz-column-count: inherit; - -moz-column-gap: inherit;; - -webkit-column-count: inherit; - -webkit-column-gap: inherit; - column-count: inherit; - column-gap: inherit; - } - } + .text { + .column { + // multiple column option + width: 100%; } + } } - - @media screen and (max-width: 380px) { - - .alternate-photo-float { - - .text-over-image { - font-size: 18px; - line-height: 1em; - - .big { - font-size: 36px; - } - } + } + + @media screen and (max-width: 420px) { + .alternate-photo-float { + .text { + ul { + -moz-column-count: inherit; + -moz-column-gap: inherit; + -webkit-column-count: inherit; + -webkit-column-gap: inherit; + column-count: inherit; + column-gap: inherit; } - } + } + } + } -} // end \ No newline at end of file + @media screen and (max-width: 380px) { + .alternate-photo-float { + .text-over-image { + font-size: 18px; + line-height: 1em; + + .big { + font-size: 36px; + } + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_announcement.scss b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_announcement.scss index 328b6806..87def47c 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_announcement.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_announcement.scss @@ -1,62 +1,60 @@ // news-callout module (for important news above hero image) - + .landing-page { + #announcement { + background: $nu-purple-10; + font-size: 18px; + line-height: 1.3em; + padding: 1.5rem; + max-width: 1440px; - #announcement { - background: $nu-purple-10; - font-size: 18px; - line-height: 1.3em; - padding: 1.5rem; - max-width: 1440px; - - h2 { - font: 34px $CamptonBold; - } - - h3 { - font: 26px $CamptonBold; - background: none; - text-align: left; - - &::before, &::after { - background: none; - padding: 0; - } - } - - h4 { - font: 21px $CamptonBold; - } - - h5 { - font: 18px $CamptonBold; - } - - a { - color: $nu-purple; - font-weight: bold; - text-decoration: none; - - &:hover { - text-decoration: underline; - } - } - - @media screen and (max-width: 768px) { - - h2 { - font-size: 26px; - line-height: 1.2em; - } - - h3 { - font-size: 21px; - } - - h4 { - font-size: 18px; - } - } + h2 { + font: 34px $PoppinsBold; + } + + h3 { + font: 26px $PoppinsBold; + background: none; + text-align: left; + + &::before, + &::after { + background: none; + padding: 0; + } + } + + h4 { + font: 21px $PoppinsBold; + } + + h5 { + font: 18px $PoppinsBold; + } + + a { + color: $nu-purple; + font-weight: bold; + text-decoration: none; + + &:hover { + text-decoration: underline; + } } -} // end \ No newline at end of file + @media screen and (max-width: 768px) { + h2 { + font-size: 26px; + line-height: 1.2em; + } + + h3 { + font-size: 21px; + } + + h4 { + font-size: 18px; + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_large-feature.scss b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_large-feature.scss index b08a743f..19b9bd99 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_large-feature.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_large-feature.scss @@ -1,175 +1,174 @@ // large feature (photo/text/links) .landing-page { + .large-feature { + padding: 4rem; + background: url("#{$path-images}/slashes-grey-bg.gif") repeat; + } - .large-feature { - padding: 4rem; - background: url("#{$path-images}/slashes-grey-bg.gif") repeat; + .large-feature-inner { + max-width: 1120px; + margin: 3rem auto 0 auto; + box-sizing: content-box; + @extend %clearfix; + + .content-side { + width: 880px / 1120px * 100%; + float: left; + border-right: 1px solid $medium-grey; + padding-right: 40px / 1120px * 100%; + + img { + float: left; + margin: 0 2rem 2rem 0; + } + + h4 { + font: 48px/1.1em $PoppinsBold; + margin-bottom: 3rem; + color: $nu-purple; + } } - - .large-feature-inner { - max-width: 1120px; - margin: 3rem auto 0 auto; - box-sizing: content-box; - @extend %clearfix; - - .content-side { - width: 880px / 1120px * 100%; - float: left; - border-right: 1px solid $medium-grey; - padding-right: 40px / 1120px * 100%; - - img { - float: left; - margin: 0 2rem 2rem 0 - } - - h4 { - font: 48px/1.1em $CamptonBold; - margin-bottom: 3rem; - color: $nu-purple; - } - } - - > ul { // original setup for links on right side - width: 240px / 1120px * 100%; - float: left; - padding-left: 0; - margin-left: 0; - - li { - background: none; - line-height: 1.2rem; - margin-bottom: 1rem; - - &:after { - background: url("#{$path-images}/icons/arrow-right-dkpurple.svg") no-repeat 50% / 6px; - padding-right: 2rem; - content: " "; - } - - a { - font-family: $AkkuratProBold; - } - } + + > ul { + // original setup for links on right side + width: 240px / 1120px * 100%; + float: left; + padding-left: 0; + margin-left: 0; + + li { + background: none; + line-height: 1.2rem; + margin-bottom: 1rem; + + &:after { + background: url("#{$path-images}/icons/arrow-right-dkpurple.svg") + no-repeat 50% / 6px; + padding-right: 2rem; + content: " "; } - - .right-side { // new setup for links/other content on right side - width: 240px / 1120px * 100%; - float: left; - padding-left: 1.5rem; - - h4 { - font: 24px $AkkuratProRegular; - padding-bottom: .5rem; - margin-bottom: 1.5rem; - border-bottom: 4px solid $medium-grey; - color: $rich-black-50; - } - - ul { - padding-left: 0; - margin-left: 0; - - li { - background: none; - line-height: 1.2rem; - margin: 0 0 1rem 0; - padding-left: 0; - - &:after { - background: url("#{$path-images}/icons/arrow-right-dkpurple.svg") no-repeat 50% / 6px; - padding-right: 2rem; - content: " "; - } - - a { - font-family: $AkkuratProBold; - } - } - } + + a { + font-family: $AkkuratProBold; } + } } - // media queries - @media screen and (max-width: 1100px) { - - .large-feature-inner { - - .content-side, > ul, .right-side { - float: none; - width: 100%; - border: none; - border-right: 0; - - li { - padding-left: 0; - } - } - - .content-side { - padding-right: 0; - - &:after { - content: ""; - display: table; - clear: both; - } - } - - .right-side { - padding-left: 0; - } - } - } - - @media screen and (max-width: 850px) { - - .large-feature-wrap { - padding: 2rem; + .right-side { + // new setup for links/other content on right side + width: 240px / 1120px * 100%; + float: left; + padding-left: 1.5rem; + + h4 { + font: 24px $AkkuratProRegular; + padding-bottom: 0.5rem; + margin-bottom: 1.5rem; + border-bottom: 4px solid $medium-grey; + color: $rich-black-50; + } + + ul { + padding-left: 0; + margin-left: 0; + + li { + background: none; + line-height: 1.2rem; + margin: 0 0 1rem 0; + padding-left: 0; + + &:after { + background: url("#{$path-images}/icons/arrow-right-dkpurple.svg") + no-repeat 50% / 6px; + padding-right: 2rem; + content: " "; + } + + a { + font-family: $AkkuratProBold; + } } - - .large-feature { - padding: 2rem; - - .content-side { - - img { - float: none; - margin-bottom: 1rem; - } - - h4 { - font-size: 36px; - } - } + } + } + } + + // media queries + @media screen and (max-width: 1100px) { + .large-feature-inner { + .content-side, + > ul, + .right-side { + float: none; + width: 100%; + border: none; + border-right: 0; + + li { + padding-left: 0; } + } + + .content-side { + padding-right: 0; + + &:after { + content: ""; + display: table; + clear: both; + } + } + + .right-side { + padding-left: 0; + } + } + } + + @media screen and (max-width: 850px) { + .large-feature-wrap { + padding: 2rem; } - - @media screen and (max-width: 480px) { - - .large-feature-wrap { - padding: 1rem; + + .large-feature { + padding: 2rem; + + .content-side { + img { + float: none; + margin-bottom: 1rem; } - - .large-feature { - padding: 2rem 1rem; - - h3 { - font-size: 20px; - - &:before, &:after { - background: none; - } - } - - .content-side { - - h4 { - font-size: 28px; - } - } + + h4 { + font-size: 36px; } + } } + } -} // end \ No newline at end of file + @media screen and (max-width: 480px) { + .large-feature-wrap { + padding: 1rem; + } + + .large-feature { + padding: 2rem 1rem; + + h3 { + font-size: 20px; + + &:before, + &:after { + background: none; + } + } + + .content-side { + h4 { + font-size: 28px; + } + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_main.scss b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_main.scss index 34abdeb6..844c1313 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_main.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_main.scss @@ -1,107 +1,108 @@ // landing pages (full-width) .landing-page { - - section { - margin-bottom: 5rem; + section { + margin-bottom: 5rem; - &.no-bottom-margin { // this is for heroes when you don't want bottom margin - margin-bottom: 0; - } + &.no-bottom-margin { + // this is for heroes when you don't want bottom margin + margin-bottom: 0; + } + } + + #back-to-top { + margin-bottom: 2rem; + } + + #page { + margin: 0 auto; + max-width: 1440px; + @extend %clearfix; + } + + // main content region + .content { + font-size: 16px; + line-height: 1.7em; + width: 100%; + + // section headers + h3 { + font: 24px $PoppinsExtraBold; + color: $nu-purple; + text-align: center; + + &:before { + background: url("#{$path-images}/icons/grey-slash.svg") no-repeat 50% / + 17px 21px; + padding: 0 20px; + content: " "; + } + + &:after { + background: url("#{$path-images}/icons/grey-slash.svg") no-repeat 50% / + 17px 21px; + padding: 0 25px; + content: " "; + } + } + + p.subhead { + color: #4e2a84; + font: 46px/1.2em $PoppinsLight; + margin-bottom: 1rem; + } + + // section top wrapper for non-hero and non-background-select areas + .section-top { + margin-bottom: 3rem; + text-align: center; + padding: 0 1rem; + + h3 { + margin-bottom: 4rem; + + & + p { + margin-top: -2rem; + } + } + } + } + + @media screen and (max-width: 480px) { + section { + margin-bottom: 2.5rem; } - #back-to-top { - margin-bottom: 2rem; - } - - #page { - margin: 0 auto; - max-width: 1440px; - @extend %clearfix; - } - - // main content region .content { - font-size: 16px; - line-height: 1.7em; - width: 100%; - - // section headers + // consistent headers across elements + .section-top, + .background-select, + .large-feature-wrap, + .in-page { h3 { - font: 24px $CamptonExtraBold; - color: $nu-purple; - text-align: center; - - &:before { - background: url("#{$path-images}/icons/grey-slash.svg") no-repeat 50% / 17px 21px; - padding: 0 20px; - content: " "; - } - - &:after { - background: url("#{$path-images}/icons/grey-slash.svg") no-repeat 50% / 17px 21px; - padding: 0 25px; - content: " "; - } - } + font: 20px $PoppinsExtraBold; + margin-bottom: 1rem; - p.subhead { - color: #4e2a84; - font: 46px/1.2em $CamptonBook; - margin-bottom: 1rem; - } - - // section top wrapper for non-hero and non-background-select areas - .section-top { - margin-bottom: 3rem; - text-align: center; - padding: 0 1rem; - - h3 { - margin-bottom: 4rem; - - &+p { - margin-top: -2rem; - } - } - } - } + & + p { + margin-top: 0; + } + + &:before { + background: none; + padding: 0; + } - @media screen and (max-width: 480px) { - - section { - margin-bottom: 2.5rem; + &:after { + background: none; + padding: 0; + } } - - .content { - - // consistent headers across elements - .section-top, .background-select, .large-feature-wrap, .in-page { - - h3 { - font: 20px $CamptonExtraBold; - margin-bottom: 1rem; - - &+p { - margin-top: 0; - } - - &:before { - background: none; - padding: 0; - } - - &:after { - background: none; - padding: 0; - } - } - - p.subhead { - font-size: 28px; - } - } + + p.subhead { + font-size: 28px; } + } } - -} // end of .landing-page \ No newline at end of file + } +} // end of .landing-page diff --git a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_number-boxes.scss b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_number-boxes.scss index e0dca4cd..3a10d269 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_number-boxes.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_number-boxes.scss @@ -1,64 +1,59 @@ // number boxes (purple background with faint slashes) .landing-page { - - .number-boxes { - background: $nu-purple url("#{$path-images}/slashes.purple-bg.gif") repeat; - padding: 2em 1em; - text-align: center; - - .half { - width: 50%; - float: left; - border-right: 1px solid $nu-purple-60; - padding: 2rem 7rem; + .number-boxes { + background: $nu-purple url("#{$path-images}/slashes.purple-bg.gif") repeat; + padding: 2em 1em; + text-align: center; - &:last-child { - border-right: none; - } - - p { - - font: 24px $CamptonExtraBold; - color: $nu-purple-30; - - span { - font: 96px $CamptonBold; - color: $white; - } - } - } - } + .half { + width: 50%; + float: left; + border-right: 1px solid $nu-purple-60; + padding: 2rem 7rem; + + &:last-child { + border-right: none; + } - // media queries - @media screen and (max-width: 768px) { - - .number-boxes .half { - padding: 2rem; + p { + font: 24px $PoppinsExtraBold; + color: $nu-purple-30; + + span { + font: 96px $PoppinsBold; + color: $white; + } + } + } + } - p { - font-size: 18px; + // media queries + @media screen and (max-width: 768px) { + .number-boxes .half { + padding: 2rem; - span { - font-size: 60px; - } - } - } - } - - @media screen and (max-width: 480px) { - - .number-boxes .half { - width: 100%; - float: none; - padding: 2rem; - border-right: none; - border-bottom: 1px solid $nu-purple-60; + p { + font-size: 18px; - &:last-child { - border-bottom: none; - } - } + span { + font-size: 60px; + } + } } + } -} // end \ No newline at end of file + @media screen and (max-width: 480px) { + .number-boxes .half { + width: 100%; + float: none; + padding: 2rem; + border-right: none; + border-bottom: 1px solid $nu-purple-60; + + &:last-child { + border-bottom: none; + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_pullquotes.scss b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_pullquotes.scss index c431a69f..a32b731e 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_pullquotes.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_pullquotes.scss @@ -1,33 +1,31 @@ // pullquotes .landing-page { - - .quote { - font: 24px/1.2em $CamptonBook; - color: $nu-purple; - margin-bottom: 1em; + .quote { + font: 24px/1.2em $PoppinsLight; + color: $nu-purple; + margin-bottom: 1em; - span { - background: url("#{$path-images}/icons/quote.png") no-repeat; - width: 35px; - height: 24px; - display: inline-block; - margin-right: .5rem; - } - - figcaption { - font: 16px/1.4em $AkkuratProRegular; - color: $rich-black-50; - - span { - font: 18px $AkkuratProBold; - background: none; - height: inherit; - width: inherit; - display: inherit; - margin-right: inherit; - } - } - } + span { + background: url("#{$path-images}/icons/quote.png") no-repeat; + width: 35px; + height: 24px; + display: inline-block; + margin-right: 0.5rem; + } -} // end \ No newline at end of file + figcaption { + font: 16px/1.4em $AkkuratProRegular; + color: $rich-black-50; + + span { + font: 18px $AkkuratProBold; + background: none; + height: inherit; + width: inherit; + display: inherit; + margin-right: inherit; + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_stats-callout.scss b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_stats-callout.scss index 04995da1..2fe9e337 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_stats-callout.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/landing-page/_stats-callout.scss @@ -1,112 +1,104 @@ // stats callout .landing-page { - - .stats-callout { - border-top: 4px solid $light-grey; - border-bottom: 4px solid $light-grey; - text-align: center; - padding: 2rem 0; - display: flex; // equal height - -webkit-flex-wrap: wrap; - flex-wrap: wrap; // break into multiple lines - @extend %clearfix; - - div { - width: 33%; - float: left; - padding: 1rem; - margin: 0 auto; - } - - span { - display: table-cell; - vertical-align: middle; + .stats-callout { + border-top: 4px solid $light-grey; + border-bottom: 4px solid $light-grey; + text-align: center; + padding: 2rem 0; + display: flex; // equal height + -webkit-flex-wrap: wrap; + flex-wrap: wrap; // break into multiple lines + @extend %clearfix; + + div { + width: 33%; + float: left; + padding: 1rem; + margin: 0 auto; + } + + span { + display: table-cell; + vertical-align: middle; - &.big { - font: 72px/1.1em $CamptonBold; - color: $nu-purple; - display: block; - } + &.big { + font: 72px/1.1em $PoppinsBold; + color: $nu-purple; + display: block; + } - &.small { - font: 24px $CamptonExtraLight; - color: $nu-purple; - display: block; - } + &.small { + font: 24px $PoppinsExtraLight; + color: $nu-purple; + display: block; + } + } + + // for single callout + &.one-callout { + // append class for full-width single callout item + display: block; + + div { + width: 100%; + float: none; + } + + span { + &.big { + display: inline; } - - // for single callout - &.one-callout { // append class for full-width single callout item - display: block; - - div { - width: 100%; - float: none; - } - - span { - - &.big { - display: inline; - } - - &.small { - display: inline; - padding-left: 1rem; - } - } - } - } - // media queries - @media screen and (max-width: 800px) { - - .stats-callout { - - span { - &.big { - font: 48px $CamptonBold; - } + &.small { + display: inline; + padding-left: 1rem; + } + } + } + } + + // media queries + @media screen and (max-width: 800px) { + .stats-callout { + span { + &.big { + font: 48px $PoppinsBold; + } - &.small { - font: 20px $CamptonExtraLight; - } - } + &.small { + font: 20px $PoppinsExtraLight; } - } + } + } + } - @media screen and (max-width: 550px) { - - .stats-callout { - - span { - - &.big { - font: 24px $CamptonBold; - } + @media screen and (max-width: 550px) { + .stats-callout { + span { + &.big { + font: 24px $PoppinsBold; + } - &.small { - font: 15px $CamptonExtraLight; - } - } - } - } + &.small { + font: 15px $PoppinsExtraLight; + } + } + } + } - @media screen and (max-width: 480px) { - - .stats-callout { // for one callout - - &.one-callout { - - span { + @media screen and (max-width: 480px) { + .stats-callout { + // for one callout - &.big, &.small { - display: block; - } - } - } - } - } - -} // end \ No newline at end of file + &.one-callout { + span { + &.big, + &.small { + display: block; + } + } + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_background-select.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_background-select.scss index 33ef017b..1c2f93fe 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_background-select.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_background-select.scss @@ -1,47 +1,44 @@ // background select (selects a background image behind a large text area) .standard-page { - - .background-select { - width: 100%; - display: table; - min-height: 300px; - margin-bottom: 3rem; - color: $white; - - .background-select-image { - text-align: center; - display: table-cell; - width: 100%; - vertical-align: middle; - position: relative; - padding: 2rem 1em; - } - - h3 { - font: 42px $CamptonBook; - color: $white; - margin-bottom: 1rem; - } - - p { - font-size: 18px; - margin-bottom: 2rem; - } - - .select-date { - font: 18px $CamptonBold; - text-transform: uppercase; - margin-bottom: 1.5rem; - } - } - - // media queries - @media screen and (max-width: 480px) { + .background-select { + width: 100%; + display: table; + min-height: 300px; + margin-bottom: 3rem; + color: $white; - .background-select h3 { - font-size: 28px; - } - } - -} // end \ No newline at end of file + .background-select-image { + text-align: center; + display: table-cell; + width: 100%; + vertical-align: middle; + position: relative; + padding: 2rem 1em; + } + + h3 { + font: 42px $PoppinsLight; + color: $white; + margin-bottom: 1rem; + } + + p { + font-size: 18px; + margin-bottom: 2rem; + } + + .select-date { + font: 18px $PoppinsBold; + text-transform: uppercase; + margin-bottom: 1.5rem; + } + } + + // media queries + @media screen and (max-width: 480px) { + .background-select h3 { + font-size: 28px; + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_main.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_main.scss index d97875e2..ed757537 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_main.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_main.scss @@ -1,203 +1,205 @@ // standard page (with or without left navigation) .standard-page { - - // main content regions - #main-content { // gives content space before hitting footer - min-height: 300px; - margin-bottom: 5rem; + // main content regions + #main-content { + // gives content space before hitting footer + min-height: 300px; + margin-bottom: 5rem; + } + + .content { + width: 836px / 1120px * 100%; + float: right; + margin-bottom: 3rem; + } + + .content-full { + width: 100%; + } + + p + h3, + ul + h3, + ol + h3 { + margin-top: 2.5rem; + } + + ul + h4, + ol + h4, + ul + h5, + ol + h5, + ul + h6, + ol + h6 { + margin-top: 2rem; + } + + p + h4, + p + h6 { + margin-top: 2.5rem; + } + + #page { + margin: 2rem auto 0 auto; + max-width: 1120px; + @extend %clearfix; + + section { + margin-bottom: 3rem; } - - .content { - width: 836px / 1120px * 100%; - float: right; - margin-bottom: 3rem; - } - - .content-full { - width: 100%; - } - - p + h3, - ul + h3, ol + h3 { - margin-top: 2.5rem; + } + + // right sidebar option + #sidebar { + width: 260px / 836px * 100%; + float: right; + margin: 0 0 2rem 2rem; + + .box { + background: $nu-purple-10; + padding: 1rem; + margin-bottom: 2rem; + font-size: 14px; + line-height: 1.4em; + + h3 { + font: 18px/1.2em $PoppinsBold; + color: $rich-black-80; + } + + h4 { + font: 16px/1.2em $AkkuratProBold; + color: $rich-black-80; + margin-top: inherit; + } + + ul { + margin: 1em 0 0.5em 0; + + li { + background-position: 0 0.3em; + } + } } - - ul + h4, ol + h4, - ul + h5, ol + h5, - ul + h6, ol + h6 { - margin-top: 2rem; + } + + // pagination + .pagination { + margin: 2.5em 0 2em; + padding-left: 0; + + li { + display: inline; + padding: 0; } - - p + h4, p + h6 { - margin-top: 2.5rem; - } - - #page { - margin: 2rem auto 0 auto; - max-width: 1120px; - @extend %clearfix; - - section { - margin-bottom: 3rem; - } + + a { + background: $white; + border: 1px solid $medium-grey; + color: $rich-black-50; + font: 16px $AkkuratProBold; + display: inline-block; + margin: 0 0.4em 0.3em 0; + padding: 0.5rem 0.8rem; + text-decoration: none; + + &:hover { + background: $nu-purple; + color: $white; + } } - - // right sidebar option - #sidebar { - width: 260px / 836px * 100%; - float: right; - margin: 0 0 2rem 2rem; - - .box { - background: $nu-purple-10; - padding: 1rem; - margin-bottom: 2rem; - font-size: 14px; - line-height: 1.4em; - - h3 { - font: 18px/1.2em $CamptonBold; - color: $rich-black-80; - } - - h4 { - font: 16px/1.2em $AkkuratProBold; - color: $rich-black-80; - margin-top: inherit; - } - - ul { - margin: 1em 0 .5em 0; - - li { - background-position: 0 .3em - } - } - } + + .current-page a { + background: #616161 none repeat scroll 0 0; + color: $white; } + } - // pagination - .pagination { - margin: 2.5em 0 2em; - padding-left: 0; + // ordered list for steps (big numbers) + ol { + &.steps { + counter-reset: li; + list-style: none; + padding: 0; + margin-bottom: 1em; - li { - display: inline; - padding: 0; - } + li { + position: relative; + display: block; + padding: 0; + margin-bottom: 1em; + padding: 1em 0.5em 0 5em; + min-height: 90px; - a { - background: $white; - border: 1px solid $medium-grey; - color: $rich-black-50; - font: 16px $AkkuratProBold; - display: inline-block; - margin: 0 .4em .3em 0; - padding: .5rem .8rem; - text-decoration: none; - - &:hover { - background: $nu-purple; - color: $white; - } + &:before { + content: counter(li); + counter-increment: li; + position: absolute; + top: 0; + bottom: 0; + left: 0; + font: 72px $PoppinsBold; + color: $nu-purple; + margin: 0; + padding: 0 0.15em 0 0.15em; + text-align: center; } + } + } + } - .current-page a { - background: #616161 none repeat scroll 0 0; - color: $white; - } - } - - // ordered list for steps (big numbers) - ol { - - &.steps { - counter-reset: li; - list-style: none; - padding: 0; - margin-bottom: 1em; - - li { - position: relative; - display: block; - padding: 0; - margin-bottom: 1em; - padding: 1em .5em 0 5em; - min-height: 90px; - - &:before { - content: counter(li); - counter-increment: li; - position: absolute; - top: 0; - bottom: 0; - left: 0; - font: 72px $CamptonBold; - color: $nu-purple; - margin: 0; - padding: 0 .15em 0 .15em; - text-align: center; - } - } - } + // media queries + @media screen and (max-width: 1145px) { + #page { + // gives left/right margin for smaller screen widths + margin-left: 1rem; + margin-right: 1rem; } - - // media queries - @media screen and (max-width: 1145px) { - - #page { // gives left/right margin for smaller screen widths - margin-left: 1rem; - margin-right: 1rem; - } + } + + @media screen and (max-width: 970px) { + #page-narrow { + // gives left/right margin for smaller screen widths + margin-left: 1rem; + margin-right: 1rem; } - - @media screen and (max-width: 970px) { - - #page-narrow { // gives left/right margin for smaller screen widths - margin-left: 1rem; - margin-right: 1rem; - } + } + + @media screen and (max-width: 768px) { + .content, + .content-full { + float: none; + width: 100%; + + h2 { + font-size: 36px; + } } - - @media screen and (max-width: 768px) { - - .content, .content-full { - float: none; - width: 100%; - - h2 { - font-size: 36px; - } - } - #sidebar { - width: 300px / 768px * 100%; - } + #sidebar { + width: 300px / 768px * 100%; } - - @media screen and (max-width: 480px) { - - .content, .content-full { - - h2 { - font-size: 32px; - } - - h3 { - font-size: 24px; - } - } - - #sidebar { - margin-left: 0; - width: 100%; - float: none; - - .box { - margin-bottom: 1rem; - } - } + } + + @media screen and (max-width: 480px) { + .content, + .content-full { + h2 { + font-size: 32px; + } + + h3 { + font-size: 24px; + } } -} // end \ No newline at end of file + #sidebar { + margin-left: 0; + width: 100%; + float: none; + + .box { + margin-bottom: 1rem; + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_narrow-page.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_narrow-page.scss index 9fbeea01..3a802120 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_narrow-page.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_narrow-page.scss @@ -2,115 +2,104 @@ // body class should have .narrow-page *and* .standard-page .narrow-page { + #page { + margin: 2rem auto 0 auto; + max-width: 930px; + } + #news-story { + h2 { + margin-bottom: 1.5rem; + } + + .wrap { + margin-bottom: 1.5rem; + @extend %clearfix; + + #credit { + font: 16px/1.4em $PoppinsBold; + color: $rich-black-80; + width: 645px / 930px * 100%; + } + + #share { + float: right; + width: 265px / 930px * 100%; + } + } + + #story-floater { + float: right; + width: 265px / 930px * 100%; + margin-left: 20px / 930px * 100%; + margin-bottom: 20px / 930px * 100%; + + figure + .news-tidbit { + margin-top: 2rem; + } + + #story-callout { + border-top: 4px solid $light-grey; + border-bottom: 4px solid $light-grey; + padding: 1.5rem 0; + font: 20px $PoppinsLight; + color: $nu-purple; + } + } + } + + // center modules + main { + section { + max-width: 836px; + } + } + + @media screen and (max-width: 970px) { #page { - margin: 2rem auto 0 auto; - max-width: 930px; + margin-left: 1rem; + margin-right: 1rem; } - + } + + @media screen and (max-width: 768px) { #news-story { - - h2 { - margin-bottom: 1.5rem; - } - - .wrap { - margin-bottom: 1.5rem; - @extend %clearfix; - - #credit { - font: 16px/1.4em $CamptonBold; - color: $rich-black-80; - width: 645px / 930px * 100%; - - } + #story-floater { + float: none; + width: 100%; + padding-top: 1.5rem; + margin-left: 0; + margin-bottom: 1.5rem; + border-top: 4px solid $light-grey; - #share { - float: right; - width: 265px / 930px * 100%; - } + .quote { + float: none; + width: 100%; + font-size: 18px; + border-bottom: 4px solid $light-grey; } - - #story-floater { - float: right; - width: 265px / 930px * 100%; - margin-left: 20px / 930px * 100%; - margin-bottom: 20px / 930px * 100%; - - figure + .news-tidbit { - margin-top: 2rem; - } - #story-callout { - border-top: 4px solid $light-grey; - border-bottom: 4px solid $light-grey; - padding: 1.5rem 0; - font: 20px $CamptonBook; - color: $nu-purple; - } - } - } - - // center modules - main { - - section { - max-width: 836px; + #story-callout { + display: none; } + } } - - @media screen and (max-width: 970px) { - - #page { - margin-left: 1rem; - margin-right: 1rem; + } + + @media screen and (max-width: 700px) { + #news-story { + .wrap { + #share { + float: none; + width: 100%; + margin-bottom: 1rem; } - } - - @media screen and (max-width: 768px) { - - #news-story { - - #story-floater { - float: none; - width: 100%; - padding-top: 1.5rem; - margin-left: 0; - margin-bottom: 1.5rem; - border-top: 4px solid $light-grey; - .quote { - float: none; - width: 100%; - font-size: 18px; - border-bottom: 4px solid $light-grey; - } - - #story-callout { - display: none; - } - } + #credit { + float: none; + width: 100%; } + } } - - @media screen and (max-width: 700px) { - - #news-story { - - .wrap { - - #share { - float: none; - width: 100%; - margin-bottom: 1rem; - } - - #credit { - float: none; - width: 100%; - } - } - } - } - -} // end \ No newline at end of file + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_news-event.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_news-event.scss index e49558b7..e110dfe7 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_news-event.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_news-event.scss @@ -1,89 +1,85 @@ // news and event listing pages .standard-page { + // for news listing page + .news { + margin: 2rem 0; + @extend %clearfix; - // for news listing page - .news { - margin: 2rem 0; - @extend %clearfix; - - img { - float: left; - margin: 0 1rem 1rem 0; - } + img { + float: left; + margin: 0 1rem 1rem 0; + } + + h4.news-title { + font: 18px/1.3em $AkkuratProBold; + margin-bottom: 0.5rem; + } + + .news-date { + font: 14px/1.4em $AkkuratProBold; + color: $rich-black-80; + } + + .news-description { + margin-top: 0.5rem; + } + } + + // for news listing page + .event { + position: relative; + min-height: 100px; + margin-bottom: 1rem; - h4.news-title { - font: 18px/1.3em $AkkuratProBold; - margin-bottom: .5rem; - } + .event-date { + position: absolute; + text-align: center; + top: 0; + width: 90px; + padding: 0.25rem; + background: $nu-purple; + font-family: $PoppinsBold; + color: $white; + float: left; - .news-date { - font: 14px/1.4em $AkkuratProBold; - color: $rich-black-80; - } + .month, + year { + font-size: 14px; + } - .news-description { - margin-top: .5rem; - } - } - - // for news listing page - .event { - position: relative; - min-height: 100px; - margin-bottom: 1rem; - - .event-date { - position: absolute; - text-align: center; - top: 0; - width: 90px; - padding: .25rem; - background: $nu-purple; - font-family: $CamptonBold; - color: $white; - float: left; - - .month, year { - font-size: 14px; - } - - .day { - font-size: 36px; - } - } - - .event-time-location { - font: 14px/1.4em $AkkuratProBold; - color: $rich-black-80; - margin-bottom: .5rem; - } - - .event-description { - margin-left: 105px; - - h4 { - font: 18px/1.3em $AkkuratProBold; - margin-bottom: 0 - } - - > p { - margin-top: .5rem; - } - } + .day { + font-size: 36px; + } } - - // media queries - @media screen and (max-width: 420px) { - - .news { - - img { - float: none; - margin: 0 0 1rem 0; - - } - } + + .event-time-location { + font: 14px/1.4em $AkkuratProBold; + color: $rich-black-80; + margin-bottom: 0.5rem; + } + + .event-description { + margin-left: 105px; + + h4 { + font: 18px/1.3em $AkkuratProBold; + margin-bottom: 0; + } + + > p { + margin-top: 0.5rem; + } + } + } + + // media queries + @media screen and (max-width: 420px) { + .news { + img { + float: none; + margin: 0 0 1rem 0; + } } - -} // end \ No newline at end of file + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_people-list.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_people-list.scss index fb15f9f2..af06e213 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_people-list.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_people-list.scss @@ -1,114 +1,111 @@ // people list .standard-page { + .people-big, + .people-medium, + .people-small { + margin: 1rem 0 2rem 0; - .people-big, .people-medium, .people-small { - margin: 1rem 0 2rem 0; - - // removes margin for optional paragraph below div.people-wrap - > p:first-of-type { - margin-top: 0; - } - - .people-wrap { - @extend %clearfix; - - // append to div.people-wrap if there's no image - &.no-image { - - .people-image { - display: none; - } - - .people-content { - width: 100%; - } - } - } - + // removes margin for optional paragraph below div.people-wrap + > p:first-of-type { + margin-top: 0; + } + + .people-wrap { + @extend %clearfix; + + // append to div.people-wrap if there's no image + &.no-image { .people-image { - float: left; - margin-right: 20px / 836px * 100%; - margin-bottom: .5rem; + display: none; } + .people-content { - float: right; - - h3, h4 { - font: 24px/1.2em $CamptonBold; - color: $rich-black-50; - margin-bottom: 0; - } - .title { - font: 18px/1.2em $AkkuratProRegular; - margin-top: 0; - } + width: 100%; } + } } - - // 360px square image - .people-big { - - .people-image { - width: 360px / 836px * 100%; - } - .people-content { - width: 456px / 836px * 100%; - } + .people-image { + float: left; + margin-right: 20px / 836px * 100%; + margin-bottom: 0.5rem; } - - // 265px square image - .people-medium { - - .people-image { - width: 265px / 836px * 100%; - } - - .people-content { - width: 551px / 836px * 100%; - } + .people-content { + float: right; + + h3, + h4 { + font: 24px/1.2em $PoppinsBold; + color: $rich-black-50; + margin-bottom: 0; + } + .title { + font: 18px/1.2em $AkkuratProRegular; + margin-top: 0; + } } - - // 170px square image - .people-small { + } - .people-image { - width: 170px / 836px * 100%; - } - - .people-content { - width: 646px / 836px * 100%; - } + // 360px square image + .people-big { + .people-image { + width: 360px / 836px * 100%; } - - // media queries - @media screen and (max-width: 600px) { - .people-big { - - .people-image, .people-content { - float: none; - width: 100%; - } - } + + .people-content { + width: 456px / 836px * 100%; } - - @media screen and (max-width: 540px) { - .people-medium { - - .people-image, .people-content { - float: none; - width: 100%; - } - } - - .people-small { - - .people-image, .people-content { - float: none; - width: 100%; - } - } - } - -} // end \ No newline at end of file + } + + // 265px square image + .people-medium { + .people-image { + width: 265px / 836px * 100%; + } + + .people-content { + width: 551px / 836px * 100%; + } + } + + // 170px square image + .people-small { + .people-image { + width: 170px / 836px * 100%; + } + + .people-content { + width: 646px / 836px * 100%; + } + } + + // media queries + @media screen and (max-width: 600px) { + .people-big { + .people-image, + .people-content { + float: none; + width: 100%; + } + } + } + + @media screen and (max-width: 540px) { + .people-medium { + .people-image, + .people-content { + float: none; + width: 100%; + } + } + + .people-small { + .people-image, + .people-content { + float: none; + width: 100%; + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_pullquotes.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_pullquotes.scss index efd8fb62..560010c4 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_pullquotes.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_pullquotes.scss @@ -1,43 +1,39 @@ // pullquotes .standard-page { + .quote { + font: 24px/1.2em $PoppinsLight; + color: $nu-purple; + margin-bottom: 0.5em; + span { + background: url("#{$path-images}/icons/quote.png") no-repeat; + width: 35px; + height: 24px; + display: inline-block; + margin-right: 0.5rem; + } + + p { + margin-top: 0; + } + + figcaption { + font: 16px/1.4em $AkkuratProRegular; + color: $rich-black-50; + } + } + + // media queries + @media screen and (max-width: 1145px) { .quote { - font: 24px/1.2em $CamptonBook; - color: $nu-purple; - margin-bottom: .5em; + font-size: 20px; + } + } - span { - background: url("#{$path-images}/icons/quote.png") no-repeat; - width: 35px; - height: 24px; - display: inline-block; - margin-right: .5rem; - } - - p { - margin-top: 0; - } - - figcaption { - font: 16px/1.4em $AkkuratProRegular; - color: $rich-black-50; - } - } - - // media queries - @media screen and (max-width: 1145px) { - - .quote { - font-size: 20px; - } - } - - @media screen and (max-width: 900px) { - - .quote { - font-size: 18px; - } - } - -} // end \ No newline at end of file + @media screen and (max-width: 900px) { + .quote { + font-size: 18px; + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_showcase.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_showcase.scss index 7f16a08d..8dfda097 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_showcase.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_showcase.scss @@ -1,216 +1,217 @@ // showcase areas - can include mini slideshow (swiper) .standard-page { + .showcase { + .left-content .swiper-container { + // forces max-width for smaller slideshow w/ right-content links + max-width: 550px; + margin: 0; + } - .showcase { - - .left-content .swiper-container { // forces max-width for smaller slideshow w/ right-content links - max-width: 550px; - margin: 0; - } - - .caption { // this is the caption for when the swiper gallery is included - font: 14px $AkkuratProItalic; - margin: 0; - position: absolute; - bottom: .5rem; - padding: .5rem; - background: rgba(0, 0, 0, .5); - color: $white; - width: 100%; - - strong { - font-family: $AkkuratProBoldItalic; - } - } - - // swiper arrows - .swiper-button-next, .swiper-button-prev { - width: 35px; - height: 35px; - -moz-background-size: 35px 35px; - -webkit-background-size: 35px 35px; - background-size: 35px 35px; - } - - .swiper-button-prev { - background: url("#{$path-images}/icons/arrow-right-purple-white.svg") no-repeat; - -webkit-transform: rotate(180deg); - -moz-transform: rotate(180deg); - -ms-transform: rotate(180deg); - -o-transform: rotate(180deg); - transform: rotate(180deg); - left: 10px; - right: auto; - } - - .swiper-button-next { - background: url("#{$path-images}/icons/arrow-right-purple-white.svg") no-repeat; - right: 10px; - left: auto; - } - - p+h4 { - margin: 1.5rem 0 .5rem 0; - } - - .left-content { - width: 550px / 836px * 100%; - float: left; - } - - .right-content { - width: 250px / 836px * 100%; - float: left; - margin-left: 35px / 836px * 100%; - } - - .below-content { - @extend %clearfix; + .caption { + // this is the caption for when the swiper gallery is included + font: 14px $AkkuratProItalic; + margin: 0; + position: absolute; + bottom: 0.5rem; + padding: 0.5rem; + background: rgba(0, 0, 0, 0.5); + color: $white; + width: 100%; + + strong { + font-family: $AkkuratProBoldItalic; + } + } + + // swiper arrows + .swiper-button-next, + .swiper-button-prev { + width: 35px; + height: 35px; + -moz-background-size: 35px 35px; + -webkit-background-size: 35px 35px; + background-size: 35px 35px; + } + + .swiper-button-prev { + background: url("#{$path-images}/icons/arrow-right-purple-white.svg") + no-repeat; + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + -ms-transform: rotate(180deg); + -o-transform: rotate(180deg); + transform: rotate(180deg); + left: 10px; + right: auto; + } + + .swiper-button-next { + background: url("#{$path-images}/icons/arrow-right-purple-white.svg") + no-repeat; + right: 10px; + left: auto; + } + + p + h4 { + margin: 1.5rem 0 0.5rem 0; + } + + .left-content { + width: 550px / 836px * 100%; + float: left; + } + + .right-content { + width: 250px / 836px * 100%; + float: left; + margin-left: 35px / 836px * 100%; + } + + .below-content { + @extend %clearfix; + } + + .quote { + float: left; + width: 265px; + margin: 0 2rem 1rem 0; + line-height: 1.4em; + } + + .stat-list { + font: 24px $PoppinsExtraLight; + color: $nu-purple; + + strong { + font: 72px/1em $PoppinsBold; + color: $nu-purple; + display: block; + } + + ul { + margin: 0 0 2rem 0; + padding: 1.5rem 0 0 0; + border-top: 4px solid $light-grey; + color: $rich-black-50; + + &.no-border { + // for library page + border-top: none; + padding-top: 0; } - - .quote { - float: left; - width: 265px; - margin: 0 2rem 1rem 0; - line-height: 1.4em; + + li { + background: none; + padding: 0; + + &:first-child { + font: 30px/1.2em $PoppinsBold; + color: $nu-purple; + margin-bottom: 0.5rem; + } } - - .stat-list { - font: 24px $CamptonExtraLight; - color: $nu-purple; - - strong { - font: 72px/1em $CamptonBold; - color: $nu-purple; - display: block; - } - - ul { - margin: 0 0 2rem 0; - padding: 1.5rem 0 0 0; - border-top: 4px solid $light-grey; - color: $rich-black-50; - - &.no-border { // for library page - border-top: none; - padding-top: 0; - } - - li { - background: none; - padding: 0; - - &:first-child { - font: 30px/1.2em $CamptonBold; - color: $nu-purple; - margin-bottom: .5rem; - } - } - - &.bullet { // for diversity page - margin: 0 0 -2rem 0; - padding: inherit; - - li { - background: url("#{$path-images}/icons/bullet.png") top left no-repeat; - background-position: 0 .5rem; - padding: 0 0 .5rem 1em; - font-size: 20px; - - &:first-child { - font: 26px/1.2em $CamptonBold; - color: $nu-purple; - margin-bottom: .5rem; - background: none; - padding: 1rem 0 1rem 0; - } - } - } + + &.bullet { + // for diversity page + margin: 0 0 -2rem 0; + padding: inherit; + + li { + background: url("#{$path-images}/icons/bullet.png") top left + no-repeat; + background-position: 0 0.5rem; + padding: 0 0 0.5rem 1em; + font-size: 20px; + + &:first-child { + font: 26px/1.2em $PoppinsBold; + color: $nu-purple; + margin-bottom: 0.5rem; + background: none; + padding: 1rem 0 1rem 0; } + } } - - .links { - - p { - font: 18px $AkkuratProBold; - color: $rich-black-50; - border-bottom: 4px solid $light-grey; - padding-bottom: .5rem; - } - - ul { - padding: 0; - margin: 0; - - li { - font: 16px $AkkuratProBold; - background: none; - padding: 0; - margin-bottom: 1rem; - - &:after { - background: url("#{$path-images}/icons/arrow-right-dkpurple.svg") no-repeat 50% / 6px 10px; - padding-right: 2rem; - content: " "; - } - } - } - } + } } - - // media queries - @media screen and (max-width: 1145px) { - - .showcase .stat-list strong { - font-size: 54px; + + .links { + p { + font: 18px $AkkuratProBold; + color: $rich-black-50; + border-bottom: 4px solid $light-grey; + padding-bottom: 0.5rem; + } + + ul { + padding: 0; + margin: 0; + + li { + font: 16px $AkkuratProBold; + background: none; + padding: 0; + margin-bottom: 1rem; + + &:after { + background: url("#{$path-images}/icons/arrow-right-dkpurple.svg") + no-repeat 50% / 6px 10px; + padding-right: 2rem; + content: " "; + } } + } } + } - @media screen and (max-width: 1000px) { - - .showcase { - - .left-content { - float: none; - width: 100%; - } - - .quote { - display: none; - } - - .right-content { - float: none; - width: 100%; - margin: 1rem 0 2rem 0; - } - - ul.three-columns { - display: none; - } - } - } - - @media screen and (max-width: 600px) { - - .showcase { - - .caption { - position: relative; - background: $nu-purple-60; - bottom: .6rem; - } - - .swiper-button-next, .swiper-button-prev { - width: 25px; - height: 25px; - -moz-background-size: 25px 25px; - -webkit-background-size: 25px 25px; - background-size: 25px 25px; - margin-top: -2rem; - } - } - } - -} // end \ No newline at end of file + // media queries + @media screen and (max-width: 1145px) { + .showcase .stat-list strong { + font-size: 54px; + } + } + + @media screen and (max-width: 1000px) { + .showcase { + .left-content { + float: none; + width: 100%; + } + + .quote { + display: none; + } + + .right-content { + float: none; + width: 100%; + margin: 1rem 0 2rem 0; + } + + ul.three-columns { + display: none; + } + } + } + + @media screen and (max-width: 600px) { + .showcase { + .caption { + position: relative; + background: $nu-purple-60; + bottom: 0.6rem; + } + + .swiper-button-next, + .swiper-button-prev { + width: 25px; + height: 25px; + -moz-background-size: 25px 25px; + -webkit-background-size: 25px 25px; + background-size: 25px 25px; + margin-top: -2rem; + } + } + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_stats-callout.scss b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_stats-callout.scss index f1e3e1c4..fbbab4d9 100644 --- a/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_stats-callout.scss +++ b/app/assets/stylesheets/nuwebcomm/page-types/standard-page/_stats-callout.scss @@ -1,47 +1,43 @@ // stats callout .standard-page { + .stats-callout { + border-top: 4px solid $light-grey; + border-bottom: 4px solid $light-grey; + text-align: center; + color: $nu-purple; + padding: 2rem 0; - .stats-callout { - border-top: 4px solid $light-grey; - border-bottom: 4px solid $light-grey; - text-align: center; - color: $nu-purple; - padding: 2rem 0; - - div { - margin: 0 auto; - display: table; - } - - span { - display: table-cell; - vertical-align: middle; + div { + margin: 0 auto; + display: table; + } - &.big { - font: 72px $CamptonBold; - } + span { + display: table-cell; + vertical-align: middle; - &.small { - font: 24px $CamptonExtraLight; - padding-left: 1rem; - } - } + &.big { + font: 72px $PoppinsBold; + } + + &.small { + font: 24px $PoppinsExtraLight; + padding-left: 1rem; + } } + } - // media queries - @media screen and (max-width: 480px) { - - .stats-callout { - - span { - display: block; + // media queries + @media screen and (max-width: 480px) { + .stats-callout { + span { + display: block; - &.big { - font: 48px $CamptonBold; - } - } - } + &.big { + font: 48px $PoppinsBold; + } + } } - -} // end \ No newline at end of file + } +} // end diff --git a/app/assets/stylesheets/nuwebcomm/sections/_emergency.scss b/app/assets/stylesheets/nuwebcomm/sections/_emergency.scss index 56af9cf8..9bda2bd8 100644 --- a/app/assets/stylesheets/nuwebcomm/sections/_emergency.scss +++ b/app/assets/stylesheets/nuwebcomm/sections/_emergency.scss @@ -1,43 +1,47 @@ // emergency section for top of home page -#emergency, #breaking_news { - background: $red; - padding: 1rem 5rem 1.5rem 5rem; - font: 16px $AkkuratProRegular; - color:$white; - text-align: center; - - a { - color: $white; - text-decoration: underline; - font-family: $AkkuratProBold; - - &:hover { - text-decoration: none; - } - } - - h1, h2, h4, h4, h5 { - color: $white; - } - - h2 { - font: 26px $CamptonBold; - } - - h3 { - font: 26px $CamptonBold; - } - - h4 { - font: 24px $CamptonBold; +#emergency, +#breaking_news { + background: $red; + padding: 1rem 5rem 1.5rem 5rem; + font: 16px $AkkuratProRegular; + color: $white; + text-align: center; + + a { + color: $white; + text-decoration: underline; + font-family: $AkkuratProBold; + + &:hover { + text-decoration: none; } + } + + h1, + h2, + h4, + h4, + h5 { + color: $white; + } + + h2 { + font: 26px $PoppinsBold; + } + + h3 { + font: 26px $PoppinsBold; + } + + h4 { + font: 24px $PoppinsBold; + } } @media screen and (max-width: 768px) { - - #emergency { - padding: 1rem 1rem 1.5rem 1rem; - text-align: left; - } -} \ No newline at end of file + #emergency { + padding: 1rem 1rem 1.5rem 1rem; + text-align: left; + } +} diff --git a/app/assets/stylesheets/nuwebcomm/sections/_heroes.scss b/app/assets/stylesheets/nuwebcomm/sections/_heroes.scss index 80ef0950..d52c660e 100644 --- a/app/assets/stylesheets/nuwebcomm/sections/_heroes.scss +++ b/app/assets/stylesheets/nuwebcomm/sections/_heroes.scss @@ -1,312 +1,337 @@ // hero images .hero { + width: 100%; + display: table; + + &.mobile-hero { + // add class for mobile hero text treatment + + .mobile-hero-text { + display: none; + } + } + + .hero-image { + text-align: center; + display: table-cell; width: 100%; - display: table; - - &.mobile-hero { // add class for mobile hero text treatment - - .mobile-hero-text { - display: none; - } + vertical-align: middle; + position: relative; + padding: 0 1rem; + + &:before { + content: " "; + width: 100%; + height: 100%; + position: absolute; + bottom: 0; + left: 0; + background: -moz-linear-gradient( + top, + rgba(0, 0, 0, 0) 0%, + rgba(0, 0, 0, 0.45) 100% + ); + background: -webkit-gradient( + linear, + left top, + left bottom, + color-stop(0%, rgba(0, 0, 0, 0)), + color-stop(100%, rgba(0, 0, 0, 0.45)) + ); + background: -webkit-linear-gradient( + top, + rgba(0, 0, 0, 0) 0%, + rgba(0, 0, 0, 0.45) 100% + ); + background: -o-linear-gradient( + top, + rgba(0, 0, 0, 0) 0%, + rgba(0, 0, 0, 0.45) 100% + ); + background: -ms-linear-gradient( + top, + rgba(0, 0, 0, 0) 0%, + rgba(0, 0, 0, 0.45) 100% + ); + background: linear-gradient( + to bottom, + rgba(0, 0, 0, 0) 0%, + rgba(0, 0, 0, 0.45) 100% + ); } - - .hero-image { - text-align: center; - display: table-cell; - width: 100%; - vertical-align: middle; - position: relative; - padding: 0 1rem; + } - &:before { - content: " "; - width: 100%; - height: 100%; - position: absolute; - bottom: 0; - left: 0; - background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(0,0,0,0.45) 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,0.45))); - background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.45) 100%); - background: -o-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.45) 100%); - background: -ms-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(0,0,0,0.45) 100%); - background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.45) 100%); - } + h2 { + font: 24px $PoppinsExtraBold; + color: $white; + text-shadow: 2px 2px 0px rgba(0, 0, 0, 1); + margin-bottom: 1.5em; + position: relative; + + &:before { + background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / + 17px 21px; + padding: 0 20px; + content: " "; } - h2 { - font: 24px $CamptonExtraBold; - color: $white; - text-shadow: 2px 2px 0px rgba(0, 0, 0, 1); - margin-bottom: 1.5em; - position: relative; - - &:before { - background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / 17px 21px; + &:after { + background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / + 17px 21px; + padding: 0 20px; + content: " "; + } + } + + p { + font: 60px/1.2em $PoppinsBold; + color: $white; + text-shadow: 2px 2px 0px rgba(0, 0, 0, 1); + margin: 0 0 1rem 0; + position: relative; + + &.description { + font: 24px/1.2em $AkkuratProRegular; + } + } +} + +// landing page in-page hero +.landing-page { + .hero { + .hero-image { + // for top of page + height: 600px; + + &.in-page { + // slighter shorter for within the page + height: 540px; + + h3 { + font: 24px $PoppinsExtraBold; + color: $white; + text-shadow: 2px 2px 0px rgba(0, 0, 0, 1); + margin-bottom: 1.5em; + position: relative; + + &:before { + background: url("#{$path-images}/icons/ltpurple-slash.svg") + no-repeat 50% / 17px 21px; padding: 0 20px; content: " "; - } - - &:after { - background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / 17px 21px; + } + + &:after { + background: url("#{$path-images}/icons/ltpurple-slash.svg") + no-repeat 50% / 17px 21px; padding: 0 20px; content: " "; - } - } - - p { - font: 60px/1.2em $CamptonBold; - color: $white; - text-shadow: 2px 2px 0px rgba(0, 0, 0, 1); - margin: 0 0 1rem 0; - position: relative; - - &.description { - font: 24px/1.2em $AkkuratProRegular; + } } - } -} + } -// landing page in-page hero -.landing-page { - - .hero { - - .hero-image { // for top of page - height: 600px; - - &.in-page { // slighter shorter for within the page - height: 540px; - - h3 { - font: 24px $CamptonExtraBold; - color: $white; - text-shadow: 2px 2px 0px rgba(0, 0, 0, 1); - margin-bottom: 1.5em; - position: relative; - - &:before { - background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / 17px 21px; - padding: 0 20px; - content: " "; - } - - &:after { - background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / 17px 21px; - padding: 0 20px; - content: " "; - } - } - } - - h2 { - color: $white; + h2 { + color: $white; - &:before { - background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / 17px 21px; - } + &:before { + background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat + 50% / 17px 21px; + } - &:after { - background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat 50% / 17px 21px; - } - } + &:after { + background: url("#{$path-images}/icons/ltpurple-slash.svg") no-repeat + 50% / 17px 21px; } + } + } - // for static news hero image replacement - &.news-hero { - - .hero-image { - vertical-align: bottom !important; - padding-bottom: 2.5rem; - } - } + // for static news hero image replacement + &.news-hero { + .hero-image { + vertical-align: bottom !important; + padding-bottom: 2.5rem; + } } - - // override for top level pages that use smaller heroes - .small-hero { - - .hero-image { - height: 420px; - } + } + + // override for top level pages that use smaller heroes + .small-hero { + .hero-image { + height: 420px; } + } } // standard page .standard-page { - - .hero { - - .hero-image { - height: 420px; - - &.tiny-hero-image { // for pages with smaller (than small) hero images (i.e. events page on top-level) - height: 190px; - - h2 { - margin-bottom: 0; - } - } - } - } + .hero { + .hero-image { + height: 420px; + + &.tiny-hero-image { + // for pages with smaller (than small) hero images (i.e. events page on top-level) + height: 190px; + + h2 { + margin-bottom: 0; + } + } + } + } } @media screen and (max-width: 1000px) { - - .hero { - - p { - font-size: 48px; - } + .hero { + p { + font-size: 48px; } + } } @media screen and (max-width: 768px) { - - .standard-page, .landing-page { - - .hero { - - &.mobile-hero { // append this class to .hero to move the overlapping hero text below the image - - .hero-image { - display: block; - height: 300px; - - div { - display: none; - } - } - - .mobile-hero-text { - display: block; - text-align: center; - background: $rich-black-80; - padding: 2rem 1em; - - h2 { - font-size: 24px; - text-shadow: none; - margin-bottom: 0; - - &+p, &+.button { - margin-top: 1rem; - } - } - - p { - text-shadow: none; - font-size: 48px; - } - } - } + .standard-page, + .landing-page { + .hero { + &.mobile-hero { + // append this class to .hero to move the overlapping hero text below the image + + .hero-image { + display: block; + height: 300px; + + div { + display: none; + } } - - .standard-page { - .hero-image { + .mobile-hero-text { + display: block; + text-align: center; + background: $rich-black-80; + padding: 2rem 1em; - &.big-hero-image { - height: 350px; - } - } + h2 { + font-size: 24px; + text-shadow: none; + margin-bottom: 0; - &.m-hide-hero { - display: none; + & + p, + & + .button { + margin-top: 1rem; } - } + } + + p { + text-shadow: none; + font-size: 48px; + } + } + } } + + .standard-page { + .hero-image { + &.big-hero-image { + height: 350px; + } + } + + &.m-hide-hero { + display: none; + } + } + } } @media screen and (max-width: 480px) { - - .landing-page, - .standard-page { - - .hero { - - .hero-image { - height: 400px; - - &.big-hero-image { // removes people hero from content page - display: none; - } - - &.in-page { // slighter shorter for within the page - height: 400px; - - h3 { - font-size: 20px; - margin-bottom: 1rem; - - &:before { - background: none; - padding: 0; - } - - &:after { - background: none; - padding: 0; - } - } - } + .landing-page, + .standard-page { + .hero { + .hero-image { + height: 400px; + + &.big-hero-image { + // removes people hero from content page + display: none; + } + + &.in-page { + // slighter shorter for within the page + height: 400px; + + h3 { + font-size: 20px; + margin-bottom: 1rem; + + &:before { + background: none; + padding: 0; } - - h2 { - font-size: 20px; - margin-bottom: 1rem; - - &:before { - background: none; - padding: 0; - } - - &:after { - background: none; - padding: 0; - } - } - - p { - font-size: 28px; - - &.description { - font-size: 20px; - } - } - - &.mobile-hero { // append this class to .hero to move the overlapping hero text below the image - - .hero-image { - height: 200px; - } - - .mobile-hero-text { - padding: 1em 0; - - h2 { - font-size: 20px; - } - - p { - font-size: 28px; - } - } - } + + &:after { + background: none; + padding: 0; + } + } } + } + + h2 { + font-size: 20px; + margin-bottom: 1rem; + + &:before { + background: none; + padding: 0; + } + + &:after { + background: none; + padding: 0; + } + } + + p { + font-size: 28px; + + &.description { + font-size: 20px; + } + } + + &.mobile-hero { + // append this class to .hero to move the overlapping hero text below the image + + .hero-image { + height: 200px; + } + + .mobile-hero-text { + padding: 1em 0; + + h2 { + font-size: 20px; + } + + p { + font-size: 28px; + } + } + } } + } - // standard page - .standard-page { - - .hero { - - &.smaller-hero { // for pages with short hero images (i.e. events landing page on top-level) - - .hero-image { - height: 190px; - } - } - } + // standard page + .standard-page { + .hero { + &.smaller-hero { + // for pages with short hero images (i.e. events landing page on top-level) + + .hero-image { + height: 190px; + } + } } -} \ No newline at end of file + } +} diff --git a/app/assets/stylesheets/nuwebcomm/sections/_responsive-tabs.scss b/app/assets/stylesheets/nuwebcomm/sections/_responsive-tabs.scss index 1d8dd448..18e81f9d 100644 --- a/app/assets/stylesheets/nuwebcomm/sections/_responsive-tabs.scss +++ b/app/assets/stylesheets/nuwebcomm/sections/_responsive-tabs.scss @@ -1,196 +1,190 @@ // responsive tabs #tabs, .tabs { - list-style: none; - width: 100%; - margin: 0; + list-style: none; + width: 100%; + margin: 0; + padding: 0; + text-align: center; + + li { + background: none; + margin: 0 0.3rem 0 0; padding: 0; - text-align: center; - - li { - background: none; - margin: 0 .3rem 0 0; - padding: 0; - display: inline; - vertical-align: middle; - - &:last-child { - margin: 0; - } - - a { - font: 18px $AkkuratProBold; - color: $nu-purple; - background: $nu-purple-10; - padding: .75rem 1.2rem .5rem 1.2rem; - display: inline-block; - -webkit-transition: all .2s ease; - transition: all .2s ease; - border: none; // removes default border - - &:hover { - border: none; - text-decoration: underline; - background: $nu-purple; - color: $white; - } - - &.active { - background: $nu-purple; - color: $white; - } - - &:focus { - text-decoration: underline; - } - } + display: inline; + vertical-align: middle; + + &:last-child { + margin: 0; + } + + a { + font: 18px $AkkuratProBold; + color: $nu-purple; + background: $nu-purple-10; + padding: 0.75rem 1.2rem 0.5rem 1.2rem; + display: inline-block; + -webkit-transition: all 0.2s ease; + transition: all 0.2s ease; + border: none; // removes default border + + &:hover { + border: none; + text-decoration: underline; + background: $nu-purple; + color: $white; + } + + &.active { + background: $nu-purple; + color: $white; + } + + &:focus { + text-decoration: underline; + } } + } } // multiple tab modules override .content ul.tabs { - padding-left: 0; + padding-left: 0; } .content ul.tabs > li { - background: none; - padding: 0; + background: none; + padding: 0; } // left align tabs for standard-page -.standard-page #tabs, -#standard-page .tabs { - text-align: left; +.standard-page #tabs, +#standard-page .tabs { + text-align: left; } #tab-content, .tab-content { - border-top: 3px solid $nu-purple; - margin: 0 0 3rem 0; - padding: 1rem 0 0 0; - - > div { - @extend %clearfix; - - h3 { - margin-top: 1rem; // more breathing room - } - } - - // this nest mainly for admissions apply page - .row { - border-bottom: 3px solid $light-grey; - padding: 0 0 2rem 0; + border-top: 3px solid $nu-purple; + margin: 0 0 3rem 0; + padding: 1rem 0 0 0; + + > div { + @extend %clearfix; + + h3 { + margin-top: 1rem; // more breathing room } - - .responsive-table { // overrides margin-top in core.scss - margin-top: 0; + } + + // this nest mainly for admissions apply page + .row { + border-bottom: 3px solid $light-grey; + padding: 0 0 2rem 0; + } + + .responsive-table { + // overrides margin-top in core.scss + margin-top: 0; + } + + .headings { + display: table-cell; + width: 360px / 1120px * 100%; + padding-right: 1rem; + + h4 { + font: 30px $PoppinsBold; + color: $nu-purple; + + span { + display: block; + color: $nu-purple-60; + } } - - .headings { - display: table-cell; - width: 360px / 1120px * 100%; - padding-right: 1rem; - - h4 { - font: 30px $CamptonBold; - color: $nu-purple; - - span { - display: block; - color: $nu-purple-60; - } + } + + .contents { + display: table-cell; + width: 740px / 1120px * 100%; + + .callout { + background: $nu-purple-60; + padding: 0.1rem 1rem; + margin: 0 0 1rem 2rem; + width: 266px; + font: 24px $PoppinsLight; + color: $white; + float: right; + + a { + text-decoration: underline; + font-family: $PoppinsLight; + color: $white; + } + + h4 { + font: 16px $AkkuratProBold; + padding-top: 1rem; + margin-bottom: 0; + color: $white; + + & + p { + margin: 0.5rem 0; } + } } - - .contents { - display: table-cell; - width: 740px / 1120px * 100%; - - .callout { - background: $nu-purple-60; - padding: .1rem 1rem; - margin: 0 0 1rem 2rem; - width: 266px; - font: 24px $CamptonBook; - color: $white; - float: right; - - a { - text-decoration: underline; - font-family: $CamptonBook; - color: $white; - } - - h4 { - font: 16px $AkkuratProBold; - padding-top: 1rem; - margin-bottom: 0; - color: $white; - - &+p { - margin: .5rem 0; - } - } - } - } + } } // media queries @media screen and (max-width: 1150px) { - - #tabs li a, - .tabs li a { - font-size: 16px; - margin-top: 5px; - } + #tabs li a, + .tabs li a { + font-size: 16px; + margin-top: 5px; + } } @media screen and (max-width: 1000px) { - - .tab-left-side .img { - float: none; - } -} + .tab-left-side .img { + float: none; + } +} @media screen and (max-width: 850px) { - - #tab-content, - .tab-content { - - .contents .callout { - float: none; - margin: 1em 0 1em 0; - width: 100%; - } + #tab-content, + .tab-content { + .contents .callout { + float: none; + margin: 1em 0 1em 0; + width: 100%; } -} + } +} @media screen and (max-width: 550px) { - - #tabs { - - li a { - width: 100%; - font-size: 18px; - } + #tabs { + li a { + width: 100%; + font-size: 18px; } - - #tab-content, - .tab-content { - - .headings, - .contents { - width: 100%; - display: block; - - .callout { - font-size: 18px; - } - - h3 { - font-size: 26px; - } - } + } + + #tab-content, + .tab-content { + .headings, + .contents { + width: 100%; + display: block; + + .callout { + font-size: 18px; + } + + h3 { + font-size: 26px; + } } -} \ No newline at end of file + } +} diff --git a/app/assets/stylesheets/nuwebcomm/sections/_top-nav.scss b/app/assets/stylesheets/nuwebcomm/sections/_top-nav.scss index 12c09797..2e85e3a3 100644 --- a/app/assets/stylesheets/nuwebcomm/sections/_top-nav.scss +++ b/app/assets/stylesheets/nuwebcomm/sections/_top-nav.scss @@ -1,285 +1,287 @@ -// top navigation +// top navigation #mobile-links { - display: none; + display: none; } -// optional global links with available dropdown +// optional global links with available dropdown #top-nav { - background: $light-grey; - - .contain-1120 { - - > ul { - width: 100%; - line-height: 0; - position: relative; - - a { - color: $nu-purple; - text-decoration: none; - display: block; - padding: 1rem 1.5rem; + background: $light-grey; + + .contain-1120 { + > ul { + width: 100%; + line-height: 0; + position: relative; + + a { + color: $nu-purple; + text-decoration: none; + display: block; + padding: 1rem 1.5rem; + + &:hover, + &:focus, + &:active { + text-decoration: underline; + } + } + + // external link icon + a[href^="http://"]::after, + a[href^="https://"]::after + { + content: url("#{$path-images}/icons/external-link-top-nav.png"); + margin-left: 0.5em; + } - &:hover, &:focus, &:active { - text-decoration: underline; - } + > li { + display: table-cell; + text-align: center; + line-height: 100%; + font: 18px $AkkuratProBold; + + &:hover, + &.hover { + z-index: 100; + + .dropdown, + .dropdown-one-column, + .dropdown-two-column, + .dropdown-quick-links { + left: 0; // show + z-index: 1000; + } + + a { + background: $light-grey2; + animation: inherit; + animation: none; + + &:focus { + animation: none; } - - // external link icon - a[href^="http://"]::after, - a[href^="https://"]::after { - content: url("#{$path-images}/icons/external-link-top-nav.png"); - margin-left: 0.5em; - } - - > li { - display: table-cell; - text-align: center; - line-height: 100%; - font: 18px $AkkuratProBold; - - &:hover, &.hover { - z-index: 100; - - .dropdown, - .dropdown-one-column, - .dropdown-two-column, - .dropdown-quick-links { - left: 0; // show - z-index: 1000; - } - - a { - background: $light-grey2; - animation: inherit; - animation: none; - - &:focus { - animation: none; - } - - &.button { // overrides style above - background: $nu-purple; - } - } - } - - &.active a { - background: $nu-purple-60; - color: $white; - } - - .dropdown-arrow { - background: url("#{$path-images}/icons/arrow-down-ltpurple.svg") no-repeat 50%; - width: 10px; - height: 10px; - display: inline-block; - margin-left: .5em; - } - } - - // dropdown - .dropdown, - .dropdown-one-column, - .dropdown-two-column, - .dropdown-quick-links { - position: absolute; - background: $light-grey2; - left: -9999em; // hide - z-index: -9999; - top: 100%; - width: 100%;; - padding: 2rem; - list-style-type: none; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; // equal height columns - - .nav-intro, - .nav-links { - list-style-type: none; - width: 50%; - float: left; - text-align: left; - } - - p.intro { - font: 30px $CamptonBold; - color: $nu-purple; - margin: 0 0 1rem 0; - padding-right: 2rem; - } - - .nav-links { - border-left: 2px solid $medium-grey; - padding-left: 1rem; - } - - ul { - display: block; - background: inherit; - - li { - display: block; - text-align: left; - width: inherit; - line-height: 1.4em; - margin-bottom: 1rem; - - a { - padding: 0; - display: inline-block; - background: inherit; - color: $nu-purple; - - &:hover { - text-decoration: underline; - } - } - } - } + + &.button { + // overrides style above + background: $nu-purple; } + } + } + + &.active a { + background: $nu-purple-60; + color: $white; + } + + .dropdown-arrow { + background: url("#{$path-images}/icons/arrow-down-ltpurple.svg") + no-repeat 50%; + width: 10px; + height: 10px; + display: inline-block; + margin-left: 0.5em; + } + } + + // dropdown + .dropdown, + .dropdown-one-column, + .dropdown-two-column, + .dropdown-quick-links { + position: absolute; + background: $light-grey2; + left: -9999em; // hide + z-index: -9999; + top: 100%; + width: 100%; + padding: 2rem; + list-style-type: none; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; // equal height columns + + .nav-intro, + .nav-links { + list-style-type: none; + width: 50%; + float: left; + text-align: left; + } + + p.intro { + font: 30px $PoppinsBold; + color: $nu-purple; + margin: 0 0 1rem 0; + padding-right: 2rem; + } + + .nav-links { + border-left: 2px solid $medium-grey; + padding-left: 1rem; + } + + ul { + display: block; + background: inherit; + + li { + display: block; + text-align: left; + width: inherit; + line-height: 1.4em; + margin-bottom: 1rem; - // two column dropdown - .dropdown-two-column { - - ul { - width: 100% !important; - -moz-column-count: 2; - -webkit-column-count: 2; - column-count: 2; - -webkit-column-gap: 2rem; - -moz-column-gap: 2rem; - column-gap: 2rem; - -webkit-column-rule: 2px solid $medium-grey; - -moz-column-rule: 2px solid $medium-grey; - column-rule: 2px solid $medium-grey; - margin: 0; - padding: 0; - - li { - background: none; - -webkit-column-break-inside: avoid; - page-break-inside: avoid; - break-inside: avoid; - display: inline-block; - } - } - } - - // two column dropdown menu with quick links - .dropdown-quick-links { - - ul { - display: block; - background: inherit; - - li { - display: block; - text-align: left; - width: inherit; - line-height: 1.5em; - padding: 0; - } - } - - .nav-links { - width: 75%; - float: left; - text-align: left; - border-left: none; - - ul { - width: 100% !important; // important - -moz-column-count: 2; - -webkit-column-count: 2; - column-count: 2; - -webkit-column-gap: 2rem; - -moz-column-gap: 2rem; - column-gap: 2rem; - margin: 0; - padding: 0; - - li { - background: none; - -webkit-column-break-inside: avoid; - page-break-inside: avoid; - break-inside: avoid; - display: inline-block; // removes extra space in 2nd column for webkit browsers - - span { - display: block; - line-height: 1.2em; - font: 16px/1.2em $AkkuratProRegular; - } - } - } - } - - .nav-quick-links { - border-left: 2px solid $medium-grey; - margin-left: 1rem; - padding-left: 2rem; - float: left; - width: 25%; - text-align: left; - - p { - margin-top: 0; - font: 18px $AkkuratProBold; - text-transform: uppercase; - } - - ul { - padding: 0; - - li { - text-transform: none; - font-size: 15px; - line-height: 1.2em; - @extend %purple-right-arrow; - } - } - } + a { + padding: 0; + display: inline-block; + background: inherit; + color: $nu-purple; + + &:hover { + text-decoration: underline; + } } - } - } - - // for normal dropdown menus (do not mix and match with full-width dropdowns) - &.narrow-dropdown { // appends to #top-nav - - ul li { - position: relative; - - &:hover ul { - - &.nav-align-right { // use if necessary for rightmost nav item so dropdown doesn't fall outside of site boundries - right: 0; - left: inherit; - - li { - text-align: right; - } - } + } + } + } + + // two column dropdown + .dropdown-two-column { + ul { + width: 100% !important; + -moz-column-count: 2; + -webkit-column-count: 2; + column-count: 2; + -webkit-column-gap: 2rem; + -moz-column-gap: 2rem; + column-gap: 2rem; + -webkit-column-rule: 2px solid $medium-grey; + -moz-column-rule: 2px solid $medium-grey; + column-rule: 2px solid $medium-grey; + margin: 0; + padding: 0; + + li { + background: none; + -webkit-column-break-inside: avoid; + page-break-inside: avoid; + break-inside: avoid; + display: inline-block; + } + } + } + + // two column dropdown menu with quick links + .dropdown-quick-links { + ul { + display: block; + background: inherit; + + li { + display: block; + text-align: left; + width: inherit; + line-height: 1.5em; + padding: 0; + } + } + + .nav-links { + width: 75%; + float: left; + text-align: left; + border-left: none; + + ul { + width: 100% !important; // important + -moz-column-count: 2; + -webkit-column-count: 2; + column-count: 2; + -webkit-column-gap: 2rem; + -moz-column-gap: 2rem; + column-gap: 2rem; + margin: 0; + padding: 0; + + li { + background: none; + -webkit-column-break-inside: avoid; + page-break-inside: avoid; + break-inside: avoid; + display: inline-block; // removes extra space in 2nd column for webkit browsers + + span { + display: block; + line-height: 1.2em; + font: 16px/1.2em $AkkuratProRegular; + } } + } } - - .contain-1120 > ul { - .dropdown { - display: inherit; - width: 320px; - padding: 1em; + .nav-quick-links { + border-left: 2px solid $medium-grey; + margin-left: 1rem; + padding-left: 2rem; + float: left; + width: 25%; + text-align: left; + + p { + margin-top: 0; + font: 18px $AkkuratProBold; + text-transform: uppercase; + } + + ul { + padding: 0; + + li { + text-transform: none; + font-size: 15px; + line-height: 1.2em; + @extend %purple-right-arrow; } + } + } + } + } + } + + // for normal dropdown menus (do not mix and match with full-width dropdowns) + &.narrow-dropdown { + // appends to #top-nav + + ul li { + position: relative; + + &:hover ul { + &.nav-align-right { + // use if necessary for rightmost nav item so dropdown doesn't fall outside of site boundries + right: 0; + left: inherit; + + li { + text-align: right; + } } - } -} + } + } + + .contain-1120 > ul { + .dropdown { + display: inherit; + width: 320px; + padding: 1em; + } + } + } +} -// media queries +// media queries @media screen and (max-width: 768px) { - - #top-nav { - display: none; - } -} \ No newline at end of file + #top-nav { + display: none; + } +} diff --git a/bin/boot_container b/bin/boot_container index 316714e3..d16122ab 100755 --- a/bin/boot_container +++ b/bin/boot_container @@ -2,13 +2,13 @@ case "$CONTAINER_ROLE" in "migrate") - bundle exec rake db:migrate zookeeper:upload zookeeper:create + rake db:migrate zookeeper:upload zookeeper:create ;; "worker") - bundle exec rake shoryuken:create_config - exec bundle exec shoryuken --config=config/shoryuken.yml --no-daemon --rails + rake shoryuken:create_config + exec shoryuken --config=config/shoryuken.yml --no-daemon --rails ;; *) - exec bundle exec puma -C config/puma_container.rb + exec puma -C config/puma_container.rb ;; esac