diff --git a/Gemfile b/Gemfile index 09cb4be..68005b5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "http://rubygems.org" -gem "sass", "~> 3.3.0.rc.4" +gem "sass", "~> 3.3.0" gem "compass", "~> 1.0.0.alpha.18" -gem "susy", "~> 2.0.0.rc.1" +gem "susy", "~> 2.0.0" gem "accoutrement", "~> 0.1.7" gem "breakpoint", "~> 2.4.1" diff --git a/Gemfile.lock b/Gemfile.lock index a2fde9e..d2c4ffc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,18 +26,20 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) - multi_json (1.8.4) + multi_json (1.9.0) + rake (10.1.1) rb-fsevent (0.9.4) rb-inotify (0.9.3) ffi (>= 0.5.0) - rb-kqueue (0.2.0) + rb-kqueue (0.2.2) ffi (>= 0.5.0) - sass (3.3.0.rc.4) - sassy-maps (0.3.1) + sass (3.3.0) + rake + sassy-maps (0.3.2) compass (~> 1.0.0.alpha.13) sass (~> 3.3.0.rc.2) - susy (2.0.0.rc.1) - sass (~> 3.3.0.rc.1) + susy (2.0.0) + sass (~> 3.3.0) PLATFORMS ruby @@ -46,5 +48,5 @@ DEPENDENCIES accoutrement (~> 0.1.7) breakpoint (~> 2.4.1) compass (~> 1.0.0.alpha.18) - sass (~> 3.3.0.rc.4) - susy (~> 2.0.0.rc.1) + sass (~> 3.3.0) + susy (~> 2.0.0) diff --git a/content/config.yml b/content/config.yml index 192b8bc..f223688 100644 --- a/content/config.yml +++ b/content/config.yml @@ -11,15 +11,11 @@ site_author_url: http://twitter.com/ericmsuzanne # Version versions: - - title: Stable Release - number: 1.0.9 - notes: 'https://github.com/ericam/susy/blob/master/CHANGELOG.mkdn' - code: 'https://github.com/ericam/susy/' - - title: Release Candidate - gem: 'https://rubygems.org/gems/susy/versions/2.0.0.rc.1' - number: 2.0.0.rc.1 + - title: Version + number: 2.0.0 notes: 'http://susydocs.oddbird.net/en/latest/changelog/' - + upgrade: 'http://susydocs.oddbird.net/en/latest/upgrade/' + code: 'https://github.com/ericam/susy/' # News news: diff --git a/content/index.rst b/content/index.rst index e8969b0..83c3679 100644 --- a/content/index.rst +++ b/content/index.rst @@ -15,21 +15,6 @@ Power tools for the web Rapid Prototypes, Built to Scale -------------------------------- -|note| - -.. |note| raw:: html - - - Note: - These instructions are for Susy 2, - which requires the pre-release version of Sass. - The - SusyOne documentation - is still available, - along with - upgrade instructions. - - Rapid prototypes are only the start to a long process of development, changes, handoffs, and maintanance. diff --git a/content/static/css/screen.css b/content/static/css/screen.css index 9eaefc6..c7ef1b3 100644 --- a/content/static/css/screen.css +++ b/content/static/css/screen.css @@ -155,7 +155,7 @@ html { box-sizing: border-box; } -[data-icon] { +[data-icon], .version-details [href^='http']::before, .version-details [href*="github"]::before, .version-details [href*="susydocs"]::before { font-family: susy; speak: none; font-style: normal; @@ -716,6 +716,13 @@ a:hover, a:focus, a:active { padding-top: 0rem; border: 0; } +.release-info a:link, .release-info a:visited { + color: white; + text-decoration: none; +} +.release-info a:hover, .release-info a:focus, .release-info a:active { + text-decoration: underline; +} .version { padding-top: 0.34722rem; @@ -727,12 +734,14 @@ a:hover, a:focus, a:active { background: #0098cc; color: white; text-shadow: 0 1px 0 rgba(0, 95, 127, 0.5); + text-align: center; } .version + .version { background: #33cbff; } .version-title { + font-weight: bold; margin-right: 0.69444rem; } @@ -748,20 +757,17 @@ a:hover, a:focus, a:active { display: inline-block; margin-right: 0.69444rem; } -.version-details a:link, .version-details a:visited { - color: white; - font-weight: bold; - text-decoration: none; -} -.version-details a:link[href^='http']:before, .version-details a:visited[href^='http']:before { - opacity: .5; - color: white; +.version-details [href^='http']::before { + content: "\e319"; + font-size: 0.66667rem; + line-height: 1.38889rem; + margin-right: .4em; } -.version-details a:hover, .version-details a:focus, .version-details a:active { - text-decoration: underline; +.version-details [href*="github"]::before { + content: "\e600"; } -.version-details a:hover[href^='http']:before, .version-details a:focus[href^='http']:before, .version-details a:active[href^='http']:before { - opacity: 1; +.version-details [href*="susydocs"]::before { + content: "\e603"; } .head { diff --git a/output b/output index d62c426..dd79b41 160000 --- a/output +++ b/output @@ -1 +1 @@ -Subproject commit d62c4265c0919b5b7e75286b873241252e5d4e87 +Subproject commit dd79b41b76f6e13ca1fd30c163cb06d1b5166e25 diff --git a/sass/modules/_release.scss b/sass/modules/_release.scss index 540eaaf..5e5615c 100644 --- a/sass/modules/_release.scss +++ b/sass/modules/_release.scss @@ -13,6 +13,16 @@ @include padding-leader(0); border: 0; } + + a { + @include link { + color: white; + text-decoration: none; + } + @include focus { + text-decoration: underline; + } + } } .version { @@ -23,11 +33,15 @@ background: color(dark $accent); color: white; text-shadow: 0 1px 0 color(darker $accent, .5); + text-align: center; + .version { background: color(light $accent); } } -.version-title { margin-right: rhythm(.5); } +.version-title { + font-weight: bold; + margin-right: rhythm(.5); +} .version-details { display: inline-block; @@ -40,21 +54,13 @@ display: inline-block; margin-right: rhythm(.5); } - a { - @include link { - color: white; - font-weight: bold; - text-decoration: none; - &[href^='http']:before { - opacity: .5; - color: white; - } - } - @include focus { - text-decoration: underline; - &[href^='http']:before { - opacity: 1; - } + + [href^='http'] { + @include icon('external') { + @include font-size(xxsmall); + margin-right: .4em; } } + [href*="github"] { @include icon('github'); } + [href*="susydocs"] { @include icon('list'); } } diff --git a/templates/modules/_release.html b/templates/modules/_release.html index 5723381..93f59bc 100644 --- a/templates/modules/_release.html +++ b/templates/modules/_release.html @@ -2,19 +2,24 @@

Versions

{% for version in config.versions %}
- {{ version.title }}: + + {{ version.title }} + {{ version.number }}: +