Skip to content
This repository has been archived by the owner on Feb 5, 2020. It is now read-only.

Commit

Permalink
Merge pull request #413 from marcom-unimelb/prep-3.4.1
Browse files Browse the repository at this point in the history
Prep 3.4.1 deploy
  • Loading branch information
axelboc committed Oct 29, 2015
2 parents 2f05d61 + c001c14 commit 67bbb39
Show file tree
Hide file tree
Showing 359 changed files with 492 additions and 731 deletions.
10 changes: 7 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Assets
WEB_SERVER_HOST="localhost"
WEB_SERVER_PORT="5000"
ASSET_SERVER_PORT="5001"
WEBPACK_SERVER_PORT="5002"
WEB_SERVER_PORT="7000"
ASSET_SERVER_PORT="7001"
WEBPACK_SERVER_PORT="7002"

# thin
PORT="7001"
CURRENT_VERSION="v3.4.1"
2 changes: 1 addition & 1 deletion .foreman
Original file line number Diff line number Diff line change
@@ -1 +1 @@
port: 5000
port: 7000
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: RACK_ENV=production VERSION=v3.4 bundle exec thin start -p $PORT
web: RACK_ENV=production VERSION=$CURRENT_VERSION bundle exec thin start -p $PORT
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This app now runs on webpack, so ruby is required to run the documentation/demo
npm install
foreman start -f Procfile.dev

The development server needs to run on 3 ports (node.js, webpack and rack) and will be available at [http://localhost:5001/](http://localhost:5001/)
The development server needs to run on 3 ports (node.js, webpack and rack) and will be available at [http://localhost:7001/](http://localhost:7001/)

## Deploying asset package

Expand Down
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ namespace :assets do
abort 'Missing VERSION parameter'
end

root = File.expand_path(File.join(File.dirname(__FILE__)))
build_dir = File.join(root, 'build', ENV['VERSION'])
public_dir = File.join(root, 'doc-site', 'public')
root = File.expand_path(File.join(File.dirname(__FILE__)))
build_dir = File.join(root, 'build', ENV['VERSION'])
public_dir = File.join(root, 'doc-site', 'public')

# clear out existing build
system "cd #{root}/ && rm -rf #{build_dir} && mkdir #{build_dir}"
Expand Down
6 changes: 3 additions & 3 deletions assets/server.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require('dotenv').load("../");
var WEB_SERVER_HOST = process.env.WEB_SERVER_HOST || 'localhost';
var ASSET_SERVER_PORT = process.env.ASSETS_SERVER_PORT || 5001;
var WEBPACK_PORT = process.env.WEBPACK_SERVER_PORT || 5002;
var PROXY_URL = ('http://' + WEB_SERVER_HOST + ':' + process.env.WEB_SERVER_PORT) || "http://localhost:5000";
var ASSET_SERVER_PORT = process.env.ASSETS_SERVER_PORT || 7001;
var WEBPACK_PORT = process.env.WEBPACK_SERVER_PORT || 7002;
var PROXY_URL = ('http://' + WEB_SERVER_HOST + ':' + process.env.WEB_SERVER_PORT) || "http://localhost:7000";

var http = require("http");
var path = require('path');
Expand Down
1 change: 1 addition & 0 deletions build/v3.4.1/assets/components.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
2 changes: 2 additions & 0 deletions build/v3.4.1/assets/injection.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/v3.4.1/audio-video-guidelines/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>Audio Video Guidelines | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4.1</span></a><meta content="1" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="Audio Video Guidelines"><span itemprop="name">Audio Video Guidelines</span></a><meta content="2" itemprop="position" /></li></ol><div role="main"><header><h1>Audio & Video guidelines</h1></header><section><h2>Audio</h2><p>All audio is required to provide a text transcript. This is to assist screen readers and search engines interpret the content.</p><p>The university has procured a 3rd party service who can assist with creating transcripts for audio. Contact the digital team for details on this service.</p><h2>Video</h2><p>Video should include captions that conform to <a href="http://www.unimelb.edu.au/accessibility/captioning/style-guide.htm">the university captioning style guide</a>.</p><p>The university has procured a 3rd party service who can assist with captioning video. Contact the digital team for details on this service.</p><p>Video used needs to comply with <a href="http://marketing.unimelb.edu.au/imagebank/guidelines.html">the university video guidelines</a>.</p></section><hr /><section><p class="center"><a class="button-hero" href="/content-creators">Back to overview</a></p></section></div><div class="no-js" id="sitemap" role="navigation"><h2>Web.Unimelb</h2><ul><li><a href="/content-creators">For Content Creators</a></li><li><a href="/designers">For Designers</a></li><li><a href="/getting-started">Getting started</a></li><li><a href="/layouts">Page Templates</a></li><li><a href="/components">Component reference</a></li></ul><ul class="meta"><li><a href="https://github.com/marcom-unimelb/unimelb-design-system/issues">Report an Issue</a></li></ul></div></div></div></body></html>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>Build process | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4</span></a><meta content="1" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="Build process"><span itemprop="name">Build process</span></a><meta content="2" itemprop="position" /></li></ol><div role="main"><header class="solid-blue"><h1>Build process</h1></header><div class="jumpnav"></div><section><h1>Templates build process</h1>
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>Build process | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4.1</span></a><meta content="1" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="Build process"><span itemprop="name">Build process</span></a><meta content="2" itemprop="position" /></li></ol><div role="main"><header class="solid-blue"><h1>Build process</h1></header><div class="jumpnav"></div><section><h1>Templates build process</h1>

<p>A number of things happen when we deploy the templates in order to ensure that the @unimelb web presence remains consistent, you are provided with the best possible code that all bugs are fixed in a timely manner.</p>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>How do I choose a technology for my website? | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4</span></a><meta content="1" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="How do I choose a technology for my website?"><span itemprop="name">How do I choose a technology for my website?</span></a><meta content="2" itemprop="position" /></li></ol><div role="main"><header class="solid-blue"><h1>How do I choose a technology for my website?</h1></header><div class="jumpnav"></div><section><h1>How do I choose a technology for my website?</h1>
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>How do I choose a technology for my website? | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4.1</span></a><meta content="1" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="How do I choose a technology for my website?"><span itemprop="name">How do I choose a technology for my website?</span></a><meta content="2" itemprop="position" /></li></ol><div role="main"><header class="solid-blue"><h1>How do I choose a technology for my website?</h1></header><div class="jumpnav"></div><section><h1>How do I choose a technology for my website?</h1>

<p><strong>Note</strong>: This article relates to the selection of technology for a public facing website and is not necessarily relevant to staff intranet or student teaching purposes.</p>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>Coding Guidelines | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4</span></a><meta content="1" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="Coding Guidelines"><span itemprop="name">Coding Guidelines</span></a><meta content="2" itemprop="position" /></li></ol><div role="main"><header class="solid-paleblue"><h1>Coding guidelines</h1></header><section class="lead"><p>The design system has been built using <a href="http://sass-lang.com">Sass</a>, a CSS pre-processor that adds program logic, variables and nesting to simplify long and complicated stylesheet files.</p></section><section><h2 class="title" id="css">CSS Rules</h2><p>To make style code easier to maintain, we use a few rules to keep it consistent.</p><p>Styles are defined one property-per-line, all lines end in a semi-colon, indented by 2 spaces, ordered alphabetically.</p></section><div class="highlight"><pre><span class="nt">a</span> <span class="p">{</span>
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>Coding Guidelines | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4.1</span></a><meta content="1" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="Coding Guidelines"><span itemprop="name">Coding Guidelines</span></a><meta content="2" itemprop="position" /></li></ol><div role="main"><header class="solid-paleblue"><h1>Coding guidelines</h1></header><section class="lead"><p>The design system has been built using <a href="http://sass-lang.com">Sass</a>, a CSS pre-processor that adds program logic, variables and nesting to simplify long and complicated stylesheet files.</p></section><section><h2 class="title" id="css">CSS Rules</h2><p>To make style code easier to maintain, we use a few rules to keep it consistent.</p><p>Styles are defined one property-per-line, all lines end in a semi-colon, indented by 2 spaces, ordered alphabetically.</p></section><div class="highlight"><pre><span class="nt">a</span> <span class="p">{</span>
<span class="k">color</span> <span class="m">#036</span><span class="p">;</span>
<span class="k">text-decoration</span><span class="o">:</span> <span class="k">none</span><span class="p">;</span>
<span class="p">}</span>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>Accordion | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4</span></a><meta content="1" itemprop="position" /></li><li itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/components" itemprop="item" title="Components"><span itemprop="name">Components</span></a><meta content="2" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="Accordion"><span itemprop="name">Accordion</span></a><meta content="3" itemprop="position" /></li></ol><div role="main"><header class="solid"><h1>Accordion</h1></header><section><div class="jumpnav"></div>
<!DOCTYPE html><html class="no-js" lang="en"><head><meta charset="utf-8" /><meta content="width=device-width, initial-scale=1.0" name="viewport" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><title>Accordion | Web.Unimelb</title><link href="/favicon-152.png" rel="apple-touch-icon-precomposed" /><!--[if lt IE 9]><script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script><![endif]--><script src="/assets/injection.js"></script><link rel="stylesheet" href="/assets/injection.css"><link rel="stylesheet" href="/assets/components.css"><link rel="stylesheet" href="/assets/docs.css"><link rel="stylesheet" href="/assets/stylesheets/syntax.css"><script src="/assets/components.js"></script></head><body><div class="uomcontent"><div class="page-inner"><ol class="page-local-history" itemscope="" itemtype="http://schema.org/BreadcrumbList"><li class="root" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/" itemprop="item"><span itemprop="name">Web.Unimelb v3.4.1</span></a><meta content="1" itemprop="position" /></li><li itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="/components" itemprop="item" title="Components"><span itemprop="name">Components</span></a><meta content="2" itemprop="position" /></li><li class="last" itemprop="itemListElement" itemscope="" itemtype="http://schema.org/ListItem"><a href="" itemprop="item" title="Accordion"><span itemprop="name">Accordion</span></a><meta content="3" itemprop="position" /></li></ol><div role="main"><header class="solid"><h1>Accordion</h1></header><section><div class="jumpnav"></div>

<p>Before using this component, you might want to read our <a href="/how-to-use-accordions-well">article about Accordions</a> first.</p>

Expand Down
Loading

0 comments on commit 67bbb39

Please sign in to comment.