diff --git a/opentech/apply/dashboard/templates/dashboard/dashboard.html b/opentech/apply/dashboard/templates/dashboard/dashboard.html index 2651753da5ebc8482058ccfe6338621250f04f2b..ee2f7fc260f32525cd43019b34d9ff0487df6f5d 100644 --- a/opentech/apply/dashboard/templates/dashboard/dashboard.html +++ b/opentech/apply/dashboard/templates/dashboard/dashboard.html @@ -1,4 +1,4 @@ -{% extends "base-admin.html" %} +{% extends "base-apply.html" %} {% load render_table from django_tables2 %} {% block extra_css %} diff --git a/opentech/static_src/package.json b/opentech/static_src/package.json index 0e844e9bf69b734f6d33e5ac9d595b33fa531fa7..ca8b85212facfa292ff4214c772e795d62791616 100755 --- a/opentech/static_src/package.json +++ b/opentech/static_src/package.json @@ -44,7 +44,7 @@ "compile:css:watch": "npm run compile:css -- --output-style expanded --source-map true --watch", "compile:css:prod": "npm run compile:css -- --output-style compressed && npm run autoprefixer", "compile:css:debug": "npm run compile:css -- --output-style compressed --watch", - "autoprefixer": "postcss -u autoprefixer -b 'last 2 versions, iOS 8, > 3%' -r $npm_package_config_dest_css/*.css", + "autoprefixer": "postcss -u autoprefixer -b 'last 2 versions, iOS 8, > 3%' -r $npm_package_config_dest_css/**/*.css", "//[ Javascript ]//": "", "compile:js": "rollup -c", diff --git a/opentech/static_src/src/sass/abstracts/_mixins.scss b/opentech/static_src/src/sass/apply/abstracts/_mixins.scss similarity index 100% rename from opentech/static_src/src/sass/abstracts/_mixins.scss rename to opentech/static_src/src/sass/apply/abstracts/_mixins.scss diff --git a/opentech/static_src/src/sass/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss similarity index 100% rename from opentech/static_src/src/sass/abstracts/_variables.scss rename to opentech/static_src/src/sass/apply/abstracts/_variables.scss diff --git a/opentech/static_src/src/sass/apply/base/_base.scss b/opentech/static_src/src/sass/apply/base/_base.scss new file mode 100755 index 0000000000000000000000000000000000000000..ea21f8bbf74a21e16c13b3adb3e8072efc437841 --- /dev/null +++ b/opentech/static_src/src/sass/apply/base/_base.scss @@ -0,0 +1,101 @@ +/*------------------------------------*\ + $BASE DEFAULTS +\*------------------------------------*/ + +// Box Sizing +*, +*::before, +*::after { + box-sizing: border-box; +} + +// Prevent text size change on orientation change. +// sass-lint:disable no-vendor-prefixes +html { + font-family: $font--primary; + -webkit-text-size-adjust: 100%; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +body { + overflow-x: hidden; + + &.no-scroll { + overflow-y: hidden; + } +} + +// Prevent empty space below images appearing +img, +svg { + vertical-align: top; +} + +// Responsive images +img { + height: auto; + max-width: 100%; +} + +// sass-lint:disable single-line-per-selector +button, input, select, textarea { + font-family: inherit; +} +// sass-lint:enddisable + +a { + color: $color--primary; + text-decoration: none; + + &:hover { + cursor: pointer; + } +} + +ul, +ol { + padding: 0; + margin: 0; + list-style: none; +} + +.is-invisible, +%is-invisible { + z-index: -1; + opacity: 0; + transition: opacity, z-index, $transition; +} + +.is-visible, +%is-visible { + z-index: 5; + opacity: 1; + transition: opacity, z-index, $transition; +} + +.is-hidden, +%is-hidden { + display: none; +} + +.is-unhidden, +%is-unhidden { + display: block; +} + +.off-screen, +%off-screen { + position: absolute; + left: -9999px; +} + +.on-screen, +%on-screen { + position: relative; + left: 0; +} + +.light-grey-bg { + background-color: $color--light-grey; +} diff --git a/opentech/static_src/src/sass/base/_typography.scss b/opentech/static_src/src/sass/apply/base/_typography.scss similarity index 85% rename from opentech/static_src/src/sass/base/_typography.scss rename to opentech/static_src/src/sass/apply/base/_typography.scss index cc32d1e7e312084237b2bfadde065551d0e8eac5..e0aeff91b2984e7783f06f93e317b0ff16e0f412 100755 --- a/opentech/static_src/src/sass/base/_typography.scss +++ b/opentech/static_src/src/sass/apply/base/_typography.scss @@ -70,7 +70,7 @@ small, .milli { @include font-size(milli); } font-family: 'proxima-nova'; font-style: normal; font-weight: 200; - src: url('./../fonts/proxima-nova/proxima-nova-thin.woff') format('woff'); + src: url('./../../fonts/proxima-nova/proxima-nova-thin.woff') format('woff'); text-rendering: optimizeLegibility; } @@ -79,7 +79,7 @@ small, .milli { @include font-size(milli); } font-family: 'proxima-nova'; font-style: normal; font-weight: 400; - src: url('./../fonts/proxima-nova/proxima-nova-regular.woff') format('woff'); + src: url('./../../fonts/proxima-nova/proxima-nova-regular.woff') format('woff'); text-rendering: optimizeLegibility; } @@ -88,7 +88,7 @@ small, .milli { @include font-size(milli); } font-family: 'proxima-nova'; font-style: normal; font-weight: 600; - src: url('./../fonts/proxima-nova/proxima-nova-semibold.woff') format('woff'); + src: url('./../../fonts/proxima-nova/proxima-nova-semibold.woff') format('woff'); text-rendering: optimizeLegibility; } @@ -97,7 +97,7 @@ small, .milli { @include font-size(milli); } font-family: 'proxima-nova'; font-style: normal; font-weight: 700; - src: url('./../fonts/proxima-nova/proxima-nova-bold.woff') format('woff'); + src: url('./../../fonts/proxima-nova/proxima-nova-bold.woff') format('woff'); text-rendering: optimizeLegibility; } @@ -106,6 +106,6 @@ small, .milli { @include font-size(milli); } font-family: 'proxima-nova'; font-style: normal; font-weight: 800; - src: url('./../fonts/proxima-nova/proxima-nova-black.woff') format('woff'); + src: url('./../../fonts/proxima-nova/proxima-nova-black.woff') format('woff'); text-rendering: optimizeLegibility; } diff --git a/opentech/static_src/src/sass/apply/components/_button.scss b/opentech/static_src/src/sass/apply/components/_button.scss new file mode 100644 index 0000000000000000000000000000000000000000..c9c9d1685ba37ee16a734e997cc6ccb460c80185 --- /dev/null +++ b/opentech/static_src/src/sass/apply/components/_button.scss @@ -0,0 +1,32 @@ +.button { + padding: 0; + background-color: transparent; + background-image: none; + border: 0; + box-shadow: none; + + &:hover { + cursor: pointer; + } + + &--contains-icons { + display: flex; + align-items: center; + + .header & { + margin-right: 20px; + } + } + + &--transparent { + @include button(transparent, $color--black); + @include button--narrow; + color: $color--black; + border: 1px solid $color--black; + + &:hover { + color: $color--white; + } + } +} + diff --git a/opentech/static_src/src/sass/apply/components/_icon.scss b/opentech/static_src/src/sass/apply/components/_icon.scss new file mode 100644 index 0000000000000000000000000000000000000000..8688dfbadf1e42d1c56dddb66d84b52b773891b2 --- /dev/null +++ b/opentech/static_src/src/sass/apply/components/_icon.scss @@ -0,0 +1,54 @@ +.icon { + width: 20px; + height: 20px; + transition: fill $transition; + fill: $color--dark-grey; + + .header__menus--mobile.is-visible & { // sass-lint:disable-line force-element-nesting + fill: $color--white; + } + + &--person { + width: 15px; + height: 15px; + margin-right: 5px; + transition: fill $transition; + + .button:hover & { + fill: $color--white; + } + } + + &--social-share { + width: 40px; + height: 40px; + padding: 10px; + margin-right: 5px; + } + + &--calendar { + fill: $color--pink; + } + + &--error { + width: 25px; + height: 25px; + margin-right: 10px; + } + + &--status { + width: 65px; + height: 100%; + stroke: $color--mid-grey; + fill: transparent; + + .is-active & { + stroke: $color--correct; + } + } + + &--small { + width: 14px; + height: 14px; + } +} diff --git a/opentech/static_src/src/sass/apply/components/_wrapper.scss b/opentech/static_src/src/sass/apply/components/_wrapper.scss new file mode 100644 index 0000000000000000000000000000000000000000..932103c378b9925b9f06c8deaee428870b2aabcb --- /dev/null +++ b/opentech/static_src/src/sass/apply/components/_wrapper.scss @@ -0,0 +1,185 @@ +.wrapper { + width: 100%; + + &--small { + max-width: $wrapper--small; + margin: 0 auto; + } + + &--medium { + max-width: $wrapper--medium; + margin: 0 auto; + } + + &--large { + max-width: $site-width; + margin: 0 auto; + } + + &--main { + padding: 0 20px; + } + + &--admin { + padding: 20px; + color: $color--white; + background-color: $color--dark-grey; + } + + &--breakout { + position: relative; + right: 50%; + left: 50%; + width: 100vw; + margin-right: -50vw; + margin-left: -50vw; + } + + &--blockquote { + padding: 1rem 0; + margin-top: 2rem; + margin-bottom: 2rem; + background: $color--light-grey; + + @include media-query(tablet-portrait) { + padding: 4rem 0; + margin-top: 4rem; + margin-bottom: 4rem; + } + + svg { + position: absolute; + display: none; + width: 110px; + height: 110px; + fill: $color--white; + + @include media-query(tablet-portrait) { + display: block; + } + + &:first-child { + top: 0; + left: 0; + transform: rotate(90deg); + } + + &:last-child { + right: 0; + bottom: 0; + transform: rotate(-90deg); + } + } + } + + &--top-bottom-space { + padding: 1rem 0; + + @include media-query(tablet-portrait) { + padding: 3rem 0; + } + } + + &--top-bottom-inner-space { + padding: 20px 0; + + @include media-query(mob-landscape) { + padding: 2rem 0; + } + } + + &--top-bottom-outer-space { + margin: 20px 0; + + @include media-query(mob-landscape) { + margin: 2rem 0; + } + } + + &--light-grey-bg { + background-color: $color--light-grey; + } + + &--media-boxes { + max-width: 1220px; + padding: 0 20px; + margin: 0 auto; + } + + &--bottom-space { + padding-bottom: 20px; + margin-bottom: 20px; + + @include media-query(tablet-portrait) { + padding-bottom: 3rem; + margin-bottom: 3rem; + } + } + + &--form { + padding: 20px; + margin: 20px auto; + + @include media-query(tablet-portrait) { + padding: 2rem 17rem 2rem 5rem; + margin: 1rem auto 3rem; + } + } + + &--error { + display: flex; + align-items: center; + max-width: 830px; + padding: 10px; + margin: 0 auto 2rem; + background: $color--light-pink; + border: 1px solid $color--tomato; + } + + &--top-inner-space { + padding: 20px 0; + + @include media-query(tablet-portrait) { + padding: 3rem 0; + } + } + + &--top-inner-space-small { + padding: 20px 0; + } + + &--top-outer-space { + margin: 20px 0; + + @include media-query(tablet-portrait) { + margin: 3rem 0; + } + } + + &--top-outer-space-small { + margin: 20px 0 0; + } + + &--sidebar { + display: flex; + flex-direction: column; + + @include media-query(tablet-portrait) { + flex-direction: row; + + > div:last-child { + flex-basis: 210px; + } + } + + > div:first-child { + flex: 1; + margin-bottom: 20px; + + @include media-query(tablet-portrait) { + padding-right: 20px; + margin-bottom: 0; + } + } + } +} diff --git a/opentech/static_src/src/sass/apply/layout/_header.scss b/opentech/static_src/src/sass/apply/layout/_header.scss new file mode 100644 index 0000000000000000000000000000000000000000..c5255772460b7f5a0b61b248926c3a066e778e96 --- /dev/null +++ b/opentech/static_src/src/sass/apply/layout/_header.scss @@ -0,0 +1,65 @@ +.header { + position: relative; + padding: 20px; + background-color: $color--white; + + &__inner { + position: relative; + z-index: 10; + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + + &--mobile-buttons { + justify-content: flex-end; + + @include media-query(tablet-portrait) { + display: none; + } + } + } + + &__logo { + fill: $color--default; + + &--mobile { + width: 60px; + height: 60px; + + @include media-query(tablet-landscape) { + display: none; + } + } + + &--desktop { + display: none; + + @include media-query(tablet-landscape) { + display: block; + width: 215px; + height: 50px; + } + } + } + + &__menu-toggle { + @include media-query(tablet-portrait) { + display: none; + } + } + + &__icon { + &--close-search { + @extend %is-hidden; + } + } + + &__button-container { + display: none; + + @include media-query(tablet-portrait) { + display: flex; + } + } +} diff --git a/opentech/static_src/src/sass/apply/main.scss b/opentech/static_src/src/sass/apply/main.scss new file mode 100755 index 0000000000000000000000000000000000000000..81828c292f62a2bf71255a90b84a87f462f2d932 --- /dev/null +++ b/opentech/static_src/src/sass/apply/main.scss @@ -0,0 +1,18 @@ +// Vendor +@import 'vendor/normalize'; + +// Abstracts +@import 'abstracts/mixins'; +@import 'abstracts/variables'; + +// Base +@import 'base/base'; +@import 'base/typography'; + +// Components +@import 'components/button'; +@import 'components/icon'; +@import 'components/wrapper'; + +// Layout +@import 'layout/header'; diff --git a/opentech/static_src/src/sass/vendor/_normalize.scss b/opentech/static_src/src/sass/apply/vendor/_normalize.scss similarity index 99% rename from opentech/static_src/src/sass/vendor/_normalize.scss rename to opentech/static_src/src/sass/apply/vendor/_normalize.scss index 1cef7e9e371ec453aade5fd6a164d06911393742..9633230e5bff243eeeb63ec493af73b736a50906 100755 --- a/opentech/static_src/src/sass/vendor/_normalize.scss +++ b/opentech/static_src/src/sass/apply/vendor/_normalize.scss @@ -1,5 +1,5 @@ /*! normalize.css v4.2.0 | MIT License | github.com/necolas/normalize.css */ - +// sass-lint:disable-all /** * 1. Change the default font family in all browsers (opinionated). * 2. Correct the line height in all browsers. diff --git a/opentech/static_src/src/sass/abstracts/_functions.scss b/opentech/static_src/src/sass/public/abstracts/_functions.scss similarity index 100% rename from opentech/static_src/src/sass/abstracts/_functions.scss rename to opentech/static_src/src/sass/public/abstracts/_functions.scss diff --git a/opentech/static_src/src/sass/public/abstracts/_mixins.scss b/opentech/static_src/src/sass/public/abstracts/_mixins.scss new file mode 100755 index 0000000000000000000000000000000000000000..077351637d705d5ddaba5719f2080731e8b79c65 --- /dev/null +++ b/opentech/static_src/src/sass/public/abstracts/_mixins.scss @@ -0,0 +1,128 @@ +// Media queries +@mixin media-query($queries...) { + @each $query in $queries { + @each $breakpoint in $breakpoints { + $name: nth($breakpoint, 1); + $declaration: nth($breakpoint, 2); + + @if $query == $name and $declaration { + @media only screen and #{$declaration} { + @content; + } + } + } + } +} + +// Placeholder text +@mixin placeholder-text { + // sass-lint:disable no-vendor-prefixes + &.placeholder { @content; } + &:-moz-placeholder { @content; } + &::-moz-placeholder { @content; } + &:-ms-input-placeholder { @content; } + &::-webkit-input-placeholder { @content; } + // sass-lint:enddisable +} + +// Hide text +@mixin hidden { + position: absolute; + width: 1px; + height: 1px; + overflow: hidden; + clip: rect(1px, 1px, 1px, 1px); +} + +// iOS Native vertical scroll +@mixin native-vertical-scroll { + overflow-x: hidden; + overflow-y: scroll; + -webkit-overflow-scrolling: touch; // sass-lint:disable-line no-misspelled-properties +} + +// Output a rem and px fallback value for the given property +@mixin rem($property, $values) { + + $px: (); + $rem: (); + + @each $value in $values { + @if $value == 0 or $value == auto or $value == inherit { + $px: append($px, $value); + $rem: append($rem, $value); + } @else { + $px: append($px, $value); + $rem: append($rem, rem(strip-unit($value))); + } + } + // sass-lint:disable no-duplicate-properties + #{$property}: $px; + #{$property}: $rem; + // sass-lint:enddisable +} + +// Output a `font-size: [x]rem;` declaration for the given px value +@mixin rem-font-size($font-size) { + @include rem(font-size, $font-size); +} + +// Font sizes +@mixin font-size($keyword) { + $size: map-get($font-sizes, $keyword); + + @if $size == null { + @warn 'Font size ‘#{$keyword}’ does not exist'; + } @else { + @include rem-font-size($size); + } +} + +// Button mixin +@mixin button($bg, $hover-bg) { + padding: 10px 60px; + font-weight: $weight--bold; + color: $color--white; + background: $bg; + border: 1px solid $color--white; + transition: color, background, border, $transition; + + &:hover, + &:active { + cursor: pointer; + background: $hover-bg; + } +} + +// Narrow button mixin +@mixin button--narrow { + padding: 5px; + font-size: 15px; + + @include media-query(tablet-landscape) { + padding: 5px 15px; + } +} + +// Viewport sized typography mixin that takes a min and max pixel-based value +@mixin responsive-font-sizes($min, $max) { + + $vw-context: (1260 * 0.1) * 1px; + $responsive: ($max / $vw-context) * 10vw; + + $responsive-unitless: $responsive / ($responsive - $responsive + 1); + $dimension: if(unit($responsive) == 'vh', 'height', 'width'); + $min-breakpoint: $min / $responsive-unitless * 100; + + @media (max-#{$dimension}: #{$min-breakpoint}) { + font-size: $min; + } + + $max-breakpoint: $max / $responsive-unitless * 100; + + @media (min-#{$dimension}: #{$max-breakpoint}) { + font-size: $max; + } + + font-size: $responsive; +} diff --git a/opentech/static_src/src/sass/public/abstracts/_variables.scss b/opentech/static_src/src/sass/public/abstracts/_variables.scss new file mode 100755 index 0000000000000000000000000000000000000000..3b9e796a9e93a1627116d394a75f15b272776939 --- /dev/null +++ b/opentech/static_src/src/sass/public/abstracts/_variables.scss @@ -0,0 +1,72 @@ +// Default +$color--white: #fff; +$color--black: #141414; +$color--dark-grey: #404041; +$color--light-grey: #f7f7f7; +$color--mid-grey: #cfcfcf; + +// Brand +$color--light-blue: #43bbf1; +$color--dark-blue: #25aae1; +$color--darkest-blue: #3d6bdb; +$color--mustard: #e6ab32; +$color--purple: #8c0bbf; +$color--pink: #e35ca6; +$color--light-pink: #ffe1df; +$color--tomato: #f05e54; +$color--mint: #40c2ad; + +// Social +$color--twitter: #1da6f6; +$color--linkedin: #137ab8; +$color--facebook: #396ab5; + +// Transparent +$color--black-10: rgba(0, 0, 0, 0.1); + +// Assignment +$color--default: $color--dark-grey; +$color--primary: $color--light-blue; +$color--error: $color--tomato; +$color--correct: $color--mint; + +// Fonts +$font--primary: 'proxima-nova'; + +// Font weights +$weight--black: 800; +$weight--bold: 700; +$weight--semibold: 600; +$weight--normal: 400; +$weight--light: 200; + +// Font sizes +$base-font-size: 19px; +$base-line-height: 29px; +$font-sizes: ( + alpha: 72px, + beta: 42px, + gamma: 36px, + delta: 24px, + epsilon: 17px, + zeta: 15px, + milli: 13px +); + +// Wrappers +$site-width: 1280px; +$wrapper--medium: 1020px; +$wrapper--small: 790px; + +// Breakpoints +$breakpoints: ( + 'mob-portrait' '(min-width: 320px)', + 'mob-landscape' '(min-width: 480px)', + 'tablet-portrait' '(min-width: 768px)', + 'tablet-landscape' '(min-width: 1024px)', + 'desktop' '(min-width: 1280px)', + 'deskop-wide' '(min-width: 2556px)' +); + +// Transition +$transition: 0.25s ease-out; diff --git a/opentech/static_src/src/sass/base/_base.scss b/opentech/static_src/src/sass/public/base/_base.scss similarity index 100% rename from opentech/static_src/src/sass/base/_base.scss rename to opentech/static_src/src/sass/public/base/_base.scss diff --git a/opentech/static_src/src/sass/public/base/_typography.scss b/opentech/static_src/src/sass/public/base/_typography.scss new file mode 100755 index 0000000000000000000000000000000000000000..e0aeff91b2984e7783f06f93e317b0ff16e0f412 --- /dev/null +++ b/opentech/static_src/src/sass/public/base/_typography.scss @@ -0,0 +1,111 @@ +// $TYPOGRAPHY +// Base font +html { + font-size: ($base-font-size / 16px) * 100%; + line-height: $base-line-height / $base-font-size; + color: $color--default; +} + +/* ============================================ + Families – one mixin per typeface + :: For each font mixin defined here, make sure each property is negated (set + :: to its default value, usually `inherit`) in all other font mixins. +*/ +@mixin heading-text { + margin: 0 0 1rem; + font-family: $font--primary; + font-style: inherit; + font-weight: $weight--bold; +} + +@mixin body-text { + font-family: $font--primary; + font-style: inherit; + font-weight: inherit; + text-transform: inherit; +} + +// sass-lint:disable single-line-per-selector +h1, h2, h3, h4, h5, h6, +.heading-text { + @include heading-text; +} +// sass-lint:enddisable + +html, +.body-text { + @include responsive-font-sizes(16px, 19px); +} + +// Default sizes +h1, %h1, .alpha { + @include responsive-font-sizes(40px, map-get($font-sizes, alpha)); + font-weight: $weight--black; +} + +h2, %h2, .beta { + @include responsive-font-sizes(30px, map-get($font-sizes, beta)); +} + +h3, %h3, .gamma { + @include responsive-font-sizes(20px, map-get($font-sizes, gamma)); +} + +h4, %h4, .delta { + @include responsive-font-sizes(18px, map-get($font-sizes, delta)); +} + +h5, %h5, .epsilon { + @include responsive-font-sizes(15px, map-get($font-sizes, epsilon)); +} + +h6, %h6, .zeta { + font-size: 15px; +} + +small, .milli { @include font-size(milli); } + +// thin +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 200; + src: url('./../../fonts/proxima-nova/proxima-nova-thin.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// regular +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 400; + src: url('./../../fonts/proxima-nova/proxima-nova-regular.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// semibold +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 600; + src: url('./../../fonts/proxima-nova/proxima-nova-semibold.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// bold +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 700; + src: url('./../../fonts/proxima-nova/proxima-nova-bold.woff') format('woff'); + text-rendering: optimizeLegibility; +} + +// black +@font-face { + font-family: 'proxima-nova'; + font-style: normal; + font-weight: 800; + src: url('./../../fonts/proxima-nova/proxima-nova-black.woff') format('woff'); + text-rendering: optimizeLegibility; +} diff --git a/opentech/static_src/src/sass/components/_apply-bar.scss b/opentech/static_src/src/sass/public/components/_apply-bar.scss similarity index 100% rename from opentech/static_src/src/sass/components/_apply-bar.scss rename to opentech/static_src/src/sass/public/components/_apply-bar.scss index 194eccbccf4c11dcc8b495c28e5a07a45a2ba7c0..d52e311e313e16e09bd286206f198359b0f7226f 100644 --- a/opentech/static_src/src/sass/components/_apply-bar.scss +++ b/opentech/static_src/src/sass/public/components/_apply-bar.scss @@ -17,8 +17,8 @@ &__heading { display: flex; align-items: center; - font-size: 36px; margin-bottom: 5px; + font-size: 36px; @include media-query(tablet-portrait) { margin: inherit; diff --git a/opentech/static_src/src/sass/components/_blockquote.scss b/opentech/static_src/src/sass/public/components/_blockquote.scss similarity index 100% rename from opentech/static_src/src/sass/components/_blockquote.scss rename to opentech/static_src/src/sass/public/components/_blockquote.scss diff --git a/opentech/static_src/src/sass/components/_button.scss b/opentech/static_src/src/sass/public/components/_button.scss similarity index 100% rename from opentech/static_src/src/sass/components/_button.scss rename to opentech/static_src/src/sass/public/components/_button.scss diff --git a/opentech/static_src/src/sass/components/_call-to-action.scss b/opentech/static_src/src/sass/public/components/_call-to-action.scss similarity index 100% rename from opentech/static_src/src/sass/components/_call-to-action.scss rename to opentech/static_src/src/sass/public/components/_call-to-action.scss diff --git a/opentech/static_src/src/sass/components/_card.scss b/opentech/static_src/src/sass/public/components/_card.scss similarity index 100% rename from opentech/static_src/src/sass/components/_card.scss rename to opentech/static_src/src/sass/public/components/_card.scss diff --git a/opentech/static_src/src/sass/components/_form.scss b/opentech/static_src/src/sass/public/components/_form.scss similarity index 94% rename from opentech/static_src/src/sass/components/_form.scss rename to opentech/static_src/src/sass/public/components/_form.scss index 078d549972f0d4658969e11057393b20dca8a11c..ddee807bb320d7f610114a81874f99d1262d8ade 100644 --- a/opentech/static_src/src/sass/components/_form.scss +++ b/opentech/static_src/src/sass/public/components/_form.scss @@ -57,7 +57,7 @@ @include button($color--light-blue, $color--dark-blue); max-width: 290px; text-align: center; - background: url('./../images/upload.svg') $color--light-blue no-repeat 50px center; + background: url('./../../images/upload.svg') $color--light-blue no-repeat 50px center; border: 0; .no-js & { @@ -65,7 +65,7 @@ } &:hover { - background: url('./../images/upload.svg') $color--dark-blue no-repeat 50px center; + background: url('./../../images/upload.svg') $color--dark-blue no-repeat 50px center; .no-js & { background: none; @@ -95,7 +95,7 @@ &__select { max-width: 385px; - background: url('./../images/dropdown.svg') $color--white no-repeat 95% center; + background: url('./../../images/dropdown.svg') $color--white no-repeat 95% center; background-size: 8px; select[multiple='multiple'] { @@ -270,7 +270,7 @@ } &:checked + label::before { - background: url('./../images/tick.svg') $color--dark-blue center no-repeat; + background: url('./../../images/tick.svg') $color--dark-blue center no-repeat; background-size: 12px; border: 1px solid $color--dark-blue; } diff --git a/opentech/static_src/src/sass/components/_fund-box.scss b/opentech/static_src/src/sass/public/components/_fund-box.scss similarity index 100% rename from opentech/static_src/src/sass/components/_fund-box.scss rename to opentech/static_src/src/sass/public/components/_fund-box.scss diff --git a/opentech/static_src/src/sass/components/_grid.scss b/opentech/static_src/src/sass/public/components/_grid.scss similarity index 96% rename from opentech/static_src/src/sass/components/_grid.scss rename to opentech/static_src/src/sass/public/components/_grid.scss index bdacbafb002c819f8605ecbc519ea5d38945ac40..8622ce274bd0ed1cceefe7a9d1c7f48c8ad1e940 100644 --- a/opentech/static_src/src/sass/components/_grid.scss +++ b/opentech/static_src/src/sass/public/components/_grid.scss @@ -62,7 +62,7 @@ &--one { grid-template-columns: 1fr; - grid-gap: 30px; + grid-gap: 30px; // sass-lint:disable-line no-misspelled-properties } &--two { diff --git a/opentech/static_src/src/sass/components/_heading.scss b/opentech/static_src/src/sass/public/components/_heading.scss similarity index 100% rename from opentech/static_src/src/sass/components/_heading.scss rename to opentech/static_src/src/sass/public/components/_heading.scss diff --git a/opentech/static_src/src/sass/components/_icon.scss b/opentech/static_src/src/sass/public/components/_icon.scss similarity index 88% rename from opentech/static_src/src/sass/components/_icon.scss rename to opentech/static_src/src/sass/public/components/_icon.scss index bd125be5f61ec5df4c888614d47d582d419ba931..a458518c3170c4f77efba886cf3f4117c7f48a24 100644 --- a/opentech/static_src/src/sass/components/_icon.scss +++ b/opentech/static_src/src/sass/public/components/_icon.scss @@ -8,7 +8,7 @@ fill: $color--dark-grey; } - .header__menus--mobile.is-visible & { + .header__menus--mobile.is-visible & { // sass-lint:disable-line force-element-nesting fill: $color--white; } @@ -52,7 +52,7 @@ fill: $color--white; } - .header--light-bg.search-open & { + .header--light-bg.search-open & { // sass-lint:disable-line force-element-nesting fill: $color--dark-grey; } } @@ -104,7 +104,7 @@ } &--search { - .header--light-bg.search-open & { + .header--light-bg.search-open & { // sass-lint:disable-line force-element-nesting fill: $color--white; } } diff --git a/opentech/static_src/src/sass/components/_image.scss b/opentech/static_src/src/sass/public/components/_image.scss similarity index 100% rename from opentech/static_src/src/sass/components/_image.scss rename to opentech/static_src/src/sass/public/components/_image.scss diff --git a/opentech/static_src/src/sass/components/_input.scss b/opentech/static_src/src/sass/public/components/_input.scss similarity index 100% rename from opentech/static_src/src/sass/components/_input.scss rename to opentech/static_src/src/sass/public/components/_input.scss diff --git a/opentech/static_src/src/sass/components/_link.scss b/opentech/static_src/src/sass/public/components/_link.scss similarity index 100% rename from opentech/static_src/src/sass/components/_link.scss rename to opentech/static_src/src/sass/public/components/_link.scss diff --git a/opentech/static_src/src/sass/components/_list.scss b/opentech/static_src/src/sass/public/components/_list.scss similarity index 100% rename from opentech/static_src/src/sass/components/_list.scss rename to opentech/static_src/src/sass/public/components/_list.scss diff --git a/opentech/static_src/src/sass/components/_listing.scss b/opentech/static_src/src/sass/public/components/_listing.scss similarity index 100% rename from opentech/static_src/src/sass/components/_listing.scss rename to opentech/static_src/src/sass/public/components/_listing.scss diff --git a/opentech/static_src/src/sass/components/_media-box.scss b/opentech/static_src/src/sass/public/components/_media-box.scss similarity index 100% rename from opentech/static_src/src/sass/components/_media-box.scss rename to opentech/static_src/src/sass/public/components/_media-box.scss diff --git a/opentech/static_src/src/sass/components/_nav.scss b/opentech/static_src/src/sass/public/components/_nav.scss similarity index 100% rename from opentech/static_src/src/sass/components/_nav.scss rename to opentech/static_src/src/sass/public/components/_nav.scss diff --git a/opentech/static_src/src/sass/components/_responsive-object.scss b/opentech/static_src/src/sass/public/components/_responsive-object.scss similarity index 100% rename from opentech/static_src/src/sass/components/_responsive-object.scss rename to opentech/static_src/src/sass/public/components/_responsive-object.scss diff --git a/opentech/static_src/src/sass/components/_rich-text.scss b/opentech/static_src/src/sass/public/components/_rich-text.scss similarity index 100% rename from opentech/static_src/src/sass/components/_rich-text.scss rename to opentech/static_src/src/sass/public/components/_rich-text.scss diff --git a/opentech/static_src/src/sass/components/_section.scss b/opentech/static_src/src/sass/public/components/_section.scss similarity index 100% rename from opentech/static_src/src/sass/components/_section.scss rename to opentech/static_src/src/sass/public/components/_section.scss diff --git a/opentech/static_src/src/sass/components/_wrapper.scss b/opentech/static_src/src/sass/public/components/_wrapper.scss similarity index 99% rename from opentech/static_src/src/sass/components/_wrapper.scss rename to opentech/static_src/src/sass/public/components/_wrapper.scss index f054b0e62fd5f34e036375ba7de86cea5afbe445..52a5eff6525fb69b8b02e131984f83baf772ef9d 100644 --- a/opentech/static_src/src/sass/components/_wrapper.scss +++ b/opentech/static_src/src/sass/public/components/_wrapper.scss @@ -218,7 +218,7 @@ &--project { padding-top: 2rem; } - + &--listings { display: flex; flex-direction: column; diff --git a/opentech/static_src/src/sass/layout/_footer.scss b/opentech/static_src/src/sass/public/layout/_footer.scss similarity index 100% rename from opentech/static_src/src/sass/layout/_footer.scss rename to opentech/static_src/src/sass/public/layout/_footer.scss diff --git a/opentech/static_src/src/sass/layout/_header.scss b/opentech/static_src/src/sass/public/layout/_header.scss similarity index 98% rename from opentech/static_src/src/sass/layout/_header.scss rename to opentech/static_src/src/sass/public/layout/_header.scss index f320f52b8012716d695bad93a50af6a27a07c347..17fa1308d9f900ecd79701866b86c65d950fc043 100644 --- a/opentech/static_src/src/sass/layout/_header.scss +++ b/opentech/static_src/src/sass/public/layout/_header.scss @@ -141,7 +141,7 @@ fill: $color--dark-grey; } - .header__menus--mobile.is-visible & { + .header__menus--mobile.is-visible & { // sass-lint:disable-line force-element-nesting fill: $color--white; } } diff --git a/opentech/static_src/src/sass/layout/_sidebar.scss b/opentech/static_src/src/sass/public/layout/_sidebar.scss similarity index 100% rename from opentech/static_src/src/sass/layout/_sidebar.scss rename to opentech/static_src/src/sass/public/layout/_sidebar.scss diff --git a/opentech/static_src/src/sass/main.scss b/opentech/static_src/src/sass/public/main.scss similarity index 100% rename from opentech/static_src/src/sass/main.scss rename to opentech/static_src/src/sass/public/main.scss diff --git a/opentech/static_src/src/sass/public/vendor/_normalize.scss b/opentech/static_src/src/sass/public/vendor/_normalize.scss new file mode 100755 index 0000000000000000000000000000000000000000..f79ec2a254ea7de291dbf236a25ec05ad202117d --- /dev/null +++ b/opentech/static_src/src/sass/public/vendor/_normalize.scss @@ -0,0 +1,422 @@ +/*! normalize.css v4.2.0 | MIT License | github.com/necolas/normalize.css */ +// sass-lint:disable-all +/** + * 1. Change the default font family in all browsers (opinionated). + * 2. Correct the line height in all browsers. + * 3. Prevent adjustments of font size after orientation changes in IE and iOS. + */ + +html { + font-family: sans-serif; /* 1 */ + line-height: 1.15; /* 2 */ + -ms-text-size-adjust: 100%; /* 3 */ + -webkit-text-size-adjust: 100%; /* 3 */ +} + +/** + * Remove the margin in all browsers (opinionated). + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Add the correct display in IE 9-. + * 1. Add the correct display in Edge, IE, and Firefox. + * 2. Add the correct display in IE. + */ + +article, +aside, +details, /* 1 */ +figcaption, +figure, +footer, +header, +main, /* 2 */ +menu, +nav, +section, +summary { /* 1 */ + display: block; +} + +/** + * Add the correct display in IE 9-. + */ + +audio, +canvas, +progress, +video { + display: inline-block; +} + +/** + * Add the correct display in iOS 4-7. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Add the correct display in IE 10-. + * 1. Add the correct display in IE. + */ + +template, /* 1 */ +[hidden] { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ + +a { + background-color: transparent; /* 1 */ + -webkit-text-decoration-skip: objects; /* 2 */ +} + +/** + * Remove the outline on focused links when they are also active or hovered + * in all browsers (opinionated). + */ + +a:active, +a:hover { + outline-width: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ + +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * Add the correct font style in Android 4.3-. + */ + +dfn { + font-style: italic; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Add the correct background and color in IE 9-. + */ + +mark { + background-color: #ff0; + color: #000; +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10-. + */ + +img { + border-style: none; +} + +/** + * Hide the overflow in IE. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct margin in IE 8. + */ + +figure { + margin: 1em 40px; +} + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change font properties to `inherit` in all browsers (opinionated). + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font: inherit; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Restore the font weight unset by the previous rule. + */ + +optgroup { + font-weight: bold; +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * 1. Prevent a WebKit bug where (2) destroys native `audio` and `video` + * controls in Android 4. + * 2. Correct the inability to style clickable types in iOS and Safari. + */ + +button, +html [type="button"], /* 1 */ +[type="reset"], +[type="submit"] { + -webkit-appearance: button; /* 2 */ +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Change the border, margin, and padding in all browsers (opinionated). + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Remove the default vertical scrollbar in IE. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10-. + * 2. Remove the padding in IE 10-. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding and cancel buttons in Chrome and Safari on OS X. + */ + +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Correct the text style of placeholders in Chrome, Edge, and Safari. + */ + +::-webkit-input-placeholder { + color: inherit; + opacity: 0.54; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} diff --git a/opentech/templates/base-admin.html b/opentech/templates/base-apply.html similarity index 97% rename from opentech/templates/base-admin.html rename to opentech/templates/base-apply.html index 7aadb49b1e51e1b29df39ec44f70f6cd182a0055..15a7e723dd08df3af3b89590eb336456930999a6 100644 --- a/opentech/templates/base-admin.html +++ b/opentech/templates/base-apply.html @@ -25,7 +25,7 @@ {% endcomment %} {% block extra_css %}{% endblock %} - <link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}"> + <link rel="stylesheet" type="text/css" href="{% static 'css/apply/main.css' %}"> </head> <body class="light-grey-bg {% block body_class %}template-{{ page.get_verbose_name|slugify }}{% endblock %}"> @@ -41,7 +41,7 @@ {% wagtailuserbar %} - <header class="header header--narrow header--white-bg header--light-bg"> + <header class="header"> <div class="header__inner wrapper wrapper--large"> <a href="{% slugurl 'home' %}" aria-label="Home link"> diff --git a/opentech/templates/base.html b/opentech/templates/base.html index 68abc68ac0e99541fd4a7e96f93bf60d87b35e32..4d80249ba9bac855fbf956e5ee3a6e942e786be4 100644 --- a/opentech/templates/base.html +++ b/opentech/templates/base.html @@ -50,7 +50,7 @@ <meta property="og:description" content="{{ page|social_text:request.site }}" /> <meta property="og:site_name" content="{{ settings.utils.SocialMediaSettings.site_name }}" /> - <link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}"> + <link rel="stylesheet" type="text/css" href="{% static 'css/public/main.css' %}"> {% block extra_css %}{% endblock %}