diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..cc48978 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "assets/vendor" +} diff --git a/.gitattributes b/.gitattributes index 412eeda..dfe0770 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,22 +1,2 @@ # Auto detect text files and perform LF normalization * text=auto - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 2487073..26495ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,170 +1,10 @@ -################# -## Eclipse -################# - -*.pydevproject -.project -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results -[Dd]ebug/ -[Rr]elease/ -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.vspscc -.builds -*.dotCover - -## TODO: If you have NuGet Package Restore enabled, uncomment this -#packages/ - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf - -# Visual Studio profiler -*.psess -*.vsp - -# ReSharper is a .NET coding add-in -_ReSharper* - -# Installshield output folder -[Ee]xpress - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish - -# Others -[Bb]in -[Oo]bj -sql -TestResults -*.Cache -ClientBin -stylecop.* -~$* -*.dbmdl -Generated_Code #added for RIA/Silverlight projects - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML - - - -############ -## Windows -############ - -# Windows image file caches -Thumbs.db - -# Folder config file -Desktop.ini - - -############# -## Python -############# - -*.py[co] - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg - -# Mac crap .DS_Store - -# .NET crap -.config - -#jekyll -_site -node_modules \ No newline at end of file +/_site +/node_modules +/.bundle +assets/vendor/zeroclipboard/docs +assets/vendor/zeroclipboard/src +assets/vendor/zeroclipboard/test +assets/vendor/selectivizr/tests +assets/vendor/qtip2/basic +/vendor diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..227cea2 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.0.0 diff --git a/.travis.yml b/.travis.yml index f9d70f9..1b743c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,5 +4,13 @@ script: "./script/cibuild" #environment language: ruby -rvm: - - 1.9.3 \ No newline at end of file +rvm: + - 2.0.0 + +branches: + only: + - gh-pages + - /.*/ + +notifications: + email: false diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba55c10..04435d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,13 +4,13 @@ We love Pull Requests! Your contributions help make ChooseALicense.com great. ## Getting Started -So you want to contribute to ChooseALicense. Great! We welcome any help we can -get. But first, please make sure you understand what +So you want to contribute to ChooseALicense. Great! We welcome any help we can +get. But first, please make sure you understand what [this site is all about](http://choosealicense.com/about). It’s not a comprehensive list of all possible licenses. -If you understand the goals of this site and still want to suggest a change, +If you understand the goals of this site and still want to suggest a change, please: * Make sure you have a [GitHub account](https://github.com/signup/free) @@ -20,13 +20,22 @@ please: ## Making Changes -The easiest way to make a change is to simply edit a file from your browser. +The easiest way to make a change is to simply edit a file from your browser. When you click the edit button, it will fork the repository under your account. Note what issue/issues your patch fixes in the commit message. -For example, to [change this file](https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md), -find it in the GitHub repository. Then click the `Edit` button. Make your +For example, to [change this file](https://github.com/github/choosealicense.com/blob/master/CONTRIBUTING.md), +find it in the GitHub repository. Then click the `Edit` button. Make your changes, type in a commit message, and click the `Propose File Change` button. That’s it! For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](https://github.com/github/choosealicense.com/blob/master/README.md). + +## Testing + +[HTML::Proofer](https://github.com/gjtorikian/html-proofer) is set up to validate all links within the project. You can run this locally to ensure that your changes are valid: + +```shell +./script/bootstrap +./script/cibuild +``` diff --git a/Gemfile b/Gemfile index ec75eef..d1d35c1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,9 @@ -source 'https://rubygems.org' +source "https://rubygems.org" +ruby File.read(".ruby-version").strip -gem "jekyll", '=1.0.3' -gem 'liquid', '=2.5.0' -gem 'redcarpet', '=2.2.2' \ No newline at end of file +gem "github-pages" + +group :test do + gem "html-proofer" + gem "rake" +end diff --git a/Gemfile.lock b/Gemfile.lock index e6b3cc1..e231bc7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,81 @@ GEM remote: https://rubygems.org/ specs: - classifier (1.3.3) + RedCloth (4.2.9) + blankslate (2.1.2.4) + classifier (1.3.4) fast-stemmer (>= 1.0.0) colorator (0.1) - commander (4.1.3) + colored (1.2) + commander (4.1.5) highline (~> 1.6.11) - directory_watcher (1.4.1) + ethon (0.6.2) + ffi (>= 1.3.0) + mime-types (~> 1.18) fast-stemmer (1.0.2) - highline (1.6.19) - jekyll (1.0.3) + ffi (1.9.3) + github-pages (12) + RedCloth (= 4.2.9) + jekyll (= 1.4.2) + kramdown (= 1.2.0) + liquid (= 2.5.4) + maruku (= 0.7.0) + rdiscount (= 2.1.7) + redcarpet (= 2.3.0) + highline (1.6.20) + html-proofer (0.4.1) + colored (~> 1.2) + mercenary (~> 0.2.0) + nokogiri (~> 1.6.0) + typhoeus (~> 0.6.7) + jekyll (1.4.2) classifier (~> 1.3) colorator (~> 0.1) commander (~> 4.1.3) - directory_watcher (~> 1.4.1) - kramdown (~> 1.0.2) - liquid (~> 2.3) - maruku (~> 0.5) + liquid (~> 2.5.2) + listen (~> 1.3) + maruku (~> 0.7.0) pygments.rb (~> 0.5.0) - safe_yaml (~> 0.7.0) - kramdown (1.0.2) - liquid (2.5.0) - maruku (0.6.1) - syntax (>= 1.0.0) - posix-spawn (0.3.6) - pygments.rb (0.5.1) + redcarpet (~> 2.3.0) + safe_yaml (~> 0.9.7) + toml (~> 0.1.0) + kramdown (1.2.0) + liquid (2.5.4) + listen (1.3.1) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + rb-kqueue (>= 0.2) + maruku (0.7.0) + mercenary (0.2.1) + mime-types (1.25.1) + mini_portile (0.5.2) + nokogiri (1.6.1) + mini_portile (~> 0.5.0) + parslet (1.5.0) + blankslate (~> 2.0) + posix-spawn (0.3.8) + pygments.rb (0.5.4) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) - redcarpet (2.2.2) - safe_yaml (0.7.1) - syntax (1.0.0) + rake (10.1.1) + rb-fsevent (0.9.4) + rb-inotify (0.9.3) + ffi (>= 0.5.0) + rb-kqueue (0.2.0) + ffi (>= 0.5.0) + rdiscount (2.1.7) + redcarpet (2.3.0) + safe_yaml (0.9.7) + toml (0.1.0) + parslet (~> 1.5.0) + typhoeus (0.6.7) + ethon (~> 0.6.2) yajl-ruby (1.1.0) PLATFORMS ruby DEPENDENCIES - jekyll (= 1.0.3) - liquid (= 2.5.0) - redcarpet (= 2.2.2) + github-pages + html-proofer + rake diff --git a/LICENSE.md b/LICENSE.md index 5edc1a7..2a344f7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2013 GitHub, Inc. +Copyright (c) 2014 GitHub, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/README.md b/README.md index a578ee9..ee2b8ff 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,44 @@ -# Choose a License Web Site +# Choose a License Web Site [![Build Status](https://travis-ci.org/github/choosealicense.com.png?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com) Like a Choose Your Own Adventure site, but only much less interesting. # Intro A lot of repositories on GitHub.com don't have a license. GitHub provides -a license chooser, but if you don't know anything about licenses, how are you -supposed to make an informed decision. +a license chooser, but if you don't know anything about licenses, how are you +supposed to make an informed decision? -ChooseALicense.com is designed to help people make an informed decision about -licenses. +ChooseALicense.com is designed to help people make an informed decision about +licenses. # Immediate Goals * Politics Free - Let's just not get into it. * Well designed, but that goes without saying. * The homepage should have just enough to help 99% of folks make a decision. -* For the 1%, the site will contain a list of licenses common for specific +* For the 1%, the site will contain a list of licenses common to specific communities and situations. -* Not comprehensive. Seems like an odd goal, but there are a bajillion -(I counted) licenses out there. We're going to have to filter that down to a +* Not comprehensive. Seems like an odd goal, but there are a bajillion +licenses out there. We're going to have to filter that down to a small list of those that matter. # Run It On Your Machine -1. `git clone https://github.com/github/choosealicense.com` -2. `cd choosealicense.com` -3. `script/bootstrap` -4. `script/server` -5. Open [localhost:4000](http://localhost:4000) in your favorite browser +```bash +git clone https://github.com/github/choosealicense.com.git +cd choosealicense.com +script/bootstrap +script/server +``` +Open `http://localhost:4000` in your favorite browser. # Adding a license -Licenses sit in the `/licenses` folder as markdown (`.md`) files. Each license has YAML front matter describing the license's properties. The body of the markdown file should be the text of the license. The available metadata fields are: +The text of the license should be wrapped to a 78 character width. + +Licenses sit in the `/licenses` folder. Each license has YAML front matter +describing the license's properties. The body of the file should be the text +of the license in plain text. The available metadata fields are: * `title` - The name of the license * `layout` - This should be `license` @@ -43,7 +49,11 @@ Licenses sit in the `/licenses` folder as markdown (`.md`) files. Each license h * `required`, `permitted`, `forbidden` - bulleted list of rules applicable to the license (see below) * `filename` - The filename to be created on GitHub.com when a repository is initialized with this license. -The licenses on choosealicense.com are regularly imported to GitHub.com to be used as the list of licenses available when creating a repository. When we create a repository, we will replace certain strings in the license with variables from the repository. These can be used to create accurate copyright notices. The available variables are: +The licenses on choosealicense.com are regularly imported to GitHub.com to be +used as the list of licenses available when creating a repository. When we +create a repository, we will replace certain strings in the license with +variables from the repository. These can be used to create accurate copyright +notices. The available variables are: * `[fullname]` - The full name or username of the repository owner * `[login]` - The repository owner's username @@ -52,10 +62,19 @@ The licenses on choosealicense.com are regularly imported to GitHub.com to be us * `[description]` - The description of the repository * `[year]` - The current year -# Rules +# Rules -* Rules (the license's properties) are stored as a bulleted list within the licenses YAML front matter. A full list of rules can be found in the repository's `_config.yml` file. Each rule has a name e.g., `include-copyright`, a human-readable label, e.g., `Copyright inclusion`, and a description `Include the original copyright with the code`. To add a new rule, simply add it to config.yml and reference it in the appropriate license. +Rules (the license's properties) are stored as a bulleted list within the +licenses YAML front matter. A full list of rules can be found in the +repository's `_config.yml` file. Each rule has a name e.g., +`include-copyright`, a human-readable label, e.g., `Copyright inclusion`, +and a description `Include the original copyright with the code`. +To add a new rule, simply add it to `config.yml` and reference it in the +appropriate license. # License -The content of this project itself is licensed under the [Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), and the underlying source code used to format and display that content is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php). +The content of this project itself is licensed under the +[Creative Commons Attribution 3.0 license](http://creativecommons.org/licenses/by/3.0/us/deed.en_US), +and the underlying source code used to format and display that content +is licensed under the [MIT license](http://opensource.org/licenses/mit-license.php). diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..ed29cdb --- /dev/null +++ b/Rakefile @@ -0,0 +1,7 @@ +require "html/proofer" + +task :test do + sh "bundle exec jekyll build --trace" + # ignore href="#" for the "Copy to clipboard" button + HTML::Proofer.new("./_site").run +end diff --git a/_config.yml b/_config.yml index ed961da..e38fb71 100644 --- a/_config.yml +++ b/_config.yml @@ -1,67 +1,77 @@ +--- title: ChooseALicense.com relative_permalinks: false -markdown: redcarpet +markdown: kramdown +url: "http://choosealicense.com" rules: required: - include-copyright: - description: Include a copy of the license and copyright notice with the code. - label: License and copyright notice - document-changes: - description: Indicate significant changes made to the code. - label: State Changes - disclose-source: - description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available. - label: Disclose Source - library-usage: - description: The library may be used within a non-open-source application. - label: Library usage - rename: - description: You must change the name of the software if you modify it. - label: Rename + - description: Include a copy of the license and copyright notice with the code. + label: License and copyright notice + tag: include-copyright + - description: Indicate significant changes made to the code. + label: State Changes + tag: document-changes + - description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available. + label: Disclose Source + tag: disclose-source + - description: The library may be used within a non-open-source application. + label: Library usage + tag: library-usage + - description: You must change the name of the software if you modify it. + label: Rename + tag: rename permitted: - commercial-use: - description: This software and derivatives may be used for commercial purposes. - label: Commercial Use - modifications: - description: This software may be modified. - label: Modification - distribution: - description: You may distribute this software. - label: Distribution - sublicense: - description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. - label: Sublicensing - private-use: - description: You may use and modify the software without distributing it. - label: Private Use - patent-grant: - description: This license provides an express grant of patent rights from the contributor to the recipient. - label: Patent Grant + - description: This software and derivatives may be used for commercial purposes. + label: Commercial Use + tag: commercial-use + - description: This software may be modified. + label: Modification + tag: modifications + - description: You may distribute this software. + label: Distribution + tag: distribution + - description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. + label: Sublicensing + tag: sublicense + - description: You may use and modify the software without distributing it. + label: Private Use + tag: private-use + - description: This license provides an express grant of patent rights from the contributor to the recipient. + label: Patent Grant + tag: patent-grant forbidden: - trademark-use: - description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. - label: Use Trademark - no-liability: - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. - label: Hold Liable - no-sublicense: - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. - label: Sublicensing - modifications: - description: This software may not be modified. - label: Modification - distribution: - description: You may not distribute this software. - label: Distribution - sublicense: - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. - label: Sublicensing + - description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. + label: Use Trademark + tag: trademark-use + - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. + label: Hold Liable + tag: no-liability + - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. + label: Sublicensing + tag: no-sublicense + - description: This software may not be modified. + label: Modification + tag: modifications + - description: You may not distribute this software. + label: Distribution + tag: distribution + - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. + label: Sublicensing + tag: sublicense exclude: - - CNAME - - Gemfile* - - script +- app.coffee +- CNAME +- CONTRIBUTING.md +- Gemfile +- Gemfile.lock +- LICENSE.md +- licenses.json +- Rakefile +- README.md +- script +- bundle diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index 2022d5a..ec8909f 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -1,5 +1,5 @@ {% unless page.hide_breadcrumbs == true %} -
    +
    1. {% if page.layout == "license" %} Home / Licenses diff --git a/_includes/css/jquery.qtip.min.css b/_includes/css/jquery.qtip.min.css new file mode 100644 index 0000000..fc172a4 --- /dev/null +++ b/_includes/css/jquery.qtip.min.css @@ -0,0 +1,2 @@ +/* qTip2 v2.2.0 basic css3 | qtip2.com | Licensed MIT, GPL | Thu Nov 21 2013 20:35:00 */ +.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;direction:ltr;box-shadow:none;padding:0}.qtip-content{position:relative;padding:5px 9px;overflow:hidden;text-align:left;word-wrap:break-word}.qtip-titlebar{position:relative;padding:5px 35px 5px 10px;overflow:hidden;border-width:0 0 1px;font-weight:700}.qtip-titlebar+.qtip-content{border-top-width:0!important}.qtip-close{position:absolute;right:-9px;top:-9px;cursor:pointer;outline:medium none;border-width:1px;border-style:solid;border-color:transparent}.qtip-titlebar .qtip-close{right:4px;top:50%;margin-top:-9px}* html .qtip-titlebar .qtip-close{top:16px}.qtip-titlebar .ui-icon,.qtip-icon .ui-icon{display:block;text-indent:-1000em;direction:ltr}.qtip-icon,.qtip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none}.qtip-icon .ui-icon{width:18px;height:14px;line-height:14px;text-align:center;text-indent:0;font:400 bold 10px/13px Tahoma,sans-serif;color:inherit;background:transparent none no-repeat -100em -100em}.qtip-focus{}.qtip-hover{}.qtip-default{border-width:1px;border-style:solid;border-color:#F1D031;background-color:#FFFFA3;color:#555}.qtip-default .qtip-titlebar{background-color:#FFEF93}.qtip-default .qtip-icon{border-color:#CCC;background:#F1F1F1;color:#777}.qtip-default .qtip-titlebar .qtip-close{border-color:#AAA;color:#111} .qtip-light{background-color:#fff;border-color:#E2E2E2;color:#454545}.qtip-light .qtip-titlebar{background-color:#f1f1f1} .qtip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3}.qtip-dark .qtip-titlebar{background-color:#404040}.qtip-dark .qtip-icon{border-color:#444}.qtip-dark .qtip-titlebar .ui-state-hover{border-color:#303030} .qtip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35}.qtip-cream .qtip-titlebar{background-color:#F0DE7D}.qtip-cream .qtip-close .qtip-icon{background-position:-82px 0} .qtip-red{background-color:#F78B83;border-color:#D95252;color:#912323}.qtip-red .qtip-titlebar{background-color:#F06D65}.qtip-red .qtip-close .qtip-icon{background-position:-102px 0}.qtip-red .qtip-icon{border-color:#D95252}.qtip-red .qtip-titlebar .ui-state-hover{border-color:#D95252} .qtip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219}.qtip-green .qtip-titlebar{background-color:#B0DE78}.qtip-green .qtip-close .qtip-icon{background-position:-42px 0} .qtip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD}.qtip-blue .qtip-titlebar{background-color:#D0E9F5}.qtip-blue .qtip-close .qtip-icon{background-position:-2px 0}.qtip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,.15)}.qtip-rounded,.qtip-tipsy,.qtip-bootstrap{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.qtip-rounded .qtip-titlebar{-moz-border-radius:4px 4px 0 0;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.qtip-youtube{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:#fff;border-width:0;background:#4A4A4A;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,#000));background-image:-webkit-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-moz-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-ms-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-o-linear-gradient(top,#4A4A4A 0,#000 100%)}.qtip-youtube .qtip-titlebar{background-color:#4A4A4A;background-color:rgba(0,0,0,0)}.qtip-youtube .qtip-content{padding:.75em;font:12px arial,sans-serif;filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);-ms-filter:"progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);"}.qtip-youtube .qtip-icon{border-color:#222}.qtip-youtube .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-jtools{background:#232323;background:rgba(0,0,0,.7);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-linear-gradient(top,#717171,#232323);background-image:-ms-linear-gradient(top,#717171,#232323);background-image:-o-linear-gradient(top,#717171,#232323);border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.qtip-jtools .qtip-titlebar{background-color:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A)"}.qtip-jtools .qtip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323)"}.qtip-jtools .qtip-titlebar,.qtip-jtools .qtip-content{background:transparent;color:#fff;border:0 dashed transparent}.qtip-jtools .qtip-icon{border-color:#555}.qtip-jtools .qtip-titlebar .ui-state-hover{border-color:#333}.qtip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,.4);box-shadow:4px 4px 5px rgba(0,0,0,.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent}.qtip-cluetip .qtip-titlebar{background-color:#87876A;color:#fff;border:0 dashed transparent}.qtip-cluetip .qtip-icon{border-color:#808064}.qtip-cluetip .qtip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.qtip-tipsy{background:#000;background:rgba(0,0,0,.87);color:#fff;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:700;line-height:16px;text-shadow:0 1px #000}.qtip-tipsy .qtip-titlebar{padding:6px 35px 0 10px;background-color:transparent}.qtip-tipsy .qtip-content{padding:6px 10px}.qtip-tipsy .qtip-icon{border-color:#222;text-shadow:none}.qtip-tipsy .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:400;font-family:serif}.qtip-tipped .qtip-titlebar{border-bottom-width:0;color:#fff;background:#3A79B8;background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));background-image:-webkit-linear-gradient(top,#3A79B8,#2E629D);background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-ms-linear-gradient(top,#3A79B8,#2E629D);background-image:-o-linear-gradient(top,#3A79B8,#2E629D);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D)"}.qtip-tipped .qtip-icon{border:2px solid #285589;background:#285589}.qtip-tipped .qtip-icon .ui-icon{background-color:#FBFBFB;color:#555}.qtip-bootstrap{font-size:14px;line-height:20px;color:#333;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.qtip-bootstrap .qtip-titlebar{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.qtip-bootstrap .qtip-titlebar .qtip-close{right:11px;top:45%;border-style:none}.qtip-bootstrap .qtip-content{padding:9px 14px}.qtip-bootstrap .qtip-icon{background:transparent}.qtip-bootstrap .qtip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:700;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.qtip-bootstrap .qtip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}.qtip:not(.ie9haxors) div.qtip-content,.qtip:not(.ie9haxors) div.qtip-titlebar{filter:none;-ms-filter:none}.qtip .qtip-tip{margin:0 auto;overflow:hidden;z-index:10}x:-o-prefocus,.qtip .qtip-tip{visibility:hidden}.qtip .qtip-tip,.qtip .qtip-tip .qtip-vml,.qtip .qtip-tip canvas{position:absolute;color:#123456;background:transparent;border:0 dashed transparent}.qtip .qtip-tip canvas{top:0;left:0}.qtip .qtip-tip .qtip-vml{behavior:url(#default#VML);display:inline-block;visibility:visible}#qtip-overlay{position:fixed;left:0;top:0;width:100%;height:100%}#qtip-overlay.blurs{cursor:pointer}#qtip-overlay div{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#000;opacity:.7;filter:alpha(opacity=70);-ms-filter:"alpha(Opacity=70)"}.qtipmodal-ie6fix{position:absolute!important} \ No newline at end of file diff --git a/_includes/css/normalize.min.css b/_includes/css/normalize.min.css new file mode 100644 index 0000000..7f26c03 --- /dev/null +++ b/_includes/css/normalize.min.css @@ -0,0 +1 @@ +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0} \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 421dd14..c9c56c2 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,30 +1,27 @@ -