mirror of
https://git.coop/cotech/website.git
synced 2025-06-26 16:40:52 +00:00
Compare commits
25 Commits
use-discou
...
fix_word_b
| Author | SHA1 | Date | |
|---|---|---|---|
| b9f90e86fd | |||
| cd42677707 | |||
| 6f2865d878 | |||
| 3c95fc49a3 | |||
| c04cc7ef89 | |||
| 39b502ec03 | |||
| f2963f4f36 | |||
| dfec311aca | |||
| 545f63258f | |||
| a5f8595aaa | |||
| fd77a75d44 | |||
| 21aa40fdc9 | |||
| 965c0c302c | |||
| bf696ef474 | |||
| 82c8a58624 | |||
| a3cc37053b | |||
| 45bc568a05 | |||
| 89fca589e0 | |||
| 6377580e94 | |||
| ddb3df7127 | |||
| 3f0f4dca05 | |||
| 7a532078f1 | |||
| 50e157f2c0 | |||
| 6f209445fc | |||
| 70cb438b36 |
28
Gemfile.lock
28
Gemfile.lock
@ -1,21 +1,21 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.5.2)
|
||||
addressable (2.6.0)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
colorator (1.1.0)
|
||||
concurrent-ruby (1.1.1)
|
||||
concurrent-ruby (1.1.5)
|
||||
em-websocket (0.5.1)
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
eventmachine (1.2.7)
|
||||
ffi (1.9.25)
|
||||
ffi (1.10.0)
|
||||
forwardable-extended (2.6.0)
|
||||
geocoder (1.5.0)
|
||||
geocoder (1.5.1)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (3.7.4)
|
||||
jekyll (3.8.5)
|
||||
addressable (~> 2.4)
|
||||
colorator (~> 1.0)
|
||||
em-websocket (~> 0.5)
|
||||
@ -30,10 +30,10 @@ GEM
|
||||
safe_yaml (~> 1.0)
|
||||
jekyll-sass-converter (1.5.2)
|
||||
sass (~> 3.4)
|
||||
jekyll-watch (2.1.2)
|
||||
jekyll-watch (2.2.1)
|
||||
listen (~> 3.0)
|
||||
kramdown (1.17.0)
|
||||
liquid (4.0.0)
|
||||
liquid (4.0.3)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
@ -41,14 +41,14 @@ GEM
|
||||
mercenary (0.3.6)
|
||||
pathutil (0.16.2)
|
||||
forwardable-extended (~> 2.6)
|
||||
public_suffix (2.0.5)
|
||||
public_suffix (3.0.3)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
rouge (2.2.1)
|
||||
rb-inotify (0.10.0)
|
||||
ffi (~> 1.0)
|
||||
rouge (3.3.0)
|
||||
ruby_dep (1.5.0)
|
||||
safe_yaml (1.0.4)
|
||||
sass (3.7.2)
|
||||
safe_yaml (1.0.5)
|
||||
sass (3.7.4)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
@ -62,4 +62,4 @@ DEPENDENCIES
|
||||
jekyll
|
||||
|
||||
BUNDLED WITH
|
||||
1.17.1
|
||||
1.17.3
|
||||
|
||||
16
README.md
16
README.md
@ -65,11 +65,21 @@ And visit [localhost:4000](http://localhost:4000) to view the site.
|
||||
|
||||
## Deployment
|
||||
|
||||
### Dev/Staging
|
||||
|
||||
When changes are committed to the `master` branch the `.gitlab-ci.yml` file triggers the building of the site and then the copying of the results to [dev.coops.tech](https://dev.coops.tech).
|
||||
|
||||
Once someone has verified that looks ok, you can use the
|
||||
[GitLab environments](https://git.coop/cotech/website/environments)
|
||||
to promote it to [www.coops.tech](https://www.coops.tech)
|
||||
### Production
|
||||
|
||||
You need to manually deploy the changes from dev to production.
|
||||
|
||||
1. View the changes on [dev.coops.tech](https://dev.coops.tech) and ensure you're happy for them to be pushed to production.
|
||||
|
||||
2. Visit [GitLab environments](https://git.coop/cotech/website/environments). __NOTE.__ If you don't have access to the environments page then post a message in the [Website category of the CoTech forum](https://community.coops.tech/c/cotech/website) to ask someone to do it for you.
|
||||
|
||||
3. Click the "Play" icon on the right of the screen in the row for the "dev" environment and choose "deploy:production".
|
||||
|
||||
4. Your changes will be visible in production when the commit listed in the "production" environment row matches the commit listed in the "dev" environment row.
|
||||
|
||||
## Contributing
|
||||
|
||||
|
||||
@ -52,10 +52,10 @@ technologies:
|
||||
- centos
|
||||
- express-js
|
||||
- gitlab
|
||||
- google-maps
|
||||
- htmlcss
|
||||
- java
|
||||
- javascript
|
||||
- laravel
|
||||
- mysql
|
||||
- nginx
|
||||
- node-js
|
||||
|
||||
@ -70,6 +70,7 @@ technologies:
|
||||
- aws-redshift
|
||||
- symfony
|
||||
- wordpress
|
||||
- laravel
|
||||
---
|
||||
|
||||
Outlandish is made up of around 20 collaborators and co-owners who love quality code, and apps that challenge the status quo.
|
||||
|
||||
@ -1,13 +1,33 @@
|
||||
<head>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
{% if page.excerpt %}
|
||||
<meta name="description" content="{{ page.excerpt | strip_html }}" />
|
||||
{% elsif page.content %}
|
||||
<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." />
|
||||
{% endif %}
|
||||
<meta charset="UTF-8">
|
||||
<title>{{ page.title }} « Cooperative Technologists</title>
|
||||
<meta property="og:type" content="website" />
|
||||
<meta property="og:title" content="{{ page.title }}" />
|
||||
{% if page.excerpt %}
|
||||
<meta property="og:description" content="{{ page.excerpt | strip_html }}" />
|
||||
{% else %}
|
||||
<meta property="og:description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
|
||||
{% endif %}
|
||||
<meta property="og:site_name" content="Cooperative Technologists" />
|
||||
{% if page.collection == 'coops' %}
|
||||
<meta property="og:image" content="/images/coops/{{ page.slug }}" />
|
||||
{% elsif page.collection == 'services' %}
|
||||
<meta property="og:image" content="/images/services/{{ page.slug }}" />
|
||||
{% elsif page.collection == 'technologies' %}
|
||||
<meta property="og:image" content="/images/technologies/{{ page.slug }}" />
|
||||
{% 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" />
|
||||
{% endif %}
|
||||
<meta property="og:locale" content="en_GB" />
|
||||
<meta name="twitter:card" content="summary" />
|
||||
<meta name="twitter:site" content="@CotechUK" />
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
</a>
|
||||
</strong>
|
||||
<a class="back" href="/">← Go Back</a>
|
||||
<a class="close" href="/">✖</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -22,11 +22,14 @@
|
||||
<div id="responsive-menu">
|
||||
<div class="top-bar-right">
|
||||
<ul class="dropdown menu vertical medium-horizontal" data-magellan>
|
||||
<li><a href="#members">Members</a></li>
|
||||
<li><a href="#clients">Clients</a></li>
|
||||
<li><a href="#services">Services</a></li>
|
||||
<li><a href="#technologies">Technologies</a></li>
|
||||
<li><a href="#contact" class="button">Get In Touch</a></li>
|
||||
<li><a href="/#members">Members</a></li>
|
||||
<li><a href="/#clients">Clients</a></li>
|
||||
<li><a href="/#services">Services</a></li>
|
||||
<li><a href="/#technologies">Technologies</a></li>
|
||||
<li><a href="/about">About</a></li>
|
||||
<li><a href="/join">Join</a></li>
|
||||
<li><a href="/manifesto">Manifesto</a></li>
|
||||
<li><a href="/#contact" class="button">Get In Touch</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -17,6 +17,9 @@
|
||||
<div class="small-12 small-centered columns">
|
||||
<img src="/images/services/{{ page.slug }}.png" alt="">
|
||||
<h1>Coops that offer <span>{{ page.name }}</span></h1>
|
||||
{% if page.excerpt %}
|
||||
<p>{{ page.excerpt }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -17,6 +17,9 @@
|
||||
<div class="small-12 small-centered columns">
|
||||
<img src="/images/technologies/{{ page.slug }}" alt="{{ page.name }}">
|
||||
<h1>Coops that use <span>{{ page.name }}</span></h1>
|
||||
{% if page.excerpt %}
|
||||
<p>{{ page.excerpt }}</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
---
|
||||
title: Virtual Servers
|
||||
name: Virtual Servers
|
||||
excerpt: CoTech co-operatives who provide virtual servers to clients.
|
||||
---
|
||||
|
||||
@ -4179,7 +4179,9 @@ a {
|
||||
color: #2199e8;
|
||||
text-decoration: none;
|
||||
line-height: inherit;
|
||||
cursor: pointer; }
|
||||
cursor: pointer;
|
||||
|
||||
}
|
||||
a:hover, a:focus {
|
||||
color: #1585cf; }
|
||||
a img {
|
||||
@ -6346,7 +6348,9 @@ table.hover tbody tr:nth-of-type(even):hover {
|
||||
|
||||
.top-bar-title {
|
||||
float: left;
|
||||
margin-right: 1rem; }
|
||||
margin-right: 1rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.top-bar-left {
|
||||
float: left; }
|
||||
@ -6705,6 +6709,12 @@ h5#join-us {
|
||||
.home #clients {
|
||||
background-color: #f7f7f5; }
|
||||
|
||||
|
||||
|
||||
.client:nth-child(n+7){
|
||||
display: none;
|
||||
}
|
||||
|
||||
.client-thumb {
|
||||
height: 150px;
|
||||
width: 100%;
|
||||
@ -6828,6 +6838,9 @@ h5#join-us {
|
||||
padding-left: 2rem;
|
||||
color: #9196a2; }
|
||||
|
||||
.close{
|
||||
float: right;
|
||||
}
|
||||
#page-banner {
|
||||
margin-bottom: 4rem;
|
||||
text-align: center; }
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -51,3 +51,8 @@ app.createMapMultiMarker = function(mapId, lat, lng, zoom, markersArray) {
|
||||
};
|
||||
|
||||
//# sourceMappingURL=app.js.map
|
||||
$('#client-list .column').shuffle();
|
||||
window.setInterval(function(){
|
||||
/// call your function here
|
||||
$('#client-list .column').shuffle();
|
||||
}, 7000);
|
||||
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 37 KiB |
54
images/coops/founders-and-coders.svg
Normal file
54
images/coops/founders-and-coders.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 23 KiB |
@ -102,11 +102,11 @@ layout: home
|
||||
<div class="small-12 columns">
|
||||
<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">
|
||||
{% assign clients = site.clients | sample:6 %}
|
||||
<div id='client-list' class="row small-up-2 medium-up-3 large-up-6">
|
||||
{% assign clients = site.clients %}
|
||||
{% for client in clients %}
|
||||
<div class="column">
|
||||
<div class="client-thumb" style="background-image: url(/images/clients/{{ client.slug }})"></div>
|
||||
<div class="column client">
|
||||
<div class="client-thumb" style='background-image: url(/images/clients/{{ client.slug }}') title="{{client.slug}}"></div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user