From 918e996179f2fdb58c892ffa5fdc5a24e08886fa Mon Sep 17 00:00:00 2001 From: Nick Muerdter Date: Thu, 20 Apr 2017 09:27:27 -0600 Subject: [PATCH] Update website to newer dependencies, so it's a bit easier to build. --- .gitignore | 1 + website/Gemfile | 22 +- website/Gemfile.lock | 220 ++++------ website/config.rb | 78 ++-- website/foobar/.gitignore | 5 + website/foobar/Gemfile | 6 + website/foobar/config.rb | 46 +++ .../main.js => foobar/source/images/.keep} | 0 website/foobar/source/index.html.erb | 23 ++ website/foobar/source/javascripts/site.js | 1 + website/foobar/source/layouts/layout.erb | 16 + .../foobar/source/stylesheets/site.css.scss | 24 ++ .../{jquery-1.11.0.js => _jquery-1.11.0.js} | 0 website/source/javascripts/_main.js | 0 .../{retina-1.1.0.js => _retina-1.1.0.js} | 0 website/source/javascripts/all.js | 6 +- website/source/layouts/layout.erb | 2 +- .../stylesheets/{main.css => _main.scss} | 0 .../stylesheets/{all.scss => all.css.scss} | 3 +- website/source/stylesheets/normalize.css | 375 ------------------ 20 files changed, 261 insertions(+), 567 deletions(-) create mode 100644 website/foobar/.gitignore create mode 100644 website/foobar/Gemfile create mode 100644 website/foobar/config.rb rename website/{source/javascripts/main.js => foobar/source/images/.keep} (100%) create mode 100644 website/foobar/source/index.html.erb create mode 100644 website/foobar/source/javascripts/site.js create mode 100644 website/foobar/source/layouts/layout.erb create mode 100644 website/foobar/source/stylesheets/site.css.scss rename website/source/javascripts/{jquery-1.11.0.js => _jquery-1.11.0.js} (100%) create mode 100644 website/source/javascripts/_main.js rename website/source/javascripts/{retina-1.1.0.js => _retina-1.1.0.js} (100%) rename website/source/stylesheets/{main.css => _main.scss} (100%) rename website/source/stylesheets/{all.scss => all.css.scss} (67%) delete mode 100644 website/source/stylesheets/normalize.css diff --git a/.gitignore b/.gitignore index 3b725cb00..c460978c9 100644 --- a/.gitignore +++ b/.gitignore @@ -39,4 +39,5 @@ /ci_cache /vendor /website/build +/website/.sass-cache /docs/_build diff --git a/website/Gemfile b/website/Gemfile index ac676edac..53b92b2d3 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,27 +1,19 @@ source "https://rubygems.org" -gem "middleman", "~> 3.3.7" +gem "middleman", "~> 4.2.1" -# Live-reloading plugin -gem "middleman-livereload", "~> 3.3.4" - -# For faster file watcher updates on Windows: -gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw] +# Assets +gem "middleman-sprockets", "~> 4.1.0" # For execjs -gem "therubyracer" +gem "mini_racer", "~> 0.1.9" # Deploy to GitHub Pages gem "middleman-gh-pages", "~> 0.3.1" # Markdown -gem "kramdown", "~> 1.5.0" - -# Deployment -gem "capistrano", "~> 3.3.5" -gem "capistrano-npm", "~> 1.0.1" -gem "dotenv", "~> 1.0.2" +gem "kramdown", "~> 1.13.2" # Assets -gem "bootstrap-sass", "~> 3.3.6" -gem "font-awesome-sass", "~> 4.6.2" +gem "bootstrap-sass", "~> 3.3.7" +gem "font-awesome-sass", "~> 4.7.0" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 4fb4499bd..bf3253695 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,175 +1,129 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.15) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) + activesupport (5.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (~> 0.7) minitest (~> 5.1) - thread_safe (~> 0.1) tzinfo (~> 1.1) - autoprefixer-rails (6.3.6.1) + addressable (2.5.1) + public_suffix (~> 2.0, >= 2.0.2) + autoprefixer-rails (6.7.7.2) execjs - bootstrap-sass (3.3.6) + backports (3.7.0) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - capistrano (3.3.5) - capistrano-stats (~> 1.1.0) - i18n - rake (>= 10.0.0) - sshkit (~> 1.3) - capistrano-npm (1.0.2) - capistrano (>= 3.0.0) - capistrano-stats (1.1.1) - celluloid (0.16.0) - timers (~> 4.0.0) - chunky_png (1.3.5) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) + coffee-script-source (1.12.2) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - dotenv (1.0.2) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + concurrent-ruby (1.0.5) + concurrent-ruby (1.0.5-java) + contracts (0.13.0) + dotenv (2.2.0) erubis (2.7.0) - eventmachine (1.2.0.1) - eventmachine (1.2.0.1-java) execjs (2.7.0) - ffi (1.9.10) - ffi (1.9.10-java) - font-awesome-sass (4.6.2) + fast_blank (1.0.0) + fastimage (2.1.0) + ffi (1.9.18) + ffi (1.9.18-java) + font-awesome-sass (4.7.0) sass (>= 3.2) haml (4.0.7) tilt - hike (1.2.3) - hitimes (1.2.4) - hitimes (1.2.4-java) - hooks (0.4.1) - uber (~> 0.0.14) - http_parser.rb (0.6.0) - http_parser.rb (0.6.0-java) + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (3.5.5) i18n (0.7.0) - json (1.8.3) - json (1.8.3-java) - kramdown (1.5.0) - libv8 (3.16.14.15) - listen (2.10.1) - celluloid (~> 0.16.0) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - middleman (3.3.12) + kramdown (1.13.2) + libv8 (5.3.332.38.5) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + memoist (0.15.0) + middleman (4.2.1) coffee-script (~> 2.2) - compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) - execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.12) - middleman-sprockets (>= 3.1.2) + middleman-cli (= 4.2.1) + middleman-core (= 4.2.1) sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) - middleman-core (3.3.12) - activesupport (~> 4.1.0) + middleman-cli (4.2.1) + thor (>= 0.17.0, < 2.0) + middleman-core (4.2.1) + activesupport (>= 4.2, < 5.1) + addressable (~> 2.3) + backports (~> 3.6) bundler (~> 1.1) + contracts (~> 0.13.0) + dotenv erubis - hooks (~> 0.3) + execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) + hamster (~> 3.0) + hashie (~> 3.4) i18n (~> 0.7.0) - listen (>= 2.7.9, < 3.0) - padrino-helpers (~> 0.12.3) - rack (>= 1.4.5, < 2.0) - rack-test (~> 0.6.2) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) + listen (~> 3.0.0) + memoist (~> 0.14) + padrino-helpers (~> 0.13.0) + parallel + rack (>= 1.4.5, < 3) + sass (>= 3.4) + servolux + tilt (~> 2.0) + uglifier (~> 3.0) middleman-gh-pages (0.3.1) rake (> 0.9.3) - middleman-livereload (3.3.4) - em-websocket (~> 0.5.1) - middleman-core (~> 3.2) - rack-livereload (~> 0.3.15) - middleman-sprockets (3.4.2) - middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) - minitest (5.9.0) - multi_json (1.12.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (3.1.1) - padrino-helpers (0.12.7) + middleman-sprockets (4.1.0) + middleman-core (~> 4.0) + sprockets (>= 3.0) + mini_racer (0.1.9) + libv8 (~> 5.3) + minitest (5.10.1) + padrino-helpers (0.13.3.3) i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.7) - tilt (~> 1.4.1) - padrino-support (0.12.7) + padrino-support (= 0.13.3.3) + tilt (>= 1.4.1, < 3) + padrino-support (0.13.3.3) activesupport (>= 3.1) - rack (1.6.4) - rack-livereload (0.3.16) - rack - rack-test (0.6.3) - rack (>= 1.0) - rake (11.1.2) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) + parallel (1.11.1) + public_suffix (2.0.5) + rack (2.0.1) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) ffi (>= 0.5.0) - ref (2.0.0) - sass (3.4.22) - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) - sshkit (1.10.0) - net-scp (>= 1.1.2) - net-ssh (>= 2.8.0) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) - ref - thor (0.19.1) - thread_safe (0.3.5) - thread_safe (0.3.5-java) - tilt (1.4.1) - timers (4.0.4) - hitimes - tzinfo (1.2.2) + sass (3.4.23) + servolux (0.13.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + thor (0.19.4) + thread_safe (0.3.6) + thread_safe (0.3.6-java) + tilt (2.0.7) + tzinfo (1.2.3) thread_safe (~> 0.1) - uber (0.0.15) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) PLATFORMS java ruby DEPENDENCIES - bootstrap-sass (~> 3.3.6) - capistrano (~> 3.3.5) - capistrano-npm (~> 1.0.1) - dotenv (~> 1.0.2) - font-awesome-sass (~> 4.6.2) - kramdown (~> 1.5.0) - middleman (~> 3.3.7) + bootstrap-sass (~> 3.3.7) + font-awesome-sass (~> 4.7.0) + kramdown (~> 1.13.2) + middleman (~> 4.2.1) middleman-gh-pages (~> 0.3.1) - middleman-livereload (~> 3.3.4) - therubyracer - wdm (~> 0.1.0) + middleman-sprockets (~> 4.1.0) + mini_racer (~> 0.1.9) BUNDLED WITH - 1.12.3 + 1.14.6 diff --git a/website/config.rb b/website/config.rb index 5275a58eb..61fbb39f6 100644 --- a/website/config.rb +++ b/website/config.rb @@ -1,51 +1,53 @@ -### -# Compass -### +# Activate and configure extensions +# https://middlemanapp.com/advanced/configuration/#configuring-extensions -# Change Compass configuration -# compass_config do |config| -# config.output_style = :compact +# activate :autoprefixer do |prefix| +# prefix.browsers = "last 2 versions" # end -### -# Page options, layouts, aliases and proxies -### +# Layouts +# https://middlemanapp.com/basics/layouts/ -# Per-page layout changes: -# -# With no layout -# page "/path/to/file.html", :layout => false -# -# With alternative layout -# page "/path/to/file.html", :layout => :otherlayout -# -# A path which all have the same layout - -# Proxy pages (http://middlemanapp.com/basics/dynamic-pages/) -# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => { -# :which_fake_page => "Rendering a fake page with a local variable" } +# Per-page layout changes +page '/*.xml', :layout => false +page '/*.json', :layout => false +page '/*.txt', :layout => false -### -# Helpers -### +# With alternative layout +# page '/path/to/file.html', layout: 'other_layout' -# Automatic image dimensions on image_tag helper -# activate :automatic_image_sizes +# Proxy pages +# https://middlemanapp.com/advanced/dynamic-pages/ -# Reload the browser automatically whenever files change -activate :livereload +# proxy( +# '/this-page-has-no-template.html', +# '/template-file.html', +# locals: { +# which_fake_page: 'Rendering a fake page with a local variable' +# }, +# ) +# Helpers # Methods defined in the helpers block are available in templates +# https://middlemanapp.com/basics/helper-methods/ + # helpers do # def some_helper -# "Helping" +# 'Helping' # end # end -set :css_dir, 'stylesheets' +# Build-specific configuration +# https://middlemanapp.com/advanced/configuration/#environment-specific-settings -set :js_dir, 'javascripts' +# configure :build do +# activate :minify_css +# activate :minify_javascript +# end +set :css_dir, 'stylesheets' +set :js_dir, 'javascripts' +set :fonts_dir, 'fonts' set :images_dir, 'images' # Build-specific configuration @@ -59,14 +61,15 @@ # Enable cache buster activate :asset_hash - # Use relative URLs - activate :relative_assets - set :relative_links, true - # Or use a different image path # set :http_prefix, "/Content/images/" end +# Use relative URLs +activate :relative_assets +set :relative_links, true + +activate :sprockets activate :directory_indexes set :markdown_engine, :kramdown @@ -75,9 +78,6 @@ :smart_quotes => ['apos', 'apos', 'quot', 'quot'], } -ignore "chef/*" -ignore "workspace/*" - redirect "docs/admin-api.html", :to => "https://api-umbrella.readthedocs.org/en/latest/admin/api.html" redirect "docs/admin-customize-public-website.html", :to => "https://api-umbrella.readthedocs.org/en/latest/" redirect "docs/api-keys.html", :to => "https://api-umbrella.readthedocs.org/en/latest/api-consumer/api-key-usage.html" diff --git a/website/foobar/.gitignore b/website/foobar/.gitignore new file mode 100644 index 000000000..0dcc3ec01 --- /dev/null +++ b/website/foobar/.gitignore @@ -0,0 +1,5 @@ +.bundle +.cache +.DS_Store +.sass-cache +build/ diff --git a/website/foobar/Gemfile b/website/foobar/Gemfile new file mode 100644 index 000000000..180cfa251 --- /dev/null +++ b/website/foobar/Gemfile @@ -0,0 +1,6 @@ +source 'https://rubygems.org' + +gem 'middleman', '~> 4.2' +gem 'middleman-autoprefixer', '~> 2.7' +gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby] +gem 'wdm', '~> 0.1', platforms: [:mswin, :mingw] diff --git a/website/foobar/config.rb b/website/foobar/config.rb new file mode 100644 index 000000000..71ec8701c --- /dev/null +++ b/website/foobar/config.rb @@ -0,0 +1,46 @@ +# Activate and configure extensions +# https://middlemanapp.com/advanced/configuration/#configuring-extensions + +activate :autoprefixer do |prefix| + prefix.browsers = "last 2 versions" +end + +# Layouts +# https://middlemanapp.com/basics/layouts/ + +# Per-page layout changes +page '/*.xml', layout: false +page '/*.json', layout: false +page '/*.txt', layout: false + +# With alternative layout +# page '/path/to/file.html', layout: 'other_layout' + +# Proxy pages +# https://middlemanapp.com/advanced/dynamic-pages/ + +# proxy( +# '/this-page-has-no-template.html', +# '/template-file.html', +# locals: { +# which_fake_page: 'Rendering a fake page with a local variable' +# }, +# ) + +# Helpers +# Methods defined in the helpers block are available in templates +# https://middlemanapp.com/basics/helper-methods/ + +# helpers do +# def some_helper +# 'Helping' +# end +# end + +# Build-specific configuration +# https://middlemanapp.com/advanced/configuration/#environment-specific-settings + +# configure :build do +# activate :minify_css +# activate :minify_javascript +# end diff --git a/website/source/javascripts/main.js b/website/foobar/source/images/.keep similarity index 100% rename from website/source/javascripts/main.js rename to website/foobar/source/images/.keep diff --git a/website/foobar/source/index.html.erb b/website/foobar/source/index.html.erb new file mode 100644 index 000000000..7147cc5a6 --- /dev/null +++ b/website/foobar/source/index.html.erb @@ -0,0 +1,23 @@ +--- +title: Welcome to Middleman +--- + + + +

+ Middleman is Running +

+ +<%= link_to( + "Read Documentation", + "https://middlemanapp.com/basics/templating_language/", + target: "_blank" +) %> diff --git a/website/foobar/source/javascripts/site.js b/website/foobar/source/javascripts/site.js new file mode 100644 index 000000000..9de6ff3fc --- /dev/null +++ b/website/foobar/source/javascripts/site.js @@ -0,0 +1 @@ +// This is where it all goes :) diff --git a/website/foobar/source/layouts/layout.erb b/website/foobar/source/layouts/layout.erb new file mode 100644 index 000000000..18f6a2200 --- /dev/null +++ b/website/foobar/source/layouts/layout.erb @@ -0,0 +1,16 @@ + + + + + + + + <%= current_page.data.title || "Middleman" %> + <%= stylesheet_link_tag "site" %> + <%= javascript_include_tag "site" %> + + + <%= yield %> + + diff --git a/website/foobar/source/stylesheets/site.css.scss b/website/foobar/source/stylesheets/site.css.scss new file mode 100644 index 000000000..fda2be773 --- /dev/null +++ b/website/foobar/source/stylesheets/site.css.scss @@ -0,0 +1,24 @@ +body { + background-color: #fbc547; + color: #333; + font-family: -apple-system, BlinkMacSystemFont, "Avenir Next", "Avenir", + "Segoe UI", "Lucida Grande", "Helvetica Neue", "Helvetica", "Fira Sans", + "Roboto", "Noto", "Droid Sans", "Cantarell", "Oxygen", "Ubuntu", + "Franklin Gothic Medium", "Century Gothic", "Liberation Sans", sans-serif; + padding: 18vh 1rem; + text-align: center; +} + +a { + color: rgba(#000, 0.7); + + &:focus, + &:hover { + color: rgba(#000, 0.6); + } +} + +.middleman-logo { + margin-bottom: 1rem; + width: 10rem; +} diff --git a/website/source/javascripts/jquery-1.11.0.js b/website/source/javascripts/_jquery-1.11.0.js similarity index 100% rename from website/source/javascripts/jquery-1.11.0.js rename to website/source/javascripts/_jquery-1.11.0.js diff --git a/website/source/javascripts/_main.js b/website/source/javascripts/_main.js new file mode 100644 index 000000000..e69de29bb diff --git a/website/source/javascripts/retina-1.1.0.js b/website/source/javascripts/_retina-1.1.0.js similarity index 100% rename from website/source/javascripts/retina-1.1.0.js rename to website/source/javascripts/_retina-1.1.0.js diff --git a/website/source/javascripts/all.js b/website/source/javascripts/all.js index da4d42796..4ae69a912 100644 --- a/website/source/javascripts/all.js +++ b/website/source/javascripts/all.js @@ -1,4 +1,4 @@ -//= require "jquery-1.11.0" +//= require "_jquery-1.11.0" //= require "bootstrap" -//= require "retina-1.1.0" -//= require "main" +//= require "_retina-1.1.0" +//= require "_main" diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index 945476360..7872abe99 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -66,7 +66,7 @@ <%= yield %>
- Help Improve this Content + Help Improve this Content
diff --git a/website/source/stylesheets/main.css b/website/source/stylesheets/_main.scss similarity index 100% rename from website/source/stylesheets/main.css rename to website/source/stylesheets/_main.scss diff --git a/website/source/stylesheets/all.scss b/website/source/stylesheets/all.css.scss similarity index 67% rename from website/source/stylesheets/all.scss rename to website/source/stylesheets/all.css.scss index 4e7420c4e..faa4c957d 100644 --- a/website/source/stylesheets/all.scss +++ b/website/source/stylesheets/all.css.scss @@ -2,5 +2,6 @@ $grid-float-breakpoint: 900px; @import "bootstrap-sprockets"; @import "bootstrap"; +@import "font-awesome-sprockets"; @import "font-awesome"; -@import "main"; +@import "_main"; diff --git a/website/source/stylesheets/normalize.css b/website/source/stylesheets/normalize.css deleted file mode 100644 index 73abb76fa..000000000 --- a/website/source/stylesheets/normalize.css +++ /dev/null @@ -1,375 +0,0 @@ -/*! normalize.css v2.0.1 | MIT License | git.io/normalize */ - -/* ========================================================================== - HTML5 display definitions - ========================================================================== */ - -/* - * Corrects `block` display not defined in IE 8/9. - */ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section, -summary { - display: block; -} - -/* - * Corrects `inline-block` display not defined in IE 8/9. - */ - -audio, -canvas, -video { - display: inline-block; -} - -/* - * Prevents modern browsers from displaying `audio` without controls. - * Remove excess height in iOS 5 devices. - */ - -audio:not([controls]) { - display: none; - height: 0; -} - -/* - * Addresses styling for `hidden` attribute not present in IE 8/9. - */ - -[hidden] { - display: none; -} - -/* ========================================================================== - Base - ========================================================================== */ - -/* - * 1. Sets default font family to sans-serif. - * 2. Prevents iOS text size adjust after orientation change, without disabling - * user zoom. - */ - -html { - font-family: sans-serif; /* 1 */ - -webkit-text-size-adjust: 100%; /* 2 */ - -ms-text-size-adjust: 100%; /* 2 */ -} - -/* - * Removes default margin. - */ - -body { - margin: 0; -} - -/* ========================================================================== - Links - ========================================================================== */ - -/* - * Addresses `outline` inconsistency between Chrome and other browsers. - */ - -a:focus { - outline: thin dotted; -} - -/* - * Improves readability when focused and also mouse hovered in all browsers. - */ - -a:active, -a:hover { - outline: 0; -} - -/* ========================================================================== - Typography - ========================================================================== */ - -/* - * Addresses `h1` font sizes within `section` and `article` in Firefox 4+, - * Safari 5, and Chrome. - */ - -h1 { - font-size: 2em; -} - -/* - * Addresses styling not present in IE 8/9, Safari 5, and Chrome. - */ - -abbr[title] { - border-bottom: 1px dotted; -} - -/* - * Addresses style set to `bolder` in Firefox 4+, Safari 5, and Chrome. - */ - -b, -strong { - font-weight: bold; -} - -/* - * Addresses styling not present in Safari 5 and Chrome. - */ - -dfn { - font-style: italic; -} - -/* - * Addresses styling not present in IE 8/9. - */ - -mark { - background: #ff0; - color: #000; -} - - -/* - * Corrects font family set oddly in Safari 5 and Chrome. - */ - -code, -kbd, -pre, -samp { - font-family: monospace, serif; - font-size: 1em; -} - -/* - * Improves readability of pre-formatted text in all browsers. - */ - -pre { - white-space: pre; - white-space: pre-wrap; - word-wrap: break-word; -} - -/* - * Sets consistent quote types. - */ - -q { - quotes: "\201C" "\201D" "\2018" "\2019"; -} - -/* - * Addresses inconsistent and variable font size in all browsers. - */ - -small { - font-size: 80%; -} - -/* - * Prevents `sub` and `sup` affecting `line-height` in all browsers. - */ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sup { - top: -0.5em; -} - -sub { - bottom: -0.25em; -} - -/* ========================================================================== - Embedded content - ========================================================================== */ - -/* - * Removes border when inside `a` element in IE 8/9. - */ - -img { - border: 0; -} - -/* - * Corrects overflow displayed oddly in IE 9. - */ - -svg:not(:root) { - overflow: hidden; -} - -/* ========================================================================== - Figures - ========================================================================== */ - -/* - * Addresses margin not present in IE 8/9 and Safari 5. - */ - -figure { - margin: 0; -} - -/* ========================================================================== - Forms - ========================================================================== */ - -/* - * Define consistent border, margin, and padding. - */ - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -/* - * 1. Corrects color not being inherited in IE 8/9. - * 2. Remove padding so people aren't caught out if they zero out fieldsets. - */ - -legend { - border: 0; /* 1 */ - padding: 0; /* 2 */ -} - -/* - * 1. Corrects font family not being inherited in all browsers. - * 2. Corrects font size not being inherited in all browsers. - * 3. Addresses margins set differently in Firefox 4+, Safari 5, and Chrome - */ - -button, -input, -select, -textarea { - font-family: inherit; /* 1 */ - font-size: 100%; /* 2 */ - margin: 0; /* 3 */ -} - -/* - * Addresses Firefox 4+ setting `line-height` on `input` using `!important` in - * the UA stylesheet. - */ - -button, -input { - line-height: normal; -} - -/* - * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` - * and `video` controls. - * 2. Corrects inability to style clickable `input` types in iOS. - * 3. Improves usability and consistency of cursor style between image-type - * `input` and others. - */ - -button, -html input[type="button"], /* 1 */ -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; /* 2 */ - cursor: pointer; /* 3 */ -} - -/* - * Re-set default cursor for disabled elements. - */ - -button[disabled], -input[disabled] { - cursor: default; -} - -/* - * 1. Addresses box sizing set to `content-box` in IE 8/9. - * 2. Removes excess padding in IE 8/9. - */ - -input[type="checkbox"], -input[type="radio"] { - box-sizing: border-box; /* 1 */ - padding: 0; /* 2 */ -} - -/* - * 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. - * 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome - * (include `-moz` to future-proof). - */ - -input[type="search"] { - -webkit-appearance: textfield; /* 1 */ - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; /* 2 */ - box-sizing: content-box; -} - -/* - * Removes inner padding and search cancel button in Safari 5 and Chrome - * on OS X. - */ - -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -/* - * Removes inner padding and border in Firefox 4+. - */ - -button::-moz-focus-inner, -input::-moz-focus-inner { - border: 0; - padding: 0; -} - -/* - * 1. Removes default vertical scrollbar in IE 8/9. - * 2. Improves readability and alignment in all browsers. - */ - -textarea { - overflow: auto; /* 1 */ - vertical-align: top; /* 2 */ -} - -/* ========================================================================== - Tables - ========================================================================== */ - -/* - * Remove most spacing between table cells. - */ - -table { - border-collapse: collapse; - border-spacing: 0; -} \ No newline at end of file