mirror of
				https://git.coop/cotech/website.git
				synced 2025-11-04 05:26:32 +00:00 
			
		
		
		
	Compare commits
	
		
			16 Commits
		
	
	
		
			fix-sass-g
			...
			fix-outlan
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e4976435e8 | |||
| 81dfff64a1 | |||
| 5dc7ba9dc7 | |||
| fa60cd806f | |||
| e57af06c9c | |||
| 3b12a56f2d | |||
| aab7cf7b2f | |||
| 444c277731 | |||
| a01c6362df | |||
| 37c2d2cfe8 | |||
| 14c080193a | |||
| 0b5a99ebfe | |||
| c016347449 | |||
| fce5d8bbc1 | |||
| 1461174ca1 | |||
| 6b1d1c024f | 
@ -29,6 +29,9 @@ pages:
 | 
			
		||||
  script:
 | 
			
		||||
  - bundle exec jekyll build -d public
 | 
			
		||||
  - rsync -aqz public/ cotech@webarch2.co.uk:sites/default/
 | 
			
		||||
  - cd public ; git checkout dev ; cd -
 | 
			
		||||
  - bundle exec jekyll build -d public
 | 
			
		||||
  - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
 | 
			
		||||
  artifacts:
 | 
			
		||||
    paths:
 | 
			
		||||
    - public
 | 
			
		||||
 | 
			
		||||
@ -24,7 +24,7 @@ And visit [localhost:4000](http://localhost:4000) to view the site.
 | 
			
		||||
 | 
			
		||||
## Deploy CI
 | 
			
		||||
 | 
			
		||||
When changes are committed the `.gitlab-ci.yml` file triggers the building of the site and then the copying of the results to https://static.coops.tech/
 | 
			
		||||
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 https://static.coops.tech/ and when changes are committed to the `dev` branch the site at https://dev.static.coops.tech/ is updated.
 | 
			
		||||
 | 
			
		||||
## Contributing
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -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
 | 
			
		||||
 | 
			
		||||
@ -3,7 +3,7 @@ title: Webarchitects Co-operative
 | 
			
		||||
name: Webarchitects Co-operative
 | 
			
		||||
website: https://www.webarchitects.coop/
 | 
			
		||||
email: info@webarch.net
 | 
			
		||||
twitter: webarch-coop
 | 
			
		||||
twitter: webarchcoop
 | 
			
		||||
github: info%40webarch.html
 | 
			
		||||
telephone: +44 114 276 9709
 | 
			
		||||
address: Webarch Co-operative Limited,Harland Works,68a John Street,Sheffield,United Kingdom,S2 4QU
 | 
			
		||||
 | 
			
		||||
@ -25,4 +25,22 @@
 | 
			
		||||
      </div>
 | 
			
		||||
    </div>
 | 
			
		||||
  </div>
 | 
			
		||||
<!-- Matomo -->
 | 
			
		||||
<script type="text/javascript">
 | 
			
		||||
  var _paq = _paq || [];
 | 
			
		||||
  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
 | 
			
		||||
  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
 | 
			
		||||
  _paq.push(["setDomains", ["*.coops.tech","*.dev.coops.tech","*.static.coops.tech","*.www.coops.tech"]]);
 | 
			
		||||
  _paq.push(["disableCookies"]);
 | 
			
		||||
  _paq.push(['trackPageView']);
 | 
			
		||||
  _paq.push(['enableLinkTracking']);
 | 
			
		||||
  (function() {
 | 
			
		||||
    var u="https://stats.webarch.net/";
 | 
			
		||||
    _paq.push(['setTrackerUrl', u+'piwik.php']);
 | 
			
		||||
    _paq.push(['setSiteId', '223']);
 | 
			
		||||
    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
 | 
			
		||||
    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
 | 
			
		||||
  })();
 | 
			
		||||
</script>
 | 
			
		||||
<!-- End Matomo Code -->
 | 
			
		||||
</footer>
 | 
			
		||||
 | 
			
		||||
@ -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 }} « Cooperative Technologists</title>
 | 
			
		||||
  <meta property="og:type" content="website" />
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										
											BIN
										
									
								
								images/clients/greenpeace.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								images/clients/greenpeace.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 25 KiB  | 
		Reference in New Issue
	
	Block a user