Merge branch 'master' of git.coop:cotech/website

This commit is contained in:
harry 2019-04-25 16:48:19 +01:00
commit efeccb222f
34 changed files with 29 additions and 28 deletions

View File

@ -18,7 +18,7 @@
<div class="footer-lower">
<div class="row">
<div class="small-12 columns">
<img src="/app/themes/coop-tech-oowp-theme/public/img/coop-logo.png" class="float-center" />
<img src="/assets/img/coop-logo.png" class="float-center" />
<p>Site developed by <a href="http://glowboxdesign.co.uk/" target="_blank">Glowbox Design</a> &amp; <a href="http://outlandish.com" target="_blank">Outlandish</a>.</p>
<p>Source code available on <a href="https://git.coop/cotech/website" target="_blank">git.coop</a>.</p>
<p>Hosted by <a href="https://www.webarchitects.coop/" target="_blank">Webarchitects</a> for CoTech &#xa9;2018</p>

View File

@ -1,8 +1,8 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
{% if page.excerpt %}
{% if page.excerpt and page.excerpt != "" %}
<meta name="description" content="{{ page.excerpt | strip_html }}" />
{% elsif page.content %}
{% elsif page.collection == 'coops' %}
<meta name="description" content="{{ page.content | strip_html | strip_newlines | condense_spaces | truncate:150 }}" />
{% else %}
<meta name="description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
@ -26,19 +26,19 @@
{% elsif page.collection == 'clients' %}
<meta property="og:image" content="/images/clients/{{ page.slug }}" />
{% else %}
<meta property="og:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
<meta property="og:image" content="/assets/img/Cotech_512x512.png" />
{% endif %}
<meta property="og:locale" content="en_GB" />
<meta name="twitter:card" content="summary" />
<meta name="twitter:site" content="@CotechUK" />
<meta name="twitter:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
<meta name="twitter:image" content="/assets/img/Cotech_512x512.png" />
<link rel="canonical" href="{{ page.url | absolute_url }}" />
<link rel='stylesheet' id='app-css' href='/app/themes/coop-tech-oowp-theme/public/css/app.css?ver=4.8' type='text/css' media='all' />
<script type='text/javascript' src='/app/themes/coop-tech-oowp-theme/public/js/vendor.js?ver=4.8'></script>
<link rel="icon" href="/app/uploads/2017/02/cropped-cotech_512x512-32x32.png" sizes="32x32" />
<link rel="icon" href="/app/uploads/2017/02/cropped-cotech_512x512-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="/app/uploads/2017/02/cropped-cotech_512x512-180x180.png" />
<meta name="msapplication-TileImage" content="/app/uploads/2017/02/cropped-cotech_512x512-270x270.png" />
<link rel='stylesheet' id='app-css' href='/assets/css/app.css?ver=4.8' type='text/css' media='all' />
<script type='text/javascript' src='/assets/js/vendor.js?ver=4.8'></script>
<link rel="icon" href="/assets/img/cropped-cotech_512x512-32x32.png" sizes="32x32" />
<link rel="icon" href="/assets/img/cropped-cotech_512x512-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="/assets/img/cropped-cotech_512x512-180x180.png" />
<meta name="msapplication-TileImage" content="/assets/img/cropped-cotech_512x512-270x270.png" />
<style type="text/css" id="wp-custom-css">
section#contact div.row div p a:active,
section#contact div.row div p a:focus,
@ -47,8 +47,8 @@
color: white;
}
</style>
<link rel="stylesheet" href="/app/themes/coop-tech-oowp-theme/public/foundation-icons/foundation-icons.css">
<link rel="icon" type="image/x-icon" href="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">
<link rel="stylesheet" href="/assets/foundation-icons/foundation-icons.css">
<link rel="icon" type="image/x-icon" href="/assets/img/CoTech-logo.png">
<script type="text/javascript">
window.mapboxAccessToken = '{{ site.mapbox_access_token }}';
</script>

View File

@ -4,7 +4,7 @@
<div class="top-bar-title">
<strong>
<a id="logo" href="/">
<img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
<img src="/assets/img/CoTech-logo.png">CoTech
</a>
</strong>
<a class="back" href="/">&#8592; Go Back</a>

View File

@ -1 +1 @@
<script type='text/javascript' src='/app/themes/coop-tech-oowp-theme/public/js/app.js?ver=4.8'></script>
<script type='text/javascript' src='/assets/js/app.js?ver=4.8'></script>

View File

@ -12,7 +12,7 @@
<div class="top-bar-title">
<strong>
<a id="logo" href="/">
<img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
<img src="/assets/img/CoTech-logo.png">CoTech
</a>
</strong>
<span data-responsive-toggle="responsive-menu" data-hide-for="medium">

View File

@ -13,8 +13,8 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url("../fonts/fontawesome-webfont.eot?v=4.7.0");
src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg");
src: url("/assets/fonts/fontawesome-webfont.eot?v=4.7.0");
src: url("/assets/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("/assets/fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("/assets/fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"), url("/assets/fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("/assets/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg");
font-weight: normal;
font-style: normal; }
@ -27,7 +27,7 @@
-moz-osx-font-smoothing: grayscale; }
/* makes the font 33% larger relative to the icon container */
.fa-lg {
.fa-lg {f
font-size: 1.33333em;
line-height: 0.75em;
vertical-align: -15%; }
@ -6464,15 +6464,15 @@ table.hover tbody tr:nth-of-type(even):hover {
/* ---------------------------------------- Typography ---------------------------------------- */
@font-face {
font-family: 'open_sansregular';
src: url("../fonts/OpenSans-Regular-webfont.eot");
src: url("../fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Regular-webfont.woff") format("woff"), url("../fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Regular-webfont.svg#open_sansregular") format("svg");
src: url("/assets/fonts/OpenSans-Regular-webfont.eot");
src: url("/assets/fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("/assets/fonts/OpenSans-Regular-webfont.woff") format("woff"), url("/assets/fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("/assets/fonts/OpenSans-Regular-webfont.svg#open_sansregular") format("svg");
font-weight: normal;
font-style: normal; }
@font-face {
font-family: 'open_sansbold';
src: url("../fonts/OpenSans-Bold-webfont.eot");
src: url("../fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Bold-webfont.woff") format("woff"), url("../fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Bold-webfont.svg#open_sansbold") format("svg");
src: url("/assets/fonts/OpenSans-Bold-webfont.eot");
src: url("/assets/fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("/assets/fonts/OpenSans-Bold-webfont.woff") format("woff"), url("/assets/fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("/assets/fonts/OpenSans-Bold-webfont.svg#open_sansbold") format("svg");
font-weight: normal;
font-style: normal; }
@ -6554,7 +6554,7 @@ a:focus {
#banner {
padding: 8rem 0;
text-align: center;
background-image: url(../img/banner-collage.jpg);
background-image: url(/assets/img/banner-collage.jpg);
background-position: center center;
background-repeat: no-repeat;
background-size: cover; }

1
assets/css/app.css.map Normal file

File diff suppressed because one or more lines are too long

View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 618 B

After

Width:  |  Height:  |  Size: 618 B

View File

Before

Width:  |  Height:  |  Size: 915 B

After

Width:  |  Height:  |  Size: 915 B

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

Before

Width:  |  Height:  |  Size: 327 KiB

After

Width:  |  Height:  |  Size: 327 KiB

View File

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

View File

Before

Width:  |  Height:  |  Size: 980 B

After

Width:  |  Height:  |  Size: 980 B

View File

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -8,12 +8,12 @@ layout: home
<div class="small-12 medium-10 large-8 small-centered columns">
<div class="small-3 columns">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-coops.png" class="float-center">
<img src="/assets/img/icon-coops.png" class="float-center">
<h6>Co-ops</h6>
<h5>{{ site.coops.size }}</h5>
</div>
<div class="small-3 columns">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-staff.png" class="float-center">
<img src="/assets/img/icon-staff.png" class="float-center">
<h6>Staff</h6>
{% assign total_members = 0 %}
{% for coop in site.coops %}
@ -22,12 +22,12 @@ layout: home
<h5>{{ total_members }}+</h5>
</div>
<div class="small-3 columns">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-revenue.png" class="float-center">
<img src="/assets/img/icon-revenue.png" class="float-center">
<h6>Revenue</h6>
<h5>£10.3m</h5>
</div>
<div class="small-3 columns">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-clients.png" class="float-center">
<img src="/assets/img/icon-clients.png" class="float-center">
<h6>Clients</h6>
<h5>{{ site.clients.size }}+</h5>
</div>