Compare commits

...

37 commits

Author SHA1 Message Date
f40c8bc3a4 Merge branch 'responsive_header' of Disroot/grav-theme-disroot into master 2019-10-30 22:00:50 +00:00
8443a4dc7a fixed padding of menu on mobile 2019-10-30 22:50:31 +01:00
43b2e75ad2 Fix user logo size + padding of logo menu in mobile view 2019-10-30 22:34:59 +01:00
2698428720 fixed merge conflicts 2019-10-30 22:11:48 +01:00
dbbeca165c Merge branch 'master' conflicts into responsive_header 2019-10-30 22:04:57 +01:00
10793503e5 minor adjustments 2019-10-30 21:38:06 +01:00
d5bcfc871f add user icon in nav bar 2019-10-28 13:48:22 +01:00
f1ced29686 replace temporary id names used 2019-10-28 13:16:13 +01:00
ca6aeab57b remove unused code in navigation modular 2019-10-28 12:52:58 +01:00
4ee31dbe4a Fix mobile view 2019-10-28 12:51:54 +01:00
b406b71bdb try to have a more responsive nav bar -> works till mobile view... 2019-10-25 23:47:55 +02:00
a0bc7544d3 fix logos hover 2019-10-25 21:50:13 +02:00
b54a547837 improve logos hover 2019-10-25 21:22:49 +02:00
38198d9db5 fix link 2019-10-25 20:27:33 +02:00
95eebf512f new footer 2019-10-25 19:09:22 +02:00
0e21e2672c make menu a bit more responsive 2019-10-24 18:57:24 +02:00
aba8408bc7 Fix language selector position on mobile 2019-10-24 18:20:12 +02:00
28bfe94362 improve render of logos in mobile view 2019-10-24 12:32:21 +02:00
76cc657c51 add margin beween logos and links 2019-10-24 12:02:49 +02:00
c1dc212ebb fix logo tat didn't appear when clicking on services page 2019-10-24 11:58:37 +02:00
cbf68cf37c consistency of height between header of home page and other pages 2019-10-24 11:45:40 +02:00
8a96dc61f0 fix div on logo 2019-10-24 11:39:20 +02:00
6d60692551 fix for mobile view 2019-10-23 19:29:36 +02:00
13b88ed9e9 open state and dash on in new yab 2019-10-22 23:25:05 +02:00
54a5ef84ba fixed service button color after visited 2019-10-22 23:20:31 +02:00
d067635787 added service icons and some other adjustments 2019-10-22 23:04:06 +02:00
a06e247c59 improve new header in mobile mode 2019-10-20 18:42:42 +02:00
dbce5df69e new header 2019-10-20 16:13:54 +02:00
8a9e9099af not used code -> make file cleaner 2019-10-20 07:31:16 +02:00
a0685ef759 remove undefined selector 2019-10-20 07:23:27 +02:00
88bcdd0913 remove old navigation files not used anymore 2019-10-20 07:03:22 +02:00
9fc808f6be add new D logo for nav bar 2019-10-19 17:27:46 +02:00
1246e6e236 add new xmpp logo to /images 2019-10-19 16:39:08 +02:00
f295d05cf9 update to service style using template 2019-10-19 16:31:38 +02:00
53e53ed46d updates to service style 2019-10-16 18:54:42 +02:00
4585a6a384 add possibility to set padding for fullbar template 2019-10-16 18:54:09 +02:00
4de5cb85d1 New services style 2019-10-16 15:06:35 +02:00
20 changed files with 507 additions and 352 deletions

View file

@ -79,8 +79,8 @@ body {
.row.collapsed > .columns,
.column.collapsed, .columns.collapsed { padding: 0; }
[class*="column"] + [class*="column"]:last-child { float: right; }
[class*="column"] + [class*="column"].end { float: right; }
/*[class*="column"] + [class*="column"]:last-child { float: right; }
[class*="column"] + [class*="column"].end { float: right; }*/
/* column widths */
.row .one { width: 8.33333%; }
@ -330,7 +330,7 @@ abbr:hover { cursor: help; }
hr { border: solid #E3E3E3; border-width: 1px 0 0; clear: both; margin: 11px 0 30px; height: 0; }
.framed { border: solid #E3E3E3; border-radius: 10px; border-width: 2px 2px;}
/*.framed { border: solid #E3E3E3; border-radius: 10px; border-width: 2px 2px;}*/
/* Links */
@ -397,6 +397,70 @@ img.pull-left { margin: 12px 18px 0px 0px; }
/* Buttons */
.button {
font-size: 85%;
background: #1F5C60;
}
.button1 {
margin-top: 20px;
background: #50162D;
color: #FFF;
}
.button1:hover {
background: #72384F;
color: #50162D;
}
.button1 i {
margin-right: 15px;
font-size: 20px;
}
.button2 {
margin-top: 20px;
background: #1F5C60;
color: #FFF;
}
.button2:hover {
background: #327E82;
color: #1F5C60;
}
.button2 i {
margin-right: 15px;
font-size: 20px;
}
.button3 {
margin-top: 20px;
background: #8EB726;
color: #FFF;
}
.button3:hover {
background: #B1D948;
color: #8EB726;
}
.button3 i {
margin-right: 15px;
font-size: 20px;
}
.button.button4 {
padding: 0px;
}
.button4 {
display:block;
height: 40px;
width: 40px;
background: #50162D;
color: #FFF;
text-align: center;
display: inline-block;
font-size: 15px;
margin: 2px;
border-radius: 50%;
}
.button4:hover {
background: #50162D;
}
.button,
.button:visited,
button,

View file

@ -5,23 +5,9 @@ Disroot Media Queries
------------------------------------*/
/* screenwidth less than 1024px
/* screenwidth less than 1000px
------------------------------------*/
@media only screen and (max-width: 1024px) {
/* header styles
------------------------------------*/
header .banner-text h1 {
font: 80px/1.1em 'opensans-bold', sans-serif;
letter-spacing: -1px;
margin: 0 auto 12px auto;
}
}
/* screenwidth less than 900px
------------------------------------*/
@media only screen and (max-width: 900px) {
@media only screen and (max-width: 1150px) {
/* header styles
------------------------------------*/
@ -29,6 +15,8 @@ Disroot Media Queries
header .banner-text h1 {
font: 78px/1.1em 'opensans-bold', sans-serif;
letter-spacing: -1px;
margin: 0 auto 12px auto;
}
header .banner-text h3 {
font: 17px/1.9em 'librebaskerville-regular', serif;
@ -40,16 +28,34 @@ Disroot Media Queries
}
/* nav-wrap */
ul#nav li a {
padding: 8px 8%;
}
#nav-logo {
display: none;
pointer-events: none;
height: 35px;
background-size: 30px;
}
#nav-wrap {
font: 11px 'opensans-bold', sans-serif;
letter-spacing: 1.5px;
#state-logo {
height: 35px;
width: 25px;
background-size: 20px;
top: 20px;
}
#dash-logo {
height: 35px;
width: 25px;
background-size: 20px;
}
#user-logo {
height: 35px;
width: 25px;
background-size: 20px;
}
.dropdown-content {
display: none;
z-index: 1;
@ -58,6 +64,7 @@ Disroot Media Queries
display: none;
}
/* Contact Section
------------------------------------*/
#contact .section-head { margin-bottom: 30px; }
@ -72,91 +79,10 @@ Disroot Media Queries
/* mobile wide/smaller tablets
------------------------------------*/
@media only screen and (max-width: 767px) {
@media only screen and (max-width: 830px) {
/* mobile navigation
------------------------------------*/
#nav-wrap {
font: 12px 'opensans-bold', sans-serif;
background: transparent !important;
letter-spacing: 1.5px;
width: auto;
position: fixed;
top: 0;
right: 0;
}
#nav-wrap > a {
width: 48px;
height: 48px;
text-align: left;
background-color: #50162D;
position: relative;
border: none;
float: right;
font: 0/0 a;
text-shadow: none;
color: transparent;
position: relative;
top: 0px;
right: 30px;
}
#nav-wrap > a:before,
#nav-wrap > a:after {
position: absolute;
border: 2px solid #fff;
top: 35%;
left: 25%;
right: 25%;
content: '';
}
#nav-wrap > a:after { top: 60%; }
/* toggle buttons */
#nav-wrap:not( :target ) > a:first-of-type,
#nav-wrap:target > a:last-of-type {
display: block;
}
/* hide menu panel */
#nav-wrap ul#nav {
height: auto;
display: none;
clear: both;
width: auto;
float: right;
position: relative;
top: 12px;
right: 0;
}
/* display menu panels */
#nav-wrap:target > ul#nav {
display: block;
padding: 30px 20px 48px 20px;
background: #1f2024;
margin: 0 30px;
clear: both;
}
ul#nav li {
display: block;
height: auto;
margin: 0 auto;
padding: 0 4%;
text-align: left;
border-bottom: 1px solid #2D2E34;
border-bottom-style: dotted;
}
ul#nav li a {
display: block;
margin: 0;
padding: 0;
margin: 12px 0;
line-height: 16px; /* reset line-height from 48px */
border: none;
}
/* Header Styles
@ -175,6 +101,134 @@ Disroot Media Queries
margin: 18px auto;
}
/* toggle buttons */
#nav-wrap:not( :target ) > a:first-of-type,
#nav-wrap:target > a:last-of-type {
display: block;
}
#nav-wrap > a {
width: 48px;
height: 48px;
background-color: #50162D;
position: absolute;
border: none;
float: right;
font: 0/0 a;
text-shadow: none;
color: transparent;
top: 0px;
right: 30px;
}
#nav-wrap > a:before, #nav-wrap > a:after {
position: absolute;
border: 2px solid #fff;
top: 35%;
left: 25%;
right: 25%;
content: '';
}
#nav-wrap > a:after {
top: 60%;
}
/* End toggle buttons */
#nav-wrap {
font: 12px 'opensans-bold', sans-serif;
background: transparent !important;
letter-spacing: 1.5px;
width: auto;
top: 0;
right: 0;
display:block;
}
ul#nav li {
display: block;
height: auto;
margin: 0 auto;
padding: 0 4%;
border-bottom: 1px solid #2D2E34;
border-bottom-style: dotted;
}
ul#logo-right li {
border-top: 1px solid #2D2E34;
border-top-style: dotted;
}
ul#nav li a {
display: block;
margin: 0;
padding: 0;
margin: 12px 0;
line-height: 16px; /* reset line-height from 48px */
border: none;
text-align: center;
}
/* display menu panels */
#nav-wrap:target div#nav-links> ul#nav {
display: block;
padding: 30px 20px 10px 20px;
background: #1f2024;
margin: 0 30px;
float: right;
width: 150px;
}
#nav-wrap:target div#nav-right > ul#logo-right {
display: block;
padding: 0px 20px 10px 20px;
background: #1f2024;
margin: 0 30px;
float:right;
width: 150px;
}
/* hide menu panel */
#nav-wrap div#nav-links> ul#nav {
height: auto;
display: none;
clear: both;
width: 30%;
float: right;
position: relative;
top: 12px;
right: 0;
}
#nav-wrap div#nav-right > ul#logo-right {
height: auto;
display: none;
clear: both;
width: 30%;
float: right;
position: relative;
right: 0;
}
/* hide D logo */
div#nav-logo {
display: none;
}
/* State and dashboard logos */
#language {
position: fixed;
top: 0px;
right: 50px;
}
#nav-links {
padding: 0;
}
/* Control Nav */
/* .flex-control-nav {
@ -206,8 +260,9 @@ Disroot Media Queries
/* Footer
------------------------------------*/
/* copyleft */
footer #copyleft { display: none; }
/* Icons */
footer #footer-icons { display: none; }
footer #footer-logo { display: none; }
/* Go To Top Button */
#go-top { margin-left: -22px; }
@ -258,11 +313,23 @@ Disroot Media Queries
/* mobile narrow
------------------------------------*/
@media only screen and (max-width: 640px) {
@media only screen and (max-width: 600px) {
/* mobile navigation
------------------------------------*/
#nav-wrap ul#nav { width: auto; float: none; }
#nav-wrap ul#nav { width: 10%; float: none; }
#nav-wrap:target div#nav-links> ul#nav {
width: 80%;
}
#nav-wrap:target div#nav-right > ul#logo-right {
width: 80%;
}
#nav-right {
padding: 0 5%;
}
/* header styles
------------------------------------*/

View file

@ -31,7 +31,7 @@ body { background: #fff; color: #555;}
header {
position: relative;
height: 100vh;
min-height: 500px;
min-height: 400px;
width: 100%;
background: #161415 url(../images/header-background.jpg) no-repeat center center;
/* background: linear-gradient( rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5) ), url(../images/adm.png) no-repeat center center;*/
@ -68,14 +68,14 @@ header {
.miniheader {
position: relative;
height: 800px;
height: 100vh;
min-height: 400px;
width: 100%;
}
.miniheader-img {
position: fixed;
height: 800px;
height: 100vh;
min-height: 400px;
width: 100%;
background-position: right bottom;
@ -159,16 +159,14 @@ header .scrolldown a:hover { color: #50162D; }
#nav-logo {
display: inline-block;
float: left;
height: 45px;
width: 95px;
background: url("../images/d-white.png") no-repeat right center;
width: 45px;
margin-left: 30px;
background: url("../images/d-white.png") no-repeat left center;
background-size: 40px 40px;
opacity: 0.7;
}
#nav-wrap ul {
float: right;
}
#nav-wrap ul, #nav-wrap li, #nav-wrap a {
margin: 0;
@ -177,39 +175,100 @@ header .scrolldown a:hover { color: #50162D; }
outline: none;
}
/* nav-wrap */
#nav-wrap {
background-color: #50162D;
font: 12px 'opensans-bold', sans-serif;
font: calc(8px + 0.2vw) 'opensans-bold', sans-serif;
width: 100%;
text-transform: uppercase;
letter-spacing: 2.5px;
letter-spacing: 0.2vw;
margin: 0 auto;
z-index: 100;
position: fixed;
left: 0;
top: 0;
display: flex;
justify-content: space-between;
text-align: center;
align-items: center;
}
.opaque { background-color: #50162D; }
/* hide toggle button */
#nav-wrap > a.mobile-btn { display: none; }
.mobile-btn {
z-index: 101;
}
#nav-links{
text-align: center;
flex-grow: 2;
padding: 0 5%;
}
#nav {
display: flex;
justify-content: space-between;
}
ul#nav {
min-height: 48px;
width: auto;
/* center align the menu */
text-align: right;
padding-right: 10%;
}
ul#nav li {
position: relative;
display: inline-block;
list-style: none;
height: 48px;
width: auto;
padding-right: 1%;
}
ul#logo-right {
display: flex;
justify-content: end;
align-items: center;
}
ul#logo-right li {
line-height: 0px;
}
#nav-right {
text-align: center;
}
#state-logo {
display: inline-block;
height: 45px;
width: 45px;
background: url("../images/state-white.png") no-repeat center center;
background-size: 30px;
opacity: 0.7;
}
#dash-logo {
display: inline-block;
height: 45px;
width: 45px;
background: url("../images/dashboard.png") no-repeat center center;
background-size: 30px;
opacity: 0.7;
}
#user-logo {
display: inline-block;
height: 45px;
width: 40px;
background: url("../images/user.png") no-repeat center center;
background-size: 25px;
opacity: 0.7;
}
ul#nav li ul{
position: absolute;
list-style: none;
@ -227,6 +286,7 @@ ul#nav li ul{
border-top: 2px solid #FFF;
display: block;
}
ul.dropdown-content a{
width: 150px;
background-color: #50162D;
@ -238,17 +298,14 @@ ul.dropdown-content a{
.language-selector .btn {
position: relative;
top: 20px;
top: 15px;
/*color: #f00;*/
}
/* Links */
ul#nav li a {
/* 8px padding top + 8px padding bottom + 32px line-height = 48px */
display: inline-block;
padding: 8px 13px;
padding: 8px 12%;
line-height: 32px;
text-decoration: none;
text-align: left;
@ -263,79 +320,13 @@ ul#nav li a {
ul#nav li a:active { background-color: #b9a2ab !important; }
ul#nav li a:hover { color: #FFFFFF;}
ul#logo-right li a:hover { color: #FFFFFF; opacity: 1;}
ul#nav li.active a { color: #FFFFFF; }
ul#nav li a:hover .ul#nav li ul {
display: block;
}
/* Buttons
------------------------------------*/
.button {
font-size: 85%;
background: #1F5C60;
}
.button1 {
margin-top: 20px;
background: #50162D;
color: #FFF;
}
.button1:hover {
background: #72384F;
color: #50162D;
}
.button1 i {
margin-right: 15px;
font-size: 20px;
}
.button2 {
margin-top: 20px;
background: #1F5C60;
color: #FFF;
}
.button2:hover {
background: #327E82;
color: #1F5C60;
}
.button2 i {
margin-right: 15px;
font-size: 20px;
}
.button3 {
margin-top: 20px;
background: #8EB726;
color: #FFF;
}
.button3:hover {
background: #B1D948;
color: #8EB726;
}
.button3 i {
margin-right: 15px;
font-size: 20px;
}
.button.button4 {
padding: 0px;
}
.button4 {
display:block;
height: 40px;
width: 40px;
background: #50162D;
color: #FFF;
text-align: center;
display: inline-block;
font-size: 15px;
margin: 2px;
border-radius: 50%;
}
.button4:hover {
background: #50162D;
}
/* Template Specific
------------------------------------*/
@ -398,6 +389,7 @@ ul#nav li a:hover .ul#nav li ul {
margin-bottom: 30px;
position: relative;
z-index: 9;
}
.fullbar-content{
@ -430,7 +422,7 @@ ul#nav li a:hover .ul#nav li ul {
height: 80px;
width: 250px;
position: absolute;
top: -20px;
top: 20px;
}
.service-logo img {
height: 80px;
@ -440,20 +432,98 @@ ul#nav li a:hover .ul#nav li ul {
.framed {
background: #FFF;
display: inline-block;
text-align: center;
vertical-align: top;
height: 300px;
height: 240px;
width: 250px;
margin: 30px 25px;
margin: 70px 25px;
padding-top: 30px;
clear: none;
border-radius: 0px;
border: none;
box-shadow: 10px 10px 38px 0px rgba(0, 0, 0, 0.25);
}
.framed .left {
float: left;
}
.framed p, .framed h2 {
.framed p {
width: 80%;
text-align: left;
width: 60%;
color: #555;
margin: 5px auto;
height: 58%;
}
.framed h2 {
width: 70%;
text-align: center;
margin: 5px auto;
font-size: 1.5em;
}
/* New services
------------------------------------*/
/*.service-parent {
display: flex;
justify-content: center;
flex-wrap: wrap;
margin-top: 40px;
}
.service-parent p {
text-align: justify;
padding-left: 10%;
padding-right: 10%;
line-height: 15px;
height: 27%;
}
.service-parent h1 {
margin-top: -10%;
color: #50162D;
padding: 2%;
font-size: 1.5em;
}
.service-item {
display: inline-block;
width: 220px;
height: 250px;
text-align: center;
border: none;
box-shadow: 10px 10px 38px 0px rgba(0, 0, 0, 0.25);
margin-right: 5%;
margin-top: 5%;
margin-bottom: 50px;
background-color: white;
}
.service-item img {
position: relative;
width: 30%;
max-width: 80px;
transform: translate(0%, -50%);
}
*/
.service-btn, .service-btn:visited {
position: relative;
bottom: -13px;
width: 30%;
background-color: #50162D;
text-align: center;
font-size: 1.2em;
color: white;
border-radius: 5px;
text-decoration: none;
padding: 2% 5%;
transition: all 0.3s ease-in-out;
border: 1px solid transparent;
}
.service-btn:hover {
background-color: #72384F;
color: #50162D;
border-color: #50162D;
}
/* New services
@ -788,36 +858,68 @@ textarea {
------------------------------------*/
footer {
height: 110px;
padding-top: 20px;
padding-bottom: 24px;
background-color: #2e131e;
height: 80px;
background-color: #50162D;
color: #FFFFFF;
font-size: 10px;
font-size: 12px;
text-transform: uppercase;
letter-spacing: 1.5px;
color: #b9a2ab;
font-weight: 600;
line-height: 8px;
margin-top: -60px;
position: relative;
z-index: 9;
left: 0;
bottom: 0;
width: 100%;
display: flex;
justify-content: center;
text-align: center;
align-items: center;
}
footer #footer-logo {
float: left;
display: block;
background: url("../images/logo_white.png") no-repeat right center;
background-size: 200px auto;
height: 60px;
width: 300px;
height: 45px;
width: 15%;
background: url("../images/d-white.png") no-repeat left center;
background-size: 40px 40px;
margin-left: 30px;
opacity: 0.7;
display: inline-block;
}
footer .dot {
height: 5px;
width: 5px;
background-color: #b9a2ab;
border-radius: 50%;
display: inline-block;
margin-bottom: 2px;
}
footer #footer-links {
float: right;
text-align: left;
padding-right: 70px;
text-align: center;
width: 60%;
}
footer ul.footer-links {
display: flex;
justify-content: center;
align-items: center;
}
footer ul.footer-icons {
display: flex;
justify-content: end;
margin-right: 30px;
align-items: center;
}
footer div#footer-links ul li {
padding-left: 20px;
padding-right: 20px;
margin: 0;
padding-top: 13px;
}
footer #footer-links a {
color: #b9a2ab;
}
@ -825,28 +927,30 @@ footer #footer-links a:hover {
color: #FFFFFF;
}
footer #copyleft {
position: absolute;
pointer-events: none;
footer #footer-icons {
width: 25%;
background: transparent;
margin-left: auto;
margin-right: auto;
text-align: center;
width: 100%;
clear: both;
}
footer .button, footer .button:active, footer .button:visited {
background: none;
color: #b9a2ab;
pointer-events: auto;
padding: 0px 10px;
}
footer .button:hover{
background: transparent;
color: #FFFFFF;
footer #footer-icons ul li {
margin: 0;
padding-right: 10px;
padding-top: 10px;
text-align: right;
}
footer #footer-icons ul li .fa-fw {
color: white;
opacity: 0.7;
}
footer #footer-icons ul li .fa-fw:hover {
color: white;
opacity: 1;
}
footer a, footer a:visited { color: #FFFFFF; }
footer a:hover, footer a:focus { color: #1F5C60; }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
images/dashboard.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
images/logo_pads.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
images/logo_pastebin.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
images/logo_polls.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
images/logo_search.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
images/logo_upload.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
images/logo_xmpp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
images/state-white.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
images/state.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
images/user.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View file

@ -1,6 +1,6 @@
{% block content %}
<section id="{{ page.slug }}">
<div class="fullbar" style="background-color:{{ page.header.bgcolor }};">
<div class="fullbar" style="background-color:{{ page.header.bgcolor }}; padding:{{ page.header.padding }};">
<div class="fullbar-content" style="color:{{ page.header.fontcolor }}; text-align:{{ page.header.text_align }};">
{{ page.content }}
</div>

View file

@ -7,13 +7,15 @@
{% for item in page.header.services %}
<div class="four columns">
<div class="framed">
<div class="service-logo"> <img src="user/themes/disroot/images/logo_{{ item.icon }}"></div>
<div class="service-logo"> <img src="../user/themes/disroot/images/logo_{{ item.icon }}"></div>
<a href="{{ item.link }}">
<h2>{{ item.title }}</h2>
<p class="service">
{{ item.text }}
</p>
</a>
<a href="{{ item.button }}" class="service-btn">{{ item.buttontext }}</a>
</div>
</div>
{% endfor %}

View file

@ -1,16 +1,19 @@
<footer>
<div id="footer-logo"></div>
<div id="footer-logo" ><a href="https://disroot.org/contact"></a></div>
<div id="footer-links">
<ul>
<ul class="footer-links">
<li>Copyleft Disroot.org</li>
<li><span class="dot"></span></li>
<li><a href="https://disroot.org/tos">Terms Of Service</a></li>
<li><span class="dot"></span></li>
<li><a href="https://disroot.org/privacy_policy">Privacy Policy</a></li>
</ul>
</div>
<div id="copyleft">
<p>
<a class="button" href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw"></i> Atom 1.0</a>
<a class="button" href="{{ base_url }}/blog.rss"><i class="fa fa-rss-square fa-fw"></i> RSS</a>
<br>copyleft disroot.org
</p>
<div id="footer-icons">
<ul class="footer-icons">
<li><a href="https://hub.disroot.org/channel/disroot"><i class="fa fa-hubzilla fa-fw fa-3x"></i></a></li>
<li><a href="https://social.weho.st/@disroot"><i class="fa fa-mastodon fa-fw fa-3x"></i></a></li>
<li><a href="{{ base_url }}/blog.atom"><i class="fa fa-rss-square fa-fw fa-3x"></i></a></li>
</ul>
</div>
</footer>

View file

@ -15,7 +15,6 @@
<nav id="nav-wrap">
<div><a id="nav-logo" href="{{ base_url == '' ? '/#home' : base_url }}"></a></div>
<a class="mobile-btn" href="#nav-wrap" title="Show navigation">Show navigation</a>
<a class="mobile-btn" href="#close" title="Hide navigation">Hide navigation</a>
@ -23,7 +22,8 @@
{% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
{% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
{% include 'partials/language-selector.html.twig' %}
<div id="nav-logo" ><a href="{{ base_url == '' ? '/#home' : base_url }}"></a></div>
<div id="nav-links">
<ul id="nav" class="nav">
{% for page in pages.children %}
{% if page.visible %}
@ -44,6 +44,14 @@
{% if config.plugins.login.enabled and grav.user.username %}
<li><i class="fa fa-lock"></i> {% include 'partials/login-status.html.twig' %}</li>
{% endif %}
</ul>
</ul></div>
<div id="nav-right">
<ul id="logo-right">
<li>
<a id="dash-logo" href="https://apps.disroot.org" target=_blank></a>
<a id="state-logo" href="https://state.disroot.org" target=_blank></a>
<a id="user-logo" href="https://user.disroot.org" target=_blank></a>
</li>
<li id="language">{% include 'partials/language-selector.html.twig' %}</a></li>
</ul></div>
</nav>

View file

@ -1,52 +0,0 @@
{% macro loop(page) %}
{% for p in page.children.visible %}
{% set current_page = (p.active or p.activeChild) ? 'active' : '' %}
{% if p.children.visible.count > 0 %}
<li class="has-children {{ current_page }}">
<a href="{{ p.url }}">
{% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
{{ p.menu }}
<span></span>
</a>
<ul>
{{ _self.loop(p) }}
</ul>
</li>
{% else %}
<li class="{{ current_page }}">
<a href="{{ p.url }}">
{% if p.header.icon %}<i class="fa fa-{{ p.header.icon }}"></i>{% endif %}
{{ p.menu }}
</a>
</li>
{% endif %}
{% endfor %}
{% endmacro %}
<ul class="navigation">
{% if theme_config.dropdown.enabled %}
{{ _self.loop(pages) }}
{% else %}
{% for page in pages.children.visible %}
{% set current_page = (page.active or page.activeChild) ? 'active' : '' %}
<li class="{{ current_page }}">
<a href="{{ page.url }}">
{% if page.header.icon %}<i class="fa fa-{{ page.header.icon }}"></i>{% endif %}
{{ page.menu }}
</a>
</li>
{% endfor %}
{% endif %}
{% for mitem in site.menu %}
<li>
<a href="{{ mitem.url }}">
{% if mitem.icon %}<i class="fa fa-{{ mitem.icon }}"></i>{% endif %}
{{ mitem.text }}
</a>
</li>
{% endfor %}
{% if config.plugins.login.enabled and grav.user.username %}
<li><i class="fa fa-lock"></i> {% include 'partials/login-status.html.twig' %}</li>
{% endif %}
</ul>

View file

@ -1,41 +0,0 @@
<nav id="nav-wrap">
<a class="mobile-btn" href="#nav-wrap" title="Show navigation">Show navigation</a>
<a class="mobile-btn" href="#close" title="Hide navigation">Hide navigation</a>
{% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
{% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
<ul id="nav" class="nav">
{% for page in pages.children %}
{% if page.visible %}
{% set current_page = (page.active or page.activeChild) ? 'current' : '' %}
{% if 'home' in page.menu %}
<li class="current">
<a class="smoothscroll" href="#home">
{{ page.menu }}
</a>
</li>
{% else %}
<li class="{{ current_page }}">
<a href="{{ page.url }}">
{{ page.menu }}
</a>
</li>
{% endif %}
{% endif %}
{% endfor %}
{% for mitem in site.menu %}
<li>
<a href="{{ mitem.link }}">{{ mitem.text }}</a>
</li>
{% endfor %}
{% for module in page.collection() %}
{% if not module.header.hidemenu %}
{% set current_page = (module.active or module.activeChild) ? 'current' : '' %}
<li class="{{ current_module }}">
<a class="smoothscroll" href="#{{ _self.pageLinkName(module.menu) }}">{{ module.menu }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
</nav>