Merged dev

This commit is contained in:
Stephen Cox 2018-11-30 11:43:15 +00:00
commit e575823428
25 changed files with 102 additions and 67 deletions

View File

@ -4,6 +4,11 @@ variables:
JEKYLL_ENV: production
LC_ALL: C.UTF-8
cache:
key: gems
paths:
- /usr/local/bundle/
before_script:
- 'which rsync || ( apt-get update -qq && apt-get install rsync -yqq )'
- eval $(ssh-agent -s)
@ -24,16 +29,31 @@ test:
except:
- master
pages:
deploy:production:
stage: deploy
script:
- bundle exec jekyll build -d public
- rsync -aqz public/ cotech@webarch2.co.uk:sites/default/
- cd public ; git checkout dev ; cd -
artifacts:
paths:
- public
environment:
name: production
url: https://static.coops.tech
only:
- master
deploy:dev:
stage: deploy
script:
- bundle exec jekyll build -d public
- rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
artifacts:
paths:
- public
environment:
name: dev
url: https://dev.static.coops.tech
only:
- master
- dev

View File

@ -1,3 +1,6 @@
source 'https://rubygems.org'
gem 'jekyll'
# Fixes deprecation warning - see https://github.com/jekyll/jekyll-sass-converter/pull/75
gem 'jekyll-sass-converter', git: 'https://github.com/jekyll/jekyll-sass-converter.git', branch: 'sassc'

View File

@ -1,3 +1,11 @@
GIT
remote: https://github.com/jekyll/jekyll-sass-converter.git
revision: c4d4e3e5b1a2222bb94895f9a6ab7e0216236ab8
branch: sassc
specs:
jekyll-sass-converter (1.5.2)
sassc (~> 2.0)
GEM
remote: https://rubygems.org/
specs:
@ -27,8 +35,6 @@ GEM
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-watch (2.1.2)
listen (~> 3.0)
kramdown (1.17.0)
@ -41,23 +47,23 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (2.2.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.6.0)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.0.0)
ffi (~> 1.9.6)
rake
PLATFORMS
ruby
DEPENDENCIES
jekyll
jekyll-sass-converter!
BUNDLED WITH
1.17.1

View File

@ -4,7 +4,7 @@ name: Agile Collective
website: http://agile.coop/
email: info@agile.coop
twitter: AgileCollective
github:
github: agilecollective
telephone: 01865 403 120
address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE
latitude: 51.7483161
@ -56,5 +56,8 @@ technologies:
Agile Collective is a small team of designers and developers who make websites for socially positive organisations such as charities, NGOs, social enterprises and educational institutions. We take a highly creative and integrated approach to all of our projects which results in a transparent and empowering working environment for the whole project team including our client.
As a socially minded company ourselves, we make every effort to contribute to our communities, minimise our environmental impact and ensure sustainability in our work practices. We organise the monthly Oxford Drupal Users Group and a couple of us run the Code Club on a Wednesday afternoon which is aimed at inspiring young people to get into coding.
<<<<<<< HEAD
=======
>>>>>>> dev
There is also a company-wide obsession with cycling of various kinds.

View File

@ -7,8 +7,8 @@ twitter: alpha.coop
github: AlphaCo_op
telephone: +441912111938
address: 6 Charlotte Square,Newcastle upon Tyne,United Kingdom,NE1 4XF
latitude:
longitude:
latitude: 54.97101
longitude: -1.61974
clients:
services:
- animation
@ -41,5 +41,5 @@ Branding, media, print and video all working together.
We deliver on time and within budget.
KNOWING
After 30 years, we know what were doing
After 30 years, we know what were doing.
We help you engage with the people you need to reach.

View File

@ -3,7 +3,7 @@ title: Animorph
name: Animorph
website: https://animorph.coop
email: we@animorph.coop
twitter:
twitter: animorphcoop
github:
telephone:
address: Space4, 149 Fonthill Road,London,N4 3HF

View File

@ -4,7 +4,7 @@ name: Aptivate
website: http://aptivate.org/
email: outreach@aptivate.org
twitter: aptivateuk
github:
github: aptivate
telephone: +44 (0)1223 967838
address: 25 Signet Court, Swann's Road, Cambridge,United Kingdom,CB5 8LA
latitude: 52.21427610000001

View File

@ -3,7 +3,7 @@ title: Autonomic
name: Autonomic
website: https://autonomic.zone/
email: autonomic-coop@posteo.net
twitter: autonomic-coop%40posteo.html
twitter: autonomiccoop
github:
telephone:
address: 1539 Pershore Road,Stirchley,Birmingham,United Kingdom,B30 2JH

View File

@ -3,7 +3,7 @@ title: Cetis LLP
name: Cetis LLP
website: http://www.cetis.org.uk/
email: info@cetis.org.uk
twitter:
twitter: cetisllp
github:
telephone: 07366025747
address: Halton Mill,Mill Lane,Halton,Lancaster,England,LA2 6ND

View File

@ -3,7 +3,7 @@ title: Chapel Street Studio
name: Chapel Street Studio
website: http://chapelstreetstudio.coop/
email: info@chapelstreetstudio.coop
twitter:
twitter: chapelststudio
github:
telephone: 07743 426 846 (Martyn Johnston | Secretary)
address: Chapel Street Studio,Assembly Bradford, Market Pavilion, Rawson Place,Bradford,West Yorkshire,BD1 3QQ

View File

@ -2,10 +2,10 @@
title: Creative Coop
name: Creative Coop
website: https://creative.coop
email:
email: hello@creative.coop
twitter:
github:
telephone: 01274574147
telephone: 01206 574147
address: 2 Balkerne House, Balkerne Passage,Colchester,United Kingdom,CO1 1PA
latitude: 51.89010188809361
longitude: 0.8957915683888586

View File

@ -3,8 +3,8 @@ title: Outlandish
name: Outlandish
website: http://www.outlandish.com
email: hello@outlandish.com
twitter: outlandishideas
github: hello%40outlandish.html
twitter: outlandish
github: outlandishideas
telephone: +44 (0) 207 561 9968
address: 3rd Floor,149 Fonthill Road,Finsbury Park,London,United Kingdom,N4 3HF
latitude: 51.56372160000001
@ -19,6 +19,7 @@ clients:
- european-union
- gender-action-for-peace-and-security
- goethe-institut
- greenpeace
- hachette-uk
- hotwire-pr
- indie-training-fund

View File

@ -5,9 +5,9 @@
<div class="menu-centered">
<ul class="menu">
<li><a href="{{ site.github.url }}/about">About <span>&#xbb;</span></a></li>
<li><a href="{{ site.github.url }}/join">Join <span>&#xbb;</span></a></li>
<li><a href="{{ site.github.url }}/manifesto">Manifesto <span>&#xbb;</span></a></li>
<li><a href="/about">About <span>&#xbb;</span></a></li>
<li><a href="/join">Join <span>&#xbb;</span></a></li>
<li><a href="/manifesto">Manifesto <span>&#xbb;</span></a></li>
</ul>
</div>
@ -18,7 +18,7 @@
<div class="footer-lower">
<div class="row">
<div class="small-12 columns">
<img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/coop-logo.png" class="float-center" />
<img src="/app/themes/coop-tech-oowp-theme/public/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,5 +1,6 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
<meta charset="UTF-8">
<title>{{ page.title }} &laquo; Cooperative Technologists</title>
<meta property="og:type" content="website" />
@ -12,12 +13,12 @@
<meta name="twitter:site" content="@CotechUK" />
<meta name="twitter:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
<link rel="canonical" href="{{ page.url | absolute_url }}" />
<link rel='stylesheet' id='app-css' href='{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/css/app.css?ver=4.8' type='text/css' media='all' />
<script type='text/javascript' src='{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/js/vendor.js?ver=4.8'></script>
<link rel="icon" href="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-32x32.png" sizes="32x32" />
<link rel="icon" href="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-180x180.png" />
<meta name="msapplication-TileImage" content="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-270x270.png" />
<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" />
<style type="text/css" id="wp-custom-css">
section#contact div.row div p a:active,
section#contact div.row div p a:focus,
@ -26,8 +27,8 @@
color: white;
}
</style>
<link rel="stylesheet" href="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/foundation-icons/foundation-icons.css">
<link rel="icon" type="image/x-icon" href="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">
<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">
<script type="text/javascript">
window.mapboxAccessToken = '{{ site.mapbox_access_token }}';
</script>

View File

@ -3,11 +3,11 @@
<div class="top-bar sticky iss-stuck is-at-top" data-sticky data-margin-top=0>
<div class="top-bar-title">
<strong>
<a id="logo" href="{{ site.github.url }}/">
<img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
<a id="logo" href="/">
<img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
</a>
</strong>
<a class="back" href="{{ site.github.url }}/">&#8592; Go Back</a>
<a class="back" href="/">&#8592; Go Back</a>
</div>
</div>
</div>

View File

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

View File

@ -16,7 +16,7 @@
<div class="row">
<div class="small-12 small-centered columns">
<a href="{{ page.website }}" target="_blank">
<img src="{{ site.github.url }}/images/coops/{{ page.slug }}.png" alt="">
<img src="/images/coops/{{ page.slug }}.png" alt="">
</a>
<h2>{{ page.name }}</h2>
<a href="{{ page.website }}" target="_blank">{{ page.website }}</a>
@ -87,7 +87,7 @@
{% assign s = site.services | where: "slug", service | first %}
<div class="column">
<a href="{{ s.url | relative_url }}" class="service-thumb">
<div class="service-thumb-img float-center" style="background-image: url({{ site.github.url }}/images/services/{{ s.slug }}.png)"></div>
<div class="service-thumb-img float-center" style="background-image: url(/images/services/{{ s.slug }}.png)"></div>
<h5>{{ s.name }}</h5>
</a>
</div>
@ -107,7 +107,7 @@
{% assign t = site.technologies | where: "slug", technology | first %}
<div class="column">
<a href="{{ t.url | relative_url }}" class="technology-thumb">
<div class="technology-thumb-img float-center" style="background-image: url({{ site.github.url }}/images/technologies/{{ t.slug }}.png)"></div>
<div class="technology-thumb-img float-center" style="background-image: url(/images/technologies/{{ t.slug }}.png)"></div>
<h5>{{ t.name }}</h5>
</a>
</div>
@ -126,7 +126,7 @@
{% for client in page.clients %}
{% assign c = site.clients | where: "slug", client | first %}
<div class="column client-thumb-container">
<div class="client-thumb" style="background-image: url({{ site.github.url }}/images/clients/{{ c.slug }}.png)"></div>
<div class="client-thumb" style="background-image: url(/images/clients/{{ c.slug }}.png)"></div>
<h5 class="client-thumb-header">{{ c.title }}</h5>
</div>
{% endfor %}

View File

@ -11,8 +11,8 @@
<div class="top-bar sticky iss-stuck is-at-top" data-sticky data-margin-top=0>
<div class="top-bar-title">
<strong>
<a id="logo" href="{{ site.github.url }}/">
<img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
<a id="logo" href="/">
<img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
</a>
</strong>
<span data-responsive-toggle="responsive-menu" data-hide-for="medium">

View File

@ -15,7 +15,7 @@
<div id="page-banner">
<div class="row">
<div class="small-12 small-centered columns">
<img src="{{ site.github.url }}/images/services/{{ page.slug }}.png" alt="">
<img src="/images/services/{{ page.slug }}.png" alt="">
<h2>Coops that offer <span>{{ page.name }}</span></h2>
</div>
</div>
@ -40,7 +40,7 @@
{% if coop.services contains page.slug %}
<div class="column">
<a href="{{ coop.url | relative_url }}" class="coop-thumb">
<img src="{{ site.github.url }}/images/coops/{{ coop.slug }}.png" alt="">
<img src="/images/coops/{{ coop.slug }}.png" alt="">
</a>
</div>
{% endif %}

View File

@ -15,7 +15,7 @@
<div id="page-banner">
<div class="row">
<div class="small-12 small-centered columns">
<img src="{{ site.github.url }}/images/technologies/{{ page.slug }}.png" alt="">
<img src="/images/technologies/{{ page.slug }}.png" alt="">
<h2>Coops that use <span>{{ page.name }}</span></h2>
</div>
</div>
@ -40,7 +40,7 @@
{% if coop.technologies contains page.slug %}
<div class="column">
<a href="{{ coop.url | relative_url }}" class="coop-thumb">
<img src="{{ site.github.url }}/images/coops/{{ coop.slug }}.png" alt="">
<img src="/images/coops/{{ coop.slug }}.png" alt="">
</a>
</div>
{% endif %}

View File

@ -22,6 +22,6 @@ Read [our manifesto][manifesto], [contact us if you want to work with us][contac
[wiki]: https://wiki.coops.tech/
[mailing-list]: https://www.email-lists.org/mailman/listinfo/tech-coops
[wortley-hall]: https://www.wortleyhall.org.uk/
[manifesto]: {{ site.github.url }}/manifesto
[contact]: {{ site.github.url }}/#contact
[join]: {{ site.github.url }}/join
[manifesto]: /manifesto
[contact]: /#contact
[join]: /join

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -8,22 +8,22 @@ layout: home
<div class="small-12 medium-10 large-8 small-centered columns">
<div class="small-3 columns">
<img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-coops.png" class="float-center">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-coops.png" class="float-center">
<h6>Co-ops</h6>
<h5>{{ site.coops.size }}</h5>
</div>
<div class="small-3 columns">
<img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-staff.png" class="float-center">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-staff.png" class="float-center">
<h6>Staff</h6>
<h5>159+</h5>
<h5>253+</h5>
</div>
<div class="small-3 columns">
<img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-revenue.png" class="float-center">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-revenue.png" class="float-center">
<h6>Revenue</h6>
<h5>£5.7m</h5>
<h5>£10.3m</h5>
</div>
<div class="small-3 columns">
<img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-clients.png" class="float-center">
<img src="/app/themes/coop-tech-oowp-theme/public/img/icon-clients.png" class="float-center">
<h6>Clients</h6>
<h5>{{ site.clients.size }}+</h5>
</div>
@ -55,7 +55,7 @@ layout: home
{% for coop in site.coops %}
<div class="column">
<a class="coop-thumb" href="{{ coop.url | relative_url }}">
<div class="coop-thumb-img has-tip tip-bottom radius" style="background-image: url({{ site.github.url }}/images/coops/{{ coop.slug }}.png)" data-tooltip aria-haspopup="true" title="{{ coop.name }}"></div>
<div class="coop-thumb-img has-tip tip-bottom radius" style="background-image: url(/images/coops/{{ coop.slug }}.png)" data-tooltip aria-haspopup="true" title="{{ coop.name }}"></div>
</a>
</div>
{% endfor %}
@ -99,9 +99,10 @@ layout: home
<h2>Clients</h2>
<p>Here are some of the amazing clients we have worked with so far</p>
<div class="row small-up-2 medium-up-3 large-up-6">
{% for client in site.clients %}
{% assign clients = site.clients | sample:6 %}
{% for client in clients %}
<div class="column">
<div class="client-thumb" style="background-image: url({{ site.github.url }}/images/clients/{{ client.slug }}.png)"></div>
<div class="client-thumb" style="background-image: url(/images/clients/{{ client.slug }}.png)"></div>
</div>
{% endfor %}
</div>
@ -120,7 +121,7 @@ layout: home
{% for service in site.services %}
<div class="column">
<a href="{{ service.url | relative_url }}" class="service-thumb">
<div class="service-thumb-img float-center" style="background-image: url({{ site.github.url }}/images/services/{{ service.slug }}.png)"></div>
<div class="service-thumb-img float-center" style="background-image: url(/images/services/{{ service.slug }}.png)"></div>
<h5>{{ service.name }}</h5>
</a>
</div>
@ -140,7 +141,7 @@ layout: home
{% for technology in site.technologies %}
<div class="column">
<a href="{{ technology.url | relative_url }}" class="technology-thumb">
<div class="technology-thumb-img" style="background-image: url({{ site.github.url }}/images/technologies/{{ technology.slug }}.png)"></div>
<div class="technology-thumb-img" style="background-image: url(/images/technologies/{{ technology.slug }}.png)"></div>
<h5>{{ technology.name }}</h5>
</a>
</div>

View File

@ -45,5 +45,5 @@ We're still working our exactly what this entails but in essence you will provid
If you'd like to find out more and help shape this official supporter role then please get in touch. You can also read more about us and check out our manifesto. You can also read more [about us][about] and check out our [manifesto][].
[about]: {{ site.github.url }}/about
[manifesto]: {{ site.github.url }}/manifesto
[about]: /about
[manifesto]: /manifesto

View File

@ -16,5 +16,5 @@ We call upon consumers of digital products -- including trades unions, charities
We hereby give notice to technology companies that do not treat their employees fairly, do not give their workers control of their businesses and do not seek to create a fairer world that your days are numbered. We are more creative, more committed and more resilient. [Join us][join].
[Co-operative Technologists]: {{ site.github.url }}/about
[join]: {{ site.github.url }}/join
[Co-operative Technologists]: /about
[join]: /join