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/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/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/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 c5ffbdc..25ccefe 100644 --- a/site/static/css/creative.css +++ b/site/static/css/creative.css @@ -33,7 +33,7 @@ a { a:hover, a:focus { - color: #2093C4; + color: #006d9e; text-decoration: none; } @@ -484,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: #2093C4; + background-color: #006d9e; } .btn-primary:active, diff --git a/site/static/css/custom.css b/site/static/css/custom.css index 5d557b0..4a1b49e 100644 --- a/site/static/css/custom.css +++ b/site/static/css/custom.css @@ -14,6 +14,9 @@ display: inline-block; margin-right: 10px; } +#language li::before { + content: "› "; +} /* LEGAL SECTION */ #legal { @@ -106,147 +109,29 @@ table.signatures th, table.signatures td { padding: 2px; } -/* SHARE BUTTONS IN "SPREAD THE WORD" SECTION */ -.share-buttons a { - background-position: left 5px center; - background-repeat: no-repeat; - background-size: 20px auto; - border-radius: 3px; - color: #000; +/* SPECIAL LINK UNDERLINE EFFECT */ +a:not(.btn) { + box-shadow: 0 0 1px transparent; display: inline-block; - margin: 2.5px 5px 2.5px 0; - min-width: 120px; - opacity: 0.9; - padding: 7px 7px 7px 30px; - text-align: center; - text-decoration: none; - font-family: "Open Sans","Helvetica Neue",Arial,sans-serif; - font-weight: 700; + overflow: hidden; + position: relative; + transform: perspective(1px) translateZ(0px); + vertical-align: middle; } - -.share-buttons a#facebook { - background-color: #3b5998; - background-image: url("/img/share/facebook_white.png"); - color: #fff; +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; } -.share-buttons a#facebook:hover { - background-color: #143271 !important; -} -.share-buttons a#twitter { - background-color: #55acee; - background-image: url("/img/share/twitter_white.png"); - color: #fff; -} -.share-buttons a#twitter:hover { - background-color: #338acc !important; -} -.share-buttons a#gplus { - background-color: #d34836; - background-image: url("/img/share/gplus_white.png"); - color: #fff; - display: none; -} -.share-buttons a#gplus:hover { - background-color: #b12614 !important; -} -.share-buttons a#diaspora { - background-color: #404040; - background-image: url("/img/share/diaspora_white.png"); - color: #fff; -} -.share-buttons a#diaspora:hover { - background-color: #101010 !important; -} -.share-buttons a#flattr { - background-color: #7ea352; - background-image: url("/img/share/flattr_white.png"); - color: #fff; -} -.share-buttons a#flattr:hover { - background-color: #5a7f2e !important; -} -.share-buttons a#support { - background-color: #202d79; - background-image: url("/img/share/fsfe_white.png"); - color: #fff; -} -.share-buttons a#support:hover { - background-color: #0a1763 !important; -} -.share-buttons a#reddit { - background-color: #ff5700; - background-image: url("/img/share/reddit_white.png"); - color: #fff; -} -.share-buttons a#reddit:hover { - background-color: #dd3500 !important; -} -.share-buttons a#gnusocial { - background-color: #a22430; - background-image: url("/img/share/gnusocial_white.png"); - color: #fff; -} -.share-buttons a#gnusocial:hover { - background-color: #850713 !important; -} -.share-buttons a#hnews { - background-color: #ff6600; - background-image: url("/img/share/hackernews_white.png"); - color: #fff; -} -.share-buttons a#hnews:hover { - background-color: #dd3500 !important; -} - -/* SHARE BUTTONS ON LEFT SIDE */ -aside.sharecolumn { - display: none; +a:not(.btn):hover::before, a:not(.btn):focus::before, a:not(.btn):active::before { left: 0; - padding: 0.1vh 0.5vh; - position: fixed; - top: 50%; - transform: translateY(-50%); - z-index: 10; - flex-direction: column; -} -@media(min-width:768px) { - aside.sharecolumn { - display: flex; - } -} -aside.sharecolumn a { - background-position: center center; - background-repeat: no-repeat; - background-size: 2.7vh auto; - background-color: #474747; - border-radius: 3px; - color: #000; - display: inline-block; - margin: 2.5px 5px 2.5px 0; - opacity: 0.9; - text-decoration: none; - height: 4vh; - width: 4vh; -} -aside.sharecolumn a:hover { - background-color: #F05F40; -} -aside.sharecolumn a#diaspora-left { - background-image: url("/img/share/diaspora_white.png"); -} -aside.sharecolumn a#gnusocial-left { - background-image: url("/img/share/gnusocial_white.png"); -} -aside.sharecolumn a#reddit-left { - background-image: url("/img/share/reddit_white.png"); -} -aside.sharecolumn a#twitter-left { - background-image: url("/img/share/twitter_white.png"); -} -aside.sharecolumn a#gplus-left { - background-image: url("/img/share/gplus_white.png"); - display: none; -} -aside.sharecolumn a#facebook-left { - background-image: url("/img/share/facebook_white.png"); + right: 0; }