Update gems and un-abstract layouts for now.

This commit is contained in:
Jina Bolton 2014-07-30 22:26:38 -07:00
parent 31ef77b7ad
commit 89cad97f5d
13 changed files with 314 additions and 171 deletions

20
Gemfile
View File

@ -10,17 +10,17 @@ gem "rack-contrib"
group :development do
gem "breakpoint", "2.4.2", :require => false
gem "builder", "~> 3.2.2"
gem "compass", "1.0.0.alpha.21"
gem "middleman", "~>3.1.5"
gem "middleman-livereload"
gem "middleman-syntax"
gem "normalize-rails", :require => false
gem "redcarpet"
gem "compass", "~> 1.0.0.alpha.21"
gem "middleman", "~> 3.3.3"
gem "middleman-blog", "~> 3.5.3"
gem "middleman-livereload", "~> 3.3.4"
gem "middleman-minify-html", "~> 3.4.0"
gem "middleman-syntax", "~> 2.0.0"
gem "normalize-rails", "~> 3.0.1", :require => false
gem "redcarpet", "~> 3.1.2"
gem "sass", "~> 3.3.11"
gem "susy", "~> 2.1.3"
gem "typogruby", "~> 1.0.16"
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
platforms :mri_18 do
gem "ruby18_source_location"
end
gem "tzinfo-data", "~> 1.2014.5", platforms: [:mswin, :mingw]
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
end

View File

@ -1,9 +1,13 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.19)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
activesupport (4.1.4)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 1.1)
addressable (2.3.6)
breakpoint (2.4.2)
sass (~> 3.3.0)
sassy-maps (< 1.0.0)
@ -28,57 +32,75 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
execjs (2.2.1)
ffi (1.9.3)
haml (4.0.5)
tilt
hike (1.2.3)
hooks (0.4.0)
uber (~> 0.0.4)
htmlcompressor (0.1.1)
http_parser.rb (0.6.0)
i18n (0.6.11)
json (1.8.1)
kramdown (1.4.0)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
middleman (3.1.6)
middleman (3.3.3)
coffee-script (~> 2.2.0)
compass (>= 0.12.2)
execjs (~> 1.4.0)
haml (>= 3.1.6)
compass (>= 0.12.4)
compass-import-once (= 1.0.4)
execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-core (= 3.1.6)
middleman-more (= 3.1.6)
middleman-core (= 3.3.3)
middleman-sprockets (>= 3.1.2)
sass (>= 3.1.20)
uglifier (~> 2.1.0)
middleman-core (3.1.6)
activesupport (~> 3.2.6)
sass (>= 3.2.17, < 4.0)
uglifier (~> 2.5)
middleman-blog (3.5.3)
addressable (~> 2.3.5)
middleman-core (~> 3.2)
tzinfo (>= 0.3.0)
middleman-core (3.3.3)
activesupport (~> 4.1.0)
bundler (~> 1.1)
i18n (~> 0.6.1)
erubis
hooks (~> 0.3)
i18n (~> 0.6.9)
listen (~> 1.1)
rack (>= 1.4.5)
rack-test (~> 0.6.1)
padrino-helpers (~> 0.12.1)
rack (>= 1.4.5, < 2.0)
rack-test (~> 0.6.2)
thor (>= 0.15.2, < 2.0)
tilt (~> 1.3.6)
middleman-livereload (3.1.1)
em-websocket (>= 0.2.0)
middleman-core (>= 3.0.2)
multi_json (~> 1.0)
rack-livereload
middleman-more (3.1.6)
middleman-sprockets (3.1.4)
middleman-core (>= 3.0.14)
middleman-more (>= 3.0.14)
sprockets (~> 2.1)
sprockets-helpers (~> 1.0.0)
sprockets-sass (~> 1.0.0)
middleman-syntax (1.2.1)
middleman-core (~> 3.0)
rouge (~> 0.3.0)
tilt (~> 1.4.1, < 2.0)
middleman-livereload (3.3.4)
em-websocket (~> 0.5.1)
middleman-core (~> 3.2)
rack-livereload (~> 0.3.15)
middleman-minify-html (3.4.0)
htmlcompressor (~> 0.1.0)
middleman-core (>= 3.2)
middleman-sprockets (3.3.4)
middleman-core (~> 3.3)
sprockets (~> 2.12.1)
sprockets-helpers (~> 1.1.0)
sprockets-sass (~> 1.2.0)
middleman-syntax (2.0.0)
middleman-core (~> 3.2)
rouge (~> 1.0)
minitest (5.4.0)
multi_json (1.10.1)
normalize-rails (3.0.1)
padrino-helpers (0.12.2)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.2)
tilt (~> 1.4.1)
padrino-support (0.12.2)
activesupport (>= 3.1)
rack (1.5.2)
rack-contrib (1.1.0)
rack (>= 0.9.1)
@ -94,11 +116,9 @@ GEM
rb-kqueue (0.2.3)
ffi (>= 0.5.0)
redcarpet (3.1.2)
rouge (0.3.10)
thor
ruby18_source_location (0.2)
rouge (1.6.1)
rubypants (0.2.0)
sass (3.3.11)
sass (3.3.12)
sassy-maps (0.4.0)
sass (~> 3.3)
sprockets (2.12.1)
@ -106,20 +126,24 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-helpers (1.0.1)
sprockets-helpers (1.1.0)
sprockets (~> 2.0)
sprockets-sass (1.0.3)
sprockets-sass (1.2.0)
sprockets (~> 2.0)
tilt (~> 1.1)
susy (2.1.3)
sass (>= 3.3.0, < 3.5)
thor (0.19.1)
tilt (1.3.7)
thread_safe (0.3.4)
tilt (1.4.1)
typogruby (1.0.16)
rubypants
uglifier (2.1.2)
tzinfo (1.2.1)
thread_safe (~> 0.1)
uber (0.0.7)
uglifier (2.5.3)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
json (>= 1.8.0)
PLATFORMS
ruby
@ -127,18 +151,20 @@ PLATFORMS
DEPENDENCIES
breakpoint (= 2.4.2)
builder (~> 3.2.2)
compass (= 1.0.0.alpha.21)
middleman (~> 3.1.5)
middleman-livereload
middleman-syntax
normalize-rails
compass (~> 1.0.0.alpha.21)
middleman (~> 3.3.3)
middleman-blog (~> 3.5.3)
middleman-livereload (~> 3.3.4)
middleman-minify-html (~> 3.4.0)
middleman-syntax (~> 2.0.0)
normalize-rails (~> 3.0.1)
rack
rack-contrib
rack-rewrite
rake
redcarpet
ruby18_source_location
redcarpet (~> 3.1.2)
sass (~> 3.3.11)
susy (~> 2.1.3)
typogruby (~> 1.0.16)
tzinfo-data (~> 1.2014.5)
wdm (~> 0.1.0)

View File

@ -1,14 +1,11 @@
require 'susy'
require 'breakpoint'
require 'builder'
require 'middleman-syntax'
require 'susy'
require 'typogruby'
activate :livereload
activate :directory_indexes
activate :automatic_image_sizes
activate :syntax,
:linenos => 'table', # inline or table
:linenostart => 2
activate :syntax
set :markdown, :fenced_code_blocks => true,
:autolink => true,
@ -18,31 +15,39 @@ set :css_dir, 'assets/css'
set :js_dir, 'assets/js'
set :images_dir, 'assets/img'
compass_config do |config|
config.output_style = :condensed
end
with_layout :layout_2_column do
page "/*", :layout => "layout_2_column"
end
page "/humans.txt", :layout => false
page "/sitemap.xml", :layout => false
page "/404.html", :layout => :layout_2_column
page "/about.html", :layout => :layout_2_column
page "/guide.html", :layout => :layout_2_column
page "/libsass.html", :layout => :layout_2_column
page "/sitemap.html", :layout => :layout_2_column
page "/documentation/*", :directory_index => false
with_layout :styleguide do
page "/styleguide/*"
end
page "/humans.txt", :layout => false
page "/sitemap.xml", :layout => false
page "/documentation/*", :directory_index => false
configure :development do
activate :livereload
compass_config do |config|
config.output_style = :expanded
end
end
configure :build do
activate :asset_hash
activate :gzip
activate :minify_css
activate :minify_javascript
activate :cache_buster
activate :asset_hash
# First: gem install middleman-smusher
# require "middleman-smusher"
# activate :smusher
activate :relative_assets
set :relative_links, true
compass_config do |config|
config.output_style = :compressed

View File

@ -1,6 +1,5 @@
---
title: "#teamSass"
layout: layout_1_column
---
- content_for :introduction do

View File

@ -1,7 +1,6 @@
---
title: Syntactically Awesome Style Sheets
h1: CSS with superpowers
layout: layout_1_column
---

View File

@ -1,6 +1,5 @@
---
title: Install Sass
layout: layout_1_column
---
%h2 There are a couple of ways to start using&nbsp;Sass:
@ -76,7 +75,7 @@ layout: layout_1_column
%dd
The installer will also install a Ruby command line
powershell application that will let you use the Ruby libraries.
powershell application that will let you use the Ruby libraries.
%dl#install-ruby-mac
%dt Mac

View File

@ -17,7 +17,11 @@
= partial "layouts/regions/page_header"
.body
=yield
.container
.content
- if content_for?(:introduction)
%p.introduction= yield_content :introduction
%main.main(role="main")=yield
- if content_for?(:section_middle)
%section.section-middle

View File

@ -1,6 +0,0 @@
- wrap_layout :layout do
.container
.content
- if content_for?(:introduction)
%p.introduction= yield_content :introduction
%main.main(role="main")=yield

View File

@ -1,10 +1,50 @@
- wrap_layout :layout do
.container
.content
- if content_for?(:introduction)
%p.introduction= yield_content :introduction
!!!5
%html.no-js(lang="en"){:class => data.page.head_classes}
%head
%meta(charset="utf-8")/
%meta(http-equiv="X-UA-Compatible" content="IE=edge")/
%title= page_title
= partial "layouts/head/meta"
= partial "layouts/head/link"
= partial "layouts/head/css"
= partial "layouts/head/js"
%main.main.content-primary(role="main")=yield
%body{class: page_classes}
.page
= partial "layouts/roles/alert"
.pop-stripe
= partial "layouts/regions/banner"
= partial "layouts/regions/page_header"
- if content_for?(:complementary)
.complementary.content-secondary(role="complementary")= yield_content :complementary
.body
.container
.content
- if content_for?(:introduction)
%p.introduction= yield_content :introduction
%main.main.content-primary(role="main")=yield
- if content_for?(:complementary)
.complementary.content-secondary(role="complementary")= yield_content :complementary
- if content_for?(:section_middle)
%section.section-middle
.container= yield_content :section_middle
.alert.release
.container
%ul
- if data.respond_to?(:version)
%li Current Release: <span class="release-name">#{data.version.name} (#{data.version.number})</span>
- else
%li Current Release: <span class="release-name">???</span>
%li=link_to "Release Notes", "/documentation/file.SASS_CHANGELOG.html"
%li=link_to "Fork on Github", "https://github.com/sass/sass"
- if content_for?(:section_bottom)
%section.section-bottom
.container= yield_content :section_bottom
= partial "layouts/regions/contentinfo"
= partial "layouts/foot/js"

View File

@ -1,28 +1,68 @@
- wrap_layout :layout do
=yield
!!!5
%html.no-js(lang="en"){:class => data.page.head_classes}
%head
%meta(charset="utf-8")/
%meta(http-equiv="X-UA-Compatible" content="IE=edge")/
%title= page_title
= partial "layouts/head/meta"
= partial "layouts/head/link"
= partial "layouts/head/css"
= partial "layouts/head/js"
- content_for :alert do
%form.responsive-test-url(role="form" method="post")
%fieldset
%p
%label.visually-hidden(for="test-url") Test URL
%input#test-url(type="text" placeholder="Enter a site URL")/
%body{class: page_classes}
.page
= partial "layouts/roles/alert"
.pop-stripe
= partial "layouts/regions/banner"
= partial "layouts/regions/page_header"
%p
%label.radio(for="normal")
%input#normal(type="radio" name="option" value="1" checked="checked")/
Width only
.body
=yield
%label.radio(for="accurate")
%input#accurate(type="radio" name="option" value="2")/
Device sizes
- content_for :alert do
%form.responsive-test-url(role="form" method="post")
%fieldset
%p
%label.visually-hidden(for="test-url") Test URL
%input#test-url(type="text" placeholder="Enter a site URL")/
%label.checkbox(for="scrollbar")
%input#scrollbar(type="checkbox" name="scrollbar" value="1" checked="checked")/
Add Scrollbar Width
%p
%label.radio(for="normal")
%input#normal(type="radio" name="option" value="1" checked="checked")/
Width only
%p.visually-hidden
%button.primary(type="submit") Submit
%label.radio(for="accurate")
%input#accurate(type="radio" name="option" value="2")/
Device sizes
- content_for :js_foot do
= javascript_include_tag "tools/styleguide/responsive/test"
%label.checkbox(for="scrollbar")
%input#scrollbar(type="checkbox" name="scrollbar" value="1" checked="checked")/
Add Scrollbar Width
%p.visually-hidden
%button.primary(type="submit") Submit
- content_for :js_foot do
= javascript_include_tag "tools/styleguide/responsive/test"
- if content_for?(:section_middle)
%section.section-middle
.container= yield_content :section_middle
.alert.release
.container
%ul
- if data.respond_to?(:version)
%li Current Release: <span class="release-name">#{data.version.name} (#{data.version.number})</span>
- else
%li Current Release: <span class="release-name">???</span>
%li=link_to "Release Notes", "/documentation/file.SASS_CHANGELOG.html"
%li=link_to "Fork on Github", "https://github.com/sass/sass"
- if content_for?(:section_bottom)
%section.section-bottom
.container= yield_content :section_bottom
= partial "layouts/regions/contentinfo"
= partial "layouts/foot/js"

View File

@ -1,32 +1,82 @@
- wrap_layout :layout_2_column do
= yield
- if current_page.data.previous_page_url or current_page.data.next_page_url
%footer
%ul.pager
- if current_page.data.previous_page_url
%li.previous
- if current_page.data.previous_page_url == "index"
- previous = ""
!!!5
%html.no-js(lang="en"){:class => data.page.head_classes}
%head
%meta(charset="utf-8")/
%meta(http-equiv="X-UA-Compatible" content="IE=edge")/
%title= page_title
= partial "layouts/head/meta"
= partial "layouts/head/link"
= partial "layouts/head/css"
= partial "layouts/head/js"
%body{class: page_classes}
.page
= partial "layouts/roles/alert"
.pop-stripe
= partial "layouts/regions/banner"
= partial "layouts/regions/page_header"
.body
.container
.content
- if content_for?(:introduction)
%p.introduction= yield_content :introduction
%main.main.content-primary(role="main")
= yield
- if current_page.data.previous_page_url or current_page.data.next_page_url
%footer
%ul.pager
- if current_page.data.previous_page_url
%li.previous
- if current_page.data.previous_page_url == "index"
- previous = ""
- else
- previous = current_page.data.previous_page_url
= link_to "/styleguide/" + previous do
&larr;
= current_page.data.previous_page_name
- if current_page.data.next_page_url
%li.next
= link_to "/styleguide/" + current_page.data.next_page_url do
= current_page.data.next_page_name
&rarr;
- content_for :complementary do
- root_url = data.sitemap.url
%h3= link_to "Style Guide", "/styleguide"
%ul
- sitemap.resources.each do |page|
- if page.url =~ /styleguide/
- unless page.url =~ /assets/
- unless page.data.title == "Style Guide"
- unless page.data.title == "Responsive Test"
%li= link_to "#{page.data.title}", "#{root_url}#{page.url}"
- if content_for?(:complementary)
.complementary.content-secondary(role="complementary")= yield_content :complementary
- if content_for?(:section_middle)
%section.section-middle
.container= yield_content :section_middle
.alert.release
.container
%ul
- if data.respond_to?(:version)
%li Current Release: <span class="release-name">#{data.version.name} (#{data.version.number})</span>
- else
- previous = current_page.data.previous_page_url
= link_to "/styleguide/" + previous do
&larr;
= current_page.data.previous_page_name
- if current_page.data.next_page_url
%li.next
= link_to "/styleguide/" + current_page.data.next_page_url do
= current_page.data.next_page_name
&rarr;
%li Current Release: <span class="release-name">???</span>
%li=link_to "Release Notes", "/documentation/file.SASS_CHANGELOG.html"
%li=link_to "Fork on Github", "https://github.com/sass/sass"
- if content_for?(:section_bottom)
%section.section-bottom
.container= yield_content :section_bottom
- content_for :complementary do
- root_url = data.sitemap.url
%h3= link_to "Style Guide", "/styleguide"
%ul
- sitemap.resources.each do |page|
- if page.url =~ /styleguide/
- unless page.url =~ /assets/
- unless page.data.title == "Style Guide"
- unless page.data.title == "Responsive Test"
%li= link_to "#{page.data.title}", "#{root_url}#{page.url}"
= partial "layouts/regions/contentinfo"
= partial "layouts/foot/js"

View File

@ -5,13 +5,13 @@ title: Brand Guidelines
%h2 Logo Usage
:markdown
* Do not stretch or distort the logo. Use the "seal" version of the logo
* Do not stretch or distort the logo. Use the "seal" version of the logo
when needing to use a square image (like avatars).
* Do not alter the color of the logo. The official logo color is `$hopbush`
(`#c69`).
* If you have to put the logo on a busy/colorful background, then you can
* If you have to put the logo on a busy/colorful background, then you can
use one of the reversed (on white) logos, provided here.
%p= link_to "Download vector logos", "/assets/img/styleguide/sass-logo.zip", class: "button primary"
@ -24,10 +24,10 @@ title: Brand Guidelines
%li= image_tag "styleguide/seal-color.png", height: "80"
%h3 White
%ul.list-tiled
%li.swatch-color-background-shade= image_tag "styleguide/white.png", height: "80"
%li.swatch-color-background-shade= image_tag "styleguide/seal-color-reversed.png", height: "80"
%li.swatch-color-background-shade= image_tag "styleguide/seal-black-reversed.png", height: "80"
%ul.list-tiled.swatch-color-background-shade
%li= image_tag "styleguide/white.png", height: "80"
%li= image_tag "styleguide/seal-color-reversed.png", height: "80"
%li= image_tag "styleguide/seal-black-reversed.png", height: "80"
%h3 Black
%ul.list-columns

View File

@ -21,16 +21,3 @@ title: Layouts & Grid
%dt
%code= "$" + resolution.target
%dd= resolution.width
%dl.guide-description-list
%dt
%code layout: layout_1_column
%dd
Add this to the yml data at the top of your pages to switch to a fuller
1-column layout (no sidebar).
%dl.guide-description-list
%dt
%code layout: layout_2_column
%dd
Use sidebar layout (this is the default setting, so you normally wouldn't
need to set this).