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/layouts/partials/nav.html b/site/layouts/partials/nav.html index 044415e..977a1cf 100644 --- a/site/layouts/partials/nav.html +++ b/site/layouts/partials/nav.html @@ -10,7 +10,10 @@ {{ with .Site.Params.navigation.brand }} - Logo + {{ end }} diff --git a/site/layouts/partials/start.html b/site/layouts/partials/start.html index 295a1de..00f023b 100644 --- a/site/layouts/partials/start.html +++ b/site/layouts/partials/start.html @@ -2,9 +2,16 @@
- Logo + - {{ 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/creative.css b/site/static/css/creative.css index b031aa0..c5ffbdc 100644 --- a/site/static/css/creative.css +++ b/site/static/css/creative.css @@ -92,11 +92,23 @@ aside { margin: -4px 2px 0 0; } -.navbar-header img { - height: 30px; - margin: 10px 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; @@ -215,15 +227,61 @@ header .header-content { } header .header-content img { - width: 100%; - max-width: 1000px; + display: block; + width: 15em; + margin: 0 auto 2em; } -header .header-content .header-content-inner h1 { - margin-top: 0; - margin-bottom: 0; +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 { @@ -245,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%); 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/logo-header.png b/site/static/img/logo-header.png deleted file mode 100644 index c76d6d8..0000000 Binary files a/site/static/img/logo-header.png and /dev/null differ diff --git a/site/static/img/logo.png b/site/static/img/logo.png deleted file mode 100644 index cef5eed..0000000 Binary files a/site/static/img/logo.png and /dev/null 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