Compare commits

...

5 commits

Author SHA1 Message Date
Halfdan abc7c564f7 Merge branch 'smaller-margins' into new
All checks were successful
continuous-integration/drone/push Build is passing
We just have smaller margins and nice looking layout in mobile view :)
2022-12-13 20:25:00 +01:00
Halfdan 7b4e3ac695 Highlighting of current page stopped working, something with new URLS, this fix fixes it, but I don't know if it is the correct way to accomplish it. 2022-12-13 20:24:39 +01:00
Halfdan 000a7bea1e Adjusting margins and layout of mobile view + fixing tabs/spaces in CSS file 2022-12-13 20:23:10 +01:00
Halfdan 96960993fc Merge branch 'new' of git.data.coop:data.coop/website into smaller-margins 2022-12-13 19:35:28 +01:00
Halfdan 26015a40f4 Smaller header and margins in mobile view 2022-12-13 19:34:19 +01:00
2 changed files with 55 additions and 51 deletions

View file

@ -1,36 +1,36 @@
/* latin */ /* latin */
@font-face { @font-face {
font-family: 'Space Grotesk'; font-family: 'Space Grotesk';
font-style: normal; font-style: normal;
font-display: swap; font-display: swap;
src: local('Space Grotesk Regular'), local('SpaceGrotesk-Regular'), url(/static/fonts/spacegrotesk/webfont/SpaceGrotesk-Regular.woff2) format('woff2'); src: local('Space Grotesk Regular'), local('SpaceGrotesk-Regular'), url(/static/fonts/spacegrotesk/webfont/SpaceGrotesk-Regular.woff2) format('woff2');
} }
/* latin */ /* latin */
@font-face { @font-face {
font-family: 'Space Grotesk'; font-family: 'Space Grotesk';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
font-display: swap; font-display: swap;
src: local('Space Grotesk Bold'), local('SpaceGrotesk-Bold'), url(/static/fonts/spacegrotesk/webfont/SpaceGrotesk-Bold.woff2) format('woff2'); src: local('Space Grotesk Bold'), local('SpaceGrotesk-Bold'), url(/static/fonts/spacegrotesk/webfont/SpaceGrotesk-Bold.woff2) format('woff2');
} }
/* latin */ /* latin */
@font-face { @font-face {
font-family: 'Space Mono'; font-family: 'Space Mono';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-display: swap; font-display: swap;
src: local('Space Mono'), local('SpaceMono-Regular'), url(/static/fonts/spacemono/spacemono-regular.woff2) format('woff2'); src: local('Space Mono'), local('SpaceMono-Regular'), url(/static/fonts/spacemono/spacemono-regular.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
} }
/* latin */ /* latin */
@font-face { @font-face {
font-family: 'Space Mono'; font-family: 'Space Mono';
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
font-display: swap; font-display: swap;
src: local('Space Mono Bold'), local('SpaceMono-Bold'), url(/static/fonts/spacemono/spacemono-bold.woff2) format('woff2'); src: local('Space Mono Bold'), local('SpaceMono-Bold'), url(/static/fonts/spacemono/spacemono-bold.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
} }
@ -52,7 +52,7 @@
--alt-bg-color : #a8f3f4; --alt-bg-color : #a8f3f4;
--bar-color : #f0dcac; --bar-color : #f0dcac;
--burger_size : 56px; --burger_size : 45px;
} }
body { body {
@ -185,24 +185,23 @@ aside nav footer ol li a {
} }
aside header a img { aside header a img {
display : block;
width : 100%; width : 100%;
height : 140px; height : 140px;
} }
dl.dl-services { dl.dl-services {
display : grid;
display: grid; column-gap : 2rem;
column-gap: 2rem; dt {
dt { grid-column-start : 1;
grid-column-start: 1; grid-column-end : 2;
grid-column-end: 2; font-weight : bold;
font-weight: bold; }
} dd {
dd { grid-column-start : 2;
grid-column-start: 2; grid-column-end : 3;
grid-column-end: 3; }
}
} }
@media(max-width:1000px) { @media(max-width:1000px) {
@ -226,14 +225,13 @@ dl.dl-services {
aside header { aside header {
display : flex; display : flex;
flex-direction : row;
justify-content : space-between; justify-content : space-between;
align-items : center; align-items : center;
margin : var(--base-grid); margin : var(--base-grid) calc(var(--base-grid) / 2);
} }
aside header a img { aside header a img {
height : 120px; height : 80px;
} }
aside nav { aside nav {
@ -257,24 +255,24 @@ dl.dl-services {
} }
header .nav-toggle { header .nav-toggle {
cursor : pointer; cursor : pointer;
display : block; display : block;
height : var(--burger_size); height : var(--burger_size);
float : right; margin-top : 10px;
} }
header .nav-toggle span { header .nav-toggle span {
display : block; display : block;
height : calc( ( var(--burger_size) / 4 ) / 2 ); height : calc( ( var(--burger_size) / 4 ) / 2 );
width : var(--burger_size); width : var(--burger_size);
background : var(--text-color); background : var(--text-color);
margin-bottom : calc( ( var(--burger_size) / 3 ) / 2 ); margin-bottom : calc( ( var(--burger_size) / 3 ) / 2 );
} }
header .nav-toggle span { header .nav-toggle span {
position : relative; position : relative;
top : 0; top : 0;
transition : all 0.3s; transition : all 0.3s;
} }
header .nav-toggle.display span#nav-toggle-b { header .nav-toggle.display span#nav-toggle-b {
@ -291,5 +289,9 @@ dl.dl-services {
transform : rotate(-45deg); transform : rotate(-45deg);
top : calc( ( var(--burger_size) / 3 ) * -1 ); top : calc( ( var(--burger_size) / 3 ) * -1 );
} }
main article {
margin : calc(var(--base-grid) / 2);
}
} }

View file

@ -2,7 +2,9 @@
<ol> <ol>
{{ $currentPage := . }} {{ $currentPage := . }}
{{ range .Site.Menus.nav }} {{ range .Site.Menus.nav }}
<li><a href="{{ .URL }}"{{ if (eq $currentPage.URL .URL) }} class="active"{{ end }}>{{ .Name }}</a></li> {{ $atURL := absURL $currentPage.URL }}
{{ $compURL := absURL .URL }}
<li><a href="{{ .URL }}"{{ if (eq $atURL $compURL) }} class="active"{{ end }}>{{ .Name }}</a></li>
{{ end }} {{ end }}
</ol> </ol>