Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/open-innovations/lcc-cultur…
Browse files Browse the repository at this point in the history 
…e-dashboard
  • Loading branch information
@taz-chiles
taz-chiles committed Nov 28, 2024
2 parents 8ffab04 + 3842ddf commit 453521b
Show file tree
Hide file tree
Showing 14 changed files with 293 additions and 193 deletions.
2 changes: 1 addition & 1 deletion _config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import postcss from "lume/plugins/postcss.ts";


// Importing the OI Lume charts and utilities
import oiViz from "https://deno.land/x/oi_lume_viz@v0.15.11/mod.ts";
import oiViz from "https://deno.land/x/oi_lume_viz@v0.16.6/mod.ts";
import autoDependency from "https://deno.land/x/[email protected]/processors/auto-dependency.ts";
import csvLoader from "https://deno.land/x/[email protected]/loaders/csv-loader.ts";
import jsonLoader from "lume/core/loaders/json.ts";
Expand Down
171 changes: 3 additions & 168 deletions src/_includes/css/oi.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ p, iframe, h2, h3, figure, ul, ol, .padded-bottom { margin-bottom: 1em; }
button, .button { border: 0px; font-size: 1em; background-color: #efefef; color: black; text-decoration: none!important; display: inline-block; padding: 3em 1em; cursor: pointer; vertical-align: top; line-height: 1.25em; }
a:hover, a:focus { text-decoration: underline; }
a:visited { color: inherit; }
a { color: inherit; text-decoration: inherit;}
a { color: inherit; text-decoration: inherit; }
footer { width: 100%; padding-bottom: 3em; }
code,pre { font-family: monospace; color: #444; background-color: #efefef; }
code { padding: 0.125em 0.25em; }
Expand Down Expand Up @@ -82,9 +82,6 @@ a.button:hover, button:hover, button:focus, a.button:focus { background-color: #
.tallpadded { padding-top: 2em; padding-bottom: 2em; }
section { padding: 2em 0; }

.block { padding:2em; border-style: solid; margin-top: 2em; margin-bottom: 2em; border-width: 1px 1px; border-color: #bbbb}

.block p { padding: 1em; }
.skip-to-content-link { position: absolute; top: -3rem; right: 0.5rem; z-index: 2000; transition: top 0.2s; padding: 0.5rem 1rem; }
.skip-to-content-link:focus { top: 0.25rem; }

Expand All @@ -109,33 +106,6 @@ header nav ul {
}
header nav ul li { display: inline-block; }
header nav ul > li > a { padding: 1em 1em; display: inline-block; width: 100%; color: inherit; }
.header-holder { max-width: 1300px; position: relative; margin: auto;}

.about { padding: 2em; margin-bottom: 1em; border-style: solid; border-width: 1px; border-color: #bbbb;}

.summary { padding-top: 2em; text-align:center; }

.text { padding: 1em; text-align:center; font-weight: 400; font-size: 1.1em;}

.read-more { margin-top: 1em; padding-bottom: 0.5em; }
.read-more a {
font-weight: 600;
color: #0a2f45;
text-decoration: underline;
text-underline-offset: 3px;
text-decoration-color: #91cfce;
text-decoration-thickness: 2px;
border-style: solid;
border-width: 1px 1px 1px;
border-color: #bbbb;
padding: 1em;
transition: color 0.15s linear, background-color 0.15s linear;

&:hover {
color: white;
background: #002331;
}
}

/* Dashboard */
.pane {
Expand All @@ -152,12 +122,7 @@ header nav ul > li > a { padding: 1em 1em; display: inline-block; width: 100%; c
border-color: #7eb4b3;
transition: color 0.15s linear, background-color 0.15s linear;

&:hover {
color: white;
fill: white;
background: #002331;
}
}
}

.grid .pane h2 {
text-decoration: none;
Expand Down Expand Up @@ -198,146 +163,16 @@ ul.grid > li > a > h2 {
&:hover {
color: white;
text-decoration-color: #91cfce;
}
}
}

.text-panel {
padding: 5em;
background: #91cfce;
color: #0a2f45;
border-right: solid;
border-width: 1px 1px;
border-color: #7eb4b3;
transition: color 0.15s linear, background-color 0.15s linear;

&:hover {
color: white;
background: #002331;
}
}


.impact-link:hover {
text-decoration: underline;
text-underline-offset: 6px;
text-decoration-color: #91cfce;
text-decoration-thickness: 3px;
}

.legend { margin-bottom: 1em; text-align: center; }
.legend .legend-item { display: inline-block; line-height: 1em; margin-right: 1em; cursor: pointer; }
.legend .legend-item svg { float: left; }

.oi-legend-inner .oi-legend-item { background: inherit!important; outline: none; }
.oi-legend-inner .oi-legend-item.oi-series-on { background: inherit!important; outline: none!important; }

.big-number {
font-size: 3.5em;
line-height: 1.25em;
font-weight: bold;
text-align: center;
display: block;
margin-top: 0;
color: inherit;
transition: color 0.3s linear, background-color 0.3s linear;
}

.dashboard-figure {
height: 100%;
display: flex;
flex-direction: column;
}

.figure-link {
color: inherit;
text-decoration: none;
}

.footnote { font-size: 1.1em;
text-align: center;
color: inherit;
padding-top: 2em;
font-weight: 400;
}
.note { text-align: center; color: inherit; font-weight: 400; padding-bottom: 1em; }

/* Header */

.site-header {
background: #0a2f45;
left: 0;
right: 0;
top: 0;
z-index: 1002;
}

.site-header-content {
align-items: center;
padding-top: 1.55em;
padding-bottom: 1.55em;
gap: 1em;
width: 90%;
max-width: 1600px;
}
.header-grid { display: grid; grid-template-columns: repeat(2,1fr); grid-gap: 0.5em; list-style: none;}
header a { font-size: 0.9em;}
.header-logo { float:left; margin: 0; }



/* Footer */

.grid-list { display: grid; grid-template-columns: repeat(4,1fr); grid-gap: 0.5em; list-style: none; margin: 0; margin-bottom: 2em; }
.grid-list > li > a { padding: 1em; background: #dfdfdf; text-decoration: none; display: block; text-align: center; height: 100%; }


.elsewhere { float: left; margin-top: 1em; margin-bottom: 0;}
.elsewhere li { display: block; margin-left: 0em; }
.elsewhere li:first-child { margin-left: 0; }
.elsewhere li a { display: block; }
.elsewhere.grid { display: flex; gap: 0em; flex-direction: column; list-style: none; }
.elsewhere.grid li a { display: flex; gap: 0.5em; align-items: center;}
.elsewhere.grid * { margin:0; }

.footer { margin-bottom: 0;}
.footer-links { display: grid; list-style: none; float: left; margin-left: 0; grid-gap: 1em;}
.footer-links li a { font-size: 1.1em; text-decoration: underline; }
.footer li h3 {
font-size: 1.2em;
text-decoration: underline;
color: #ffffff;
text-decoration: underline;
text-underline-offset: 10px;
text-decoration-color: #91cfce;
text-decoration-thickness: 3px;
text-align: left;
}

ul.footer-logos { display: block; list-style: none; margin-left: 0;}

.oi-credit { font-weight: 800px; font-size: 1.1em; padding:0;}

footer .address { margin-top: 1em; }
footer a { color: inherit; }
footer hr.about { margin: 32px 0; border: 0; border-top:1px solid #444; }

.footer.grid-list { grid-template-columns: 100%; }


@media only screen and (max-width: 1080px) {
.grid { grid-template-columns: 100%; }
.grid-list { grid-template-columns: repeat(2,1fr); grid-gap: 0.25em; }
}

@media only screen and (min-width: 800px) {
.footer-links {
display:grid;
grid-template-columns: 1fr 1fr;
}
.footer.grid-list {
grid-template-columns: 1fr 2fr 1fr;
}
}

@media only screen and (max-width: 800px) {
ul.grid.dashboard {
Expand Down
8 changes: 4 additions & 4 deletions src/_includes/partials/footer.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<li>
<h3>Contact us</h3>
<ul class="grid elsewhere">
<li class="facebook"><a href="https://www.facebook.com/Leedscouncil/"><svg width="48" height="48" viewBox="83 -108.9 64 64" aria-labelledby="icon-facebook"><title id="icon-facebook">Facebook</title><rect style="opacity:0;fill:#eeeeee;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" width="40" height="40" x="83" y="-108.9" /><path d="m 109.91,-52.9 0,-21.894 -7.37,0 0,-8.533 7.37,0 0,-6.297 c 0,-7.305 4.45,-11.276 10.97,-11.276 3.12,0 5.81,0.24 6.58,0.33 l 0,7.634 -4.52,0 c -3.53,0 -4.23,1.689 -4.23,4.145 l 0,5.442 8.44,0 -1.1,8.533 -7.34,0 0,21.894 -8.8,0.02 z" fill="#ffffff" /></svg>
<li><a href="https://www.facebook.com/Leedscouncil/"><svg width="48" height="48" viewBox="83 -108.9 64 64" aria-labelledby="icon-facebook"><title id="icon-facebook">Facebook</title><rect style="opacity:0;fill:#eeeeee;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" width="40" height="40" x="83" y="-108.9" /><path d="m 109.91,-52.9 0,-21.894 -7.37,0 0,-8.533 7.37,0 0,-6.297 c 0,-7.305 4.45,-11.276 10.97,-11.276 3.12,0 5.81,0.24 6.58,0.33 l 0,7.634 -4.52,0 c -3.53,0 -4.23,1.689 -4.23,4.145 l 0,5.442 8.44,0 -1.1,8.533 -7.34,0 0,21.894 -8.8,0.02 z" fill="#ffffff" /></svg>
<p>Facebook<p></a></li>
<li class="twitter"><a href="https://twitter.com/LeedsCC_help"><svg width="48" height="48" viewBox="83 -108.9 64 64" aria-labelledby="icon-twitter"><title id="icon-twitter">Twitter</title><g transform="matrix(0.16107,0,0,0.16107,3.9922,-188.2)" fill="#ff0000"><path d="m 633.9,812.04 c 112.46,0 173.96,-93.17 173.96,-173.96 0,-2.65 -0.1,-5.28 -0.17,-7.9 11.94,-8.63 22.31,-19.4 30.5,-31.66 -10.96,4.87 -22.75,8.14 -35.12,9.62 12.63,-7.57 22.32,-19.54 26.89,-33.81 -11.81,7 -24.89,12.09 -38.82,14.84 -11.16,-11.89 -27.04,-19.32 -44.63,-19.32 -33.77,0 -61.15,27.38 -61.15,61.13 0,4.8 0.54,9.47 1.59,13.94 -50.82,-2.55 -95.88,-26.88 -126.03,-63.88 -5.25,9.04 -8.28,19.53 -8.28,30.73 0,21.21 10.79,39.94 27.21,50.9 -10.03,-0.31 -19.46,-3.07 -27.69,-7.65 0,0.26 0,0.51 0,0.78 0,29.61 21.07,54.33 49.05,59.93 -5.14,1.4 -10.54,2.16 -16.12,2.16 -3.94,0 -7.77,-0.39 -11.49,-1.11 7.78,24.3 30.35,41.97 57.11,42.47 -20.92,16.4 -47.28,26.17 -75.93,26.17 -4.93,0 -9.8,-0.28 -14.59,-0.85 27.06,17.35 59.19,27.47 93.72,27.47" fill="#ffffff" /></g></svg>
<p>Twitter</p></a></li>
<li><a href="https://twitter.com/LeedsCC_help"><svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" aria-label="X" role="img" viewBox="0 0 512 512"><path fill="currentColor" d="M281.7 234.3 382.2 120h-23.8l-87.3 99.2-69.7-99.2H121l105.4 150L121 389.9h23.8L237 285.1l73.6 104.8H391ZM153.4 137.5H190l168.4 235.6h-36.6Z"/></svg>
<p>X/Twitter</p></a></li>
</ul>
</li>
<li>
Expand All @@ -30,7 +30,7 @@
</li>
<li><p>Funded by:</p></li>
<li>
<a href="/"><img src="/assets/images/wyca-logo-white-transparent.png" width='300'></a>
<a href="/"><img src="/assets/images/West_Yorkshire_CA_logo.svg" width='300'></a>
</li>
</ul>
</li>
Expand Down
Loading

0 comments on commit 453521b

Please sign in to comment.