diff --git a/site/config.toml b/site/config.toml index 987e42f..7940802 100644 --- a/site/config.toml +++ b/site/config.toml @@ -37,7 +37,10 @@ DefaultContentLanguage = "en" # Start banner [params.start] # To change the background of the hero section, replace the 'header.jpg' at './static/img' with your own. - slogan = "Public Money – Public Code" + slogan_1 = "Public Money" + slogan_2 = "Public Code" + fsfe = "fsfe.org" + alt = "Public Money, Public Code" subtitle = "Why is software that is programmed with taxpayers' money not released as Free Software? Code paid by all people should be available to all people." buttonText = "See the video" diff --git a/site/content/signatures.de.html b/site/content/signatures.de.html index 5c8b213..8e00d95 100644 --- a/site/content/signatures.de.html +++ b/site/content/signatures.de.html @@ -4,7 +4,7 @@ {{ partial "head.html" . }} - {{ partial "navpage.html" . }} + {{ partial "page-nav.html" . }} {{ partial "page-signatures.html" . }} diff --git a/site/content/signatures.en.html b/site/content/signatures.en.html index 5c8b213..8e00d95 100644 --- a/site/content/signatures.en.html +++ b/site/content/signatures.en.html @@ -4,7 +4,7 @@ {{ partial "head.html" . }} - {{ partial "navpage.html" . }} + {{ partial "page-nav.html" . }} {{ partial "page-signatures.html" . }} diff --git a/site/content/template.html b/site/content/template.html index 67973d2..538cee6 100644 --- a/site/content/template.html +++ b/site/content/template.html @@ -4,7 +4,7 @@ {{ partial "head.html" . }} - {{ partial "navpage.html" . }} + {{ partial "page-nav.html" . }} {{ partial "page-template.html" . }} diff --git a/site/data/de/resources/1-PublicAdmin.yaml b/site/data/de/resources/1-PublicAdmin.yaml index e6e4e10..4168114 100644 --- a/site/data/de/resources/1-PublicAdmin.yaml +++ b/site/data/de/resources/1-PublicAdmin.yaml @@ -2,9 +2,7 @@ modalID: 1 title: Leitfaden für die öffentliche Verwaltung date: 2014-07-05 img: 1.jpg -client: Start Bootstrap -clientLink: "#" -category: Webentwicklung +category: Public Money, Public Code description: "

GERMAN Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.

Vivamus massa mauris, blandit eu ante nec, pretium accumsan risus. Sed malesuada eu elit sit amet feugiat. Morbi a neque lorem. In rutrum ante nisl. Aliquam dapibus tempor libero eget elementum. Donec vitae odio sed ligula dictum malesuada. Fusce vitae facilisis turpis. Vivamus congue dolor lobortis, rutrum nibh at, pulvinar eros.

diff --git a/site/data/de/resources/2-Public.yaml b/site/data/de/resources/2-Public.yaml index 6f3ece2..5d2c507 100644 --- a/site/data/de/resources/2-Public.yaml +++ b/site/data/de/resources/2-Public.yaml @@ -2,7 +2,5 @@ modalID: 2 title: Leitfaden für die Öffentlichkeit date: 2014-07-06 img: 2.jpg -client: Start Bootstrap -clientLink: "#" -category: GERMAN +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/de/resources/3-Action.yaml b/site/data/de/resources/3-Action.yaml index d64997b..7c0c8b2 100644 --- a/site/data/de/resources/3-Action.yaml +++ b/site/data/de/resources/3-Action.yaml @@ -2,7 +2,5 @@ modalID: 3 title: Werde aktiv! date: 2014-07-07 img: 3.jpg -client: Start Bootstrap -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/de/resources/4-News.yaml b/site/data/de/resources/4-News.yaml index 9763715..9460841 100644 --- a/site/data/de/resources/4-News.yaml +++ b/site/data/de/resources/4-News.yaml @@ -2,7 +2,5 @@ modalID: 4 title: Neuigkeiten date: 2014-07-09 img: 4.jpg -client: -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/de/resources/5-FOI.yaml b/site/data/de/resources/5-FOI.yaml index 5231fec..05a6ea9 100644 --- a/site/data/de/resources/5-FOI.yaml +++ b/site/data/de/resources/5-FOI.yaml @@ -2,7 +2,5 @@ modalID: 5 title: Informationsfreiheit date: 2014-07-08 img: 5.jpg -client: -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/de/resources/6-Press.yaml b/site/data/de/resources/6-Press.yaml index dc8ef3d..c3b6af1 100644 --- a/site/data/de/resources/6-Press.yaml +++ b/site/data/de/resources/6-Press.yaml @@ -2,7 +2,5 @@ modalID: 6 title: Presse date: 2014-07-10 img: 6.jpg -client: Start -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/1-PublicAdmin.yaml b/site/data/en/resources/1-PublicAdmin.yaml index f11ae0c..436d9f2 100644 --- a/site/data/en/resources/1-PublicAdmin.yaml +++ b/site/data/en/resources/1-PublicAdmin.yaml @@ -2,9 +2,7 @@ modalID: 1 title: Guide for Public Administration date: 2014-07-05 img: 1.jpg -client: Start Bootstrap -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: "

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.

Vivamus massa mauris, blandit eu ante nec, pretium accumsan risus. Sed malesuada eu elit sit amet feugiat. Morbi a neque lorem. In rutrum ante nisl. Aliquam dapibus tempor libero eget elementum. Donec vitae odio sed ligula dictum malesuada. Fusce vitae facilisis turpis. Vivamus congue dolor lobortis, rutrum nibh at, pulvinar eros.

diff --git a/site/data/en/resources/2-Public.yaml b/site/data/en/resources/2-Public.yaml index 20d6df9..dfbbcaa 100644 --- a/site/data/en/resources/2-Public.yaml +++ b/site/data/en/resources/2-Public.yaml @@ -2,7 +2,5 @@ modalID: 2 title: Guide for general public date: 2014-07-06 img: 2.jpg -client: Start Bootstrap -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/3-Action.yaml b/site/data/en/resources/3-Action.yaml index b0a2648..9ffa144 100644 --- a/site/data/en/resources/3-Action.yaml +++ b/site/data/en/resources/3-Action.yaml @@ -2,7 +2,5 @@ modalID: 3 title: Take Action! date: 2014-07-07 img: 3.jpg -client: Start Bootstrap -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/4-News.yaml b/site/data/en/resources/4-News.yaml index 6e6c021..d54ae26 100644 --- a/site/data/en/resources/4-News.yaml +++ b/site/data/en/resources/4-News.yaml @@ -2,7 +2,5 @@ modalID: 4 title: Latest News date: 2014-07-09 img: 4.jpg -client: -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/5-FOI.yaml b/site/data/en/resources/5-FOI.yaml index e955648..25d4bad 100644 --- a/site/data/en/resources/5-FOI.yaml +++ b/site/data/en/resources/5-FOI.yaml @@ -2,7 +2,5 @@ modalID: 5 title: Freedom of Information date: 2014-07-08 img: 5.jpg -client: -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/data/en/resources/6-Press.yaml b/site/data/en/resources/6-Press.yaml index b4cdd2a..5859eb0 100644 --- a/site/data/en/resources/6-Press.yaml +++ b/site/data/en/resources/6-Press.yaml @@ -2,7 +2,5 @@ modalID: 6 title: Press information date: 2014-07-10 img: 6.jpg -client: Start -clientLink: "#" -category: Web Development +category: Public Money, Public Code description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit. diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html index 01ffd43..ac98ff2 100644 --- a/site/layouts/partials/head.html +++ b/site/layouts/partials/head.html @@ -1,3 +1,4 @@ +{{ "" | safeHTML }} diff --git a/site/layouts/partials/language.html b/site/layouts/partials/language.html index 3bc3932..6c41fc9 100644 --- a/site/layouts/partials/language.html +++ b/site/layouts/partials/language.html @@ -15,5 +15,4 @@ - {{now}} diff --git a/site/layouts/partials/modals.html b/site/layouts/partials/modals.html index 0544086..e82e7ed 100644 --- a/site/layouts/partials/modals.html +++ b/site/layouts/partials/modals.html @@ -42,9 +42,6 @@ {{ end }} {{ end }} - {{ with $.Site.Params.resources.modal.buttonText }} - - {{ end }} diff --git a/site/layouts/partials/nav.html b/site/layouts/partials/nav.html index 9420469..977a1cf 100644 --- a/site/layouts/partials/nav.html +++ b/site/layouts/partials/nav.html @@ -10,7 +10,11 @@ {{ with .Site.Params.navigation.brand }} - {{ . | markdownify }} + + {{ end }} {{ "" | safeHTML }} diff --git a/site/layouts/partials/navpage.html b/site/layouts/partials/page-nav.html similarity index 90% rename from site/layouts/partials/navpage.html rename to site/layouts/partials/page-nav.html index f26b1b8..4a91932 100644 --- a/site/layouts/partials/navpage.html +++ b/site/layouts/partials/page-nav.html @@ -10,7 +10,8 @@ {{ with .Site.Params.navigation.brand }} - {{ . | markdownify }} + Logo + {{ end }} {{ "" | safeHTML }} diff --git a/site/layouts/partials/start.html b/site/layouts/partials/start.html index e46adea..00f023b 100644 --- a/site/layouts/partials/start.html +++ b/site/layouts/partials/start.html @@ -2,10 +2,16 @@
- {{ with .Site.Params.start.slogan }} -

{{ . | markdownify }}

- {{ end }} - {{ if and .Site.Params.start.slogan .Site.Params.start.subtitle }} + + + {{ if and .Site.Params.start.slogan_1 .Site.Params.start.subtitle }}
{{ end }} {{ with .Site.Params.start.subtitle }} diff --git a/site/static/css/buttons-side.css b/site/static/css/buttons-side.css index b8e978c..78142a5 100644 --- a/site/static/css/buttons-side.css +++ b/site/static/css/buttons-side.css @@ -33,7 +33,7 @@ div.sharecolumn .share-buttons.side { /* Single services with their colours and logos */ .share-buttons.side button:hover, .share-buttons.side label:hover { - background-color: #F05F40; + background-color: #4CBD38; } .share-buttons.side .share-diaspora { background-image: url("/img/share/diaspora_white.png"); diff --git a/site/static/css/creative.css b/site/static/css/creative.css index a12e9b5..25ccefe 100644 --- a/site/static/css/creative.css +++ b/site/static/css/creative.css @@ -1,8 +1,8 @@ /*! - * Start Bootstrap - Creative Bootstrap Theme (http://startbootstrap.com) - * Code licensed under the Apache License v2.0. - * For details, see http://www.apache.org/licenses/LICENSE-2.0. - */ +* Start Bootstrap - Creative Bootstrap Theme (http://startbootstrap.com) +* Code licensed under the Apache License v2.0. +* For details, see http://www.apache.org/licenses/LICENSE-2.0. +*/ html, body { @@ -11,12 +11,12 @@ body { } body { - font-family: Merriweather,'Helvetica Neue',Arial,sans-serif; + font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; } hr { max-width: 50px; - border-color: #f05f40; + border-color: #2093C4; border-width: 3px; } @@ -25,7 +25,7 @@ hr.light { } a { - color: #f05f40; + color: #2093C4; -webkit-transition: all .35s; -moz-transition: all .35s; transition: all .35s; @@ -33,7 +33,8 @@ a { a:hover, a:focus { - color: #eb3812; + color: #006d9e; + text-decoration: none; } #about a { @@ -61,7 +62,7 @@ p { } .bg-primary { - background-color: #f05f40; + background-color: #2093C4; } .bg-dark { @@ -85,6 +86,29 @@ aside { padding: 0; } +.nav .fa { + font-size: 1.3em !important; + vertical-align: middle !important; + margin: -4px 2px 0 0; +} + +.navbar .logo { + margin: 15px 10px; +} + +.navbar .logo .logo-blue, +.navbar .logo .logo-green { + padding: 4px 7px; + color: white; +} + +.navbar .logo .logo-blue { + background: #168EC1; + margin-right: 5px; +} + +.navbar .logo .logo-green { background: #4cbd38 } + .navbar-default { border-color: rgba(34,34,34,.05); font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; @@ -98,30 +122,30 @@ aside { text-transform: uppercase; font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif; font-weight: 700; - color: #f05f40; + color: #2093C4; } .navbar-default .navbar-header .navbar-brand:hover, .navbar-default .navbar-header .navbar-brand:focus { - color: #eb3812; + color: #4CBD38; } .navbar-default .nav > li>a, .navbar-default .nav>li>a:focus { text-transform: uppercase; font-size: 13px; - font-weight: 700; + font-weight: 500; color: #222; } .navbar-default .nav > li>a:hover, .navbar-default .nav>li>a:focus:hover { - color: #f05f40; + color: #2093C4; } .navbar-default .nav > li.active>a, .navbar-default .nav>li.active>a:focus { - color: #f05f40!important; + color: #2093C4!important; background-color: transparent; } @@ -162,12 +186,12 @@ aside { .navbar-default.affix .navbar-header .navbar-brand { font-size: 14px; - color: #f05f40; + color: #2093C4; } .navbar-default.affix .navbar-header .navbar-brand:hover, .navbar-default.affix .navbar-header .navbar-brand:focus { - color: #eb3812; + color: #4CBD38; } .navbar-default.affix .nav > li>a, @@ -177,7 +201,7 @@ aside { .navbar-default.affix .nav > li>a:hover, .navbar-default.affix .nav>li>a:focus:hover { - color: #f05f40; + color: #2093C4; } } @@ -202,11 +226,62 @@ header .header-content { text-align: center; } -header .header-content .header-content-inner h1 { - margin-top: 0; - margin-bottom: 0; +header .header-content img { + display: block; + width: 15em; + margin: 0 auto 2em; +} + +header .header-content h1 { + display: block; + vertical-align: bottom; + font-size: 35px !important; + text-align: left; + margin: 0 auto; text-transform: uppercase; font-weight: 700; + width: 300px; +} + +header .header-content h1 .logo-blue, +header .header-content h1 .logo-green { + padding: 10px 12px; + color: white; +} + +header .header-content h1 .logo-blue { + display: block; + background: #168EC1; + margin-right: 5px; +} + +header .header-content h1 .logo-green { + display: block; + background: #4cbd38; + margin-top: 7px; +} + +header .header-content h2 { + display: inline-block; + vertical-align: bottom; + margin: 5px 0 0 200px; + color: #168EC1; +} + +@media(min-width:768px) { + header .header-content img { + display: inline-block; + margin: 0; + } + + header .header-content h1 { + display: inline-block; + margin: 0 10px 0 20px; + } + + header .header-content h2 { + margin: 0 0 -5px 0; + } } header .header-content .header-content-inner hr { @@ -216,8 +291,9 @@ header .header-content .header-content-inner hr { header .header-content .header-content-inner p { margin-bottom: 50px; font-size: 16px; - font-weight: 300; - color: rgba(255,255,255,.7); + font-weight: 500; + color: rgba(255,255,255,.9); + text-shadow: 1px 1px 2px black; } @media(min-width:768px) { @@ -227,7 +303,7 @@ header .header-content .header-content-inner p { header .header-content { position: absolute; - top: 50%; + top: 55%; padding: 0 50px; -webkit-transform: translateY(-50%); -ms-transform: translateY(-50%); @@ -283,7 +359,7 @@ header .header-content .header-content-inner p { text-align: center; color: #fff; opacity: 0; - background: rgba(240,95,64,.9); + background: rgba(76, 189, 56, .9); -webkit-transition: all .35s; -moz-transition: all .35s; transition: all .35s; @@ -332,7 +408,7 @@ header .header-content .header-content-inner p { } .text-primary { - color: #f05f40; + color: #2093C4; } .no-gutter > [class*=col-] { @@ -394,9 +470,9 @@ fieldset[disabled] .btn-default.active { } .btn-primary { - border-color: #f05f40; + border-color: #2093C4; color: #fff; - background-color: #f05f40; + background-color: #2093C4; -webkit-transition: all .35s; -moz-transition: all .35s; transition: all .35s; @@ -408,9 +484,9 @@ fieldset[disabled] .btn-default.active { .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary { - border-color: #ed431f; + border-color: #006798; color: #fff; - background-color: #ee4b28; + background-color: #006d9e; } .btn-primary:active, @@ -437,12 +513,12 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - border-color: #f05f40; - background-color: #f05f40; + border-color: #2093C4; + background-color: #2093C4; } .btn-primary .badge { - color: #f05f40; + color: #2093C4; background-color: #fff; } diff --git a/site/static/css/custom.css b/site/static/css/custom.css index f0882ab..4a1b49e 100644 --- a/site/static/css/custom.css +++ b/site/static/css/custom.css @@ -30,6 +30,14 @@ margin: 0px; font-size: 0.8em; } +#legal a { + color: #83bdd6; +} +#legal a:hover { + color: #2093C4; +} + +#contact .fa { margin: 10px 0 } /* SIGN FORM */ #sign form { @@ -100,3 +108,30 @@ table.signatures th, table.signatures td { text-align: left; padding: 2px; } + +/* SPECIAL LINK UNDERLINE EFFECT */ +a:not(.btn) { + box-shadow: 0 0 1px transparent; + display: inline-block; + overflow: hidden; + position: relative; + transform: perspective(1px) translateZ(0px); + vertical-align: middle; +} +a:not(.btn)::before { + background: #006d9e none repeat scroll 0 0; + bottom: 0; + content: ""; + height: 1px; + left: 50%; + position: absolute; + right: 50%; + transition-duration: 0.3s; + transition-property: left, right; + transition-timing-function: ease-out; + z-index: -1; +} +a:not(.btn):hover::before, a:not(.btn):focus::before, a:not(.btn):active::before { + left: 0; + right: 0; +} diff --git a/site/static/css/modals.css b/site/static/css/modals.css index cbaa530..21af63e 100644 --- a/site/static/css/modals.css +++ b/site/static/css/modals.css @@ -1,81 +1,81 @@ /*! - * The code below adds the modal functionality of the Freelancer Bootstrap Theme - * and was originally part of this theme. - * - * - * Start Bootstrap - Freelancer Bootstrap Theme (http://startbootstrap.com) - * Code licensed under the Apache License v2.0. - * For details, see http://www.apache.org/licenses/LICENSE-2.0. - */ +* The code below adds the modal functionality of the Freelancer Bootstrap Theme +* and was originally part of this theme. +* +* +* Start Bootstrap - Freelancer Bootstrap Theme (http://startbootstrap.com) +* Code licensed under the Apache License v2.0. +* For details, see http://www.apache.org/licenses/LICENSE-2.0. +*/ body { - overflow-x: hidden; + overflow-x: hidden; } .img-centered { - margin: 0 auto; + margin: 0 auto; } .resources-modal .modal-content { - padding: 100px 0; - min-height: 100%; - border: 0; - border-radius: 0; - text-align: center; - background-clip: border-box; - -webkit-box-shadow: none; - box-shadow: none; + padding: 50px 0; + min-height: 100%; + border: 0; + border-radius: 0; + text-align: center; + background-clip: border-box; + -webkit-box-shadow: none; + box-shadow: none; } .resources-modal .modal-content h2 { - margin: 0; - font-size: 3em; + margin: 0; + font-size: 3em; } .resources-modal .modal-content img { - margin-bottom: 30px; + margin-bottom: 30px; } .resources-modal .modal-content .item-details { - margin: 30px 0; + margin: 30px 0; } .resources-modal .close-modal { - position: absolute; - top: 25px; - right: 25px; - width: 75px; - height: 75px; - background-color: transparent; - cursor: pointer; + position: fixed; + top: 25px; + right: 25px; + width: 30px; + height: 30px; + background-color: transparent; + cursor: pointer; } .resources-modal .close-modal:hover { - opacity: .3; + opacity: .3; } .resources-modal .close-modal .lr { - z-index: 1051; - width: 1px; - height: 75px; - margin-left: 35px; - background-color: #2c3e50; - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); + z-index: 1051; + width: 1px; + height: 30px; + margin-left: 15px; + background-color: #2c3e50; + -webkit-transform: rotate(45deg); + -ms-transform: rotate(45deg); + transform: rotate(45deg); } .resources-modal .close-modal .lr .rl { - z-index: 1052; - width: 1px; - height: 75px; - background-color: #2c3e50; - -webkit-transform: rotate(90deg); - -ms-transform: rotate(90deg); - transform: rotate(90deg); + z-index: 1052; + width: 1px; + height: 30px; + background-color: #2c3e50; + -webkit-transform: rotate(90deg); + -ms-transform: rotate(90deg); + transform: rotate(90deg); } .resources-modal .modal-backdrop { - display: none; - opacity: 0; + display: none; + opacity: 0; } diff --git a/site/static/img/.DS_Store b/site/static/img/.DS_Store new file mode 100644 index 0000000..7a34b44 Binary files /dev/null and b/site/static/img/.DS_Store differ diff --git a/site/static/img/header.jpg b/site/static/img/header.jpg index b21a437..1b57ed6 100644 Binary files a/site/static/img/header.jpg and b/site/static/img/header.jpg differ diff --git a/site/static/img/logo.svg b/site/static/img/logo.svg new file mode 100644 index 0000000..22a85ce --- /dev/null +++ b/site/static/img/logo.svg @@ -0,0 +1,111 @@ + + + + Group + Created with Sketch. + + + + + \ No newline at end of file diff --git a/site/static/img/resources/1.jpg b/site/static/img/resources/1.jpg index 44692cc..c756ee5 100644 Binary files a/site/static/img/resources/1.jpg and b/site/static/img/resources/1.jpg differ diff --git a/site/static/img/resources/2.jpg b/site/static/img/resources/2.jpg index 0df8fde..ac64dac 100644 Binary files a/site/static/img/resources/2.jpg and b/site/static/img/resources/2.jpg differ diff --git a/site/static/img/resources/3.jpg b/site/static/img/resources/3.jpg index 3b08627..b2d833a 100644 Binary files a/site/static/img/resources/3.jpg and b/site/static/img/resources/3.jpg differ diff --git a/site/static/img/resources/4.jpg b/site/static/img/resources/4.jpg index 82243f2..f5ec12f 100644 Binary files a/site/static/img/resources/4.jpg and b/site/static/img/resources/4.jpg differ diff --git a/site/static/img/resources/5.jpg b/site/static/img/resources/5.jpg index cd87077..ad3a2b4 100644 Binary files a/site/static/img/resources/5.jpg and b/site/static/img/resources/5.jpg differ diff --git a/site/static/img/resources/6.jpg b/site/static/img/resources/6.jpg index 9be6c5e..2833213 100644 Binary files a/site/static/img/resources/6.jpg and b/site/static/img/resources/6.jpg differ