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 #536 from marcom-unimelb/upgrade-ruby
Browse files Browse the repository at this point in the history
Rebuild static site to v3.8
  • Loading branch information
waitingallday committed Feb 8, 2016
2 parents a7b20dd + 0131f08 commit b551acd
Show file tree
Hide file tree
Showing 371 changed files with 13,685 additions and 956 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ WEBPACK_SERVER_PORT="7002"

# thin
PORT="7001"
CURRENT_VERSION="v3.7"
CURRENT_VERSION="v3.8"
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
source 'https://rubygems.org'

ruby '2.2.3'
ruby '2.3.0'

gem 'nokogiri', '>= 1.6.7.2'
gem 'rack'
gem 'thin', '~> 1.6.2'

Expand All @@ -13,7 +14,7 @@ group :development do
gem 'sprockets-helpers', '~> 1.1.0'

gem 'slim', '~> 2.0.3'
gem 'json', '1.8.1'
gem 'json', '1.8.3'

gem 'html-pipeline', '~> 1.6.0'
gem 'github-linguist', '~> 2.10.9'
Expand All @@ -22,7 +23,7 @@ group :development do
gem 'front_matter_parser', '~> 0.0.2'

gem 'sinatra-export'
gem 'uglifier', '~> 2.5.0'
gem 'uglifier', '>= 2.7.2'
gem 'rake', '~> 10.3.2'
gem 'foreman'
end
31 changes: 16 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.4)
activesupport (4.2.5.1)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
charlock_holmes (0.6.9.4)
daemons (1.2.3)
escape_utils (1.1.0)
eventmachine (1.0.8)
escape_utils (1.2.0)
eventmachine (1.0.9.1)
execjs (2.6.0)
foreman (0.78.0)
thor (~> 0.19.1)
Expand All @@ -26,13 +26,13 @@ GEM
activesupport (>= 2)
nokogiri (~> 1.4)
i18n (0.7.0)
json (1.8.1)
json (1.8.3)
mime-types (1.25.1)
mini_portile (0.6.2)
minitest (5.8.1)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.2)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
posix-spawn (0.3.11)
pygments.rb (0.5.4)
posix-spawn (~> 0.3.6)
Expand All @@ -43,8 +43,8 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rake (10.3.2)
sinatra (1.4.6)
rack (~> 1.4)
sinatra (1.4.7)
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sinatra-advanced-routes (0.5.3)
Expand Down Expand Up @@ -78,10 +78,10 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
tins (1.6.0)
tins (1.8.2)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
yajl-ruby (1.1.0)
Expand All @@ -95,7 +95,8 @@ DEPENDENCIES
github-linguist (~> 2.10.9)
github-markdown (~> 0.6.4)
html-pipeline (~> 1.6.0)
json (= 1.8.1)
json (= 1.8.3)
nokogiri (>= 1.6.7.2)
pygments.rb (~> 0.5.4)
rack
rake (~> 10.3.2)
Expand All @@ -107,7 +108,7 @@ DEPENDENCIES
sprockets (~> 2.12.2)
sprockets-helpers (~> 1.1.0)
thin (~> 1.6.2)
uglifier (~> 2.5.0)
uglifier (>= 2.7.2)

BUNDLED WITH
1.10.6
1.11.2
22 changes: 16 additions & 6 deletions assets/targets/components/tabs/_tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
& > figure.full-width {
background-color: transparent;
}

.mobile-nav {
display: none;
}
Expand All @@ -71,7 +71,7 @@
letter-spacing: .5px;
text-decoration: none;
text-transform: uppercase;

&:hover {
color: $white;
}
Expand Down Expand Up @@ -113,7 +113,7 @@
@include rem(padding-bottom, 15px);
position: relative;
}

.ps-scrollbar-x-rail {
z-index: 5;
}
Expand All @@ -130,7 +130,7 @@
height: 100%;
position: absolute;
top: 0;

&[disabled] {
cursor: default;
opacity: .5;
Expand Down Expand Up @@ -414,10 +414,20 @@
& > .full-width {
height: auto;
}

nav {
display: block;
white-space: normal;


a {
// Computed from rgba
color: #A5B9CC;
}

a[data-current] {
color: $white;
}

a[data-current]:after {
border: solid transparent;
border-top-color: $darkblue;
Expand Down
4 changes: 4 additions & 0 deletions assets/targets/injection/footer/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,10 @@
.ie8 .uomcontent .page-footer {
ul.quicklinks {
border-bottom: 0;

a {
line-height: 1.6em;
}
}

ul.people-links {
Expand Down
1 change: 0 additions & 1 deletion build/v3.7.1/assets/components.css

This file was deleted.

1 change: 0 additions & 1 deletion build/v3.7.1/assets/injection.css

This file was deleted.

1 change: 0 additions & 1 deletion build/v3.7.1/audio-video-guidelines/index.html

This file was deleted.

1 change: 0 additions & 1 deletion build/v3.7.1/components/index.html

This file was deleted.

61 changes: 0 additions & 61 deletions build/v3.7.1/components/inpage-navigation/index.html

This file was deleted.

Loading

0 comments on commit b551acd

Please sign in to comment.