1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-28 22:53:04 +02:00

Merge pull request #254 from github/scss

Use Sass
This commit is contained in:
Ben Balter 2015-04-19 10:10:58 +10:00
commit bb51e2898f
8 changed files with 16 additions and 8 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ assets/vendor/selectivizr/tests
assets/vendor/qtip2/basic
/vendor
Gemfile.lock
/.sass-cache

View File

@ -34,7 +34,11 @@ exclude:
- tests
- assets/vendor/selectivizr/tests
- assets/vendor/zeroclipboard/test
gems:
- jekyll-sitemap
- jekyll-redirect-from
sass:
sass_dir: _sass
style: :compressed

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
/*! 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}

View File

@ -6,9 +6,7 @@
<title>{% if page.title %}{{ page.title | markdownify | strip_html | strip_newlines }} - {% endif %}{{ site.title}}</title>
{% if page.description %}<meta name="description" content="{{ page.description | strip_html | strip_newlines }}">{% endif %}
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Chivo:900">
<link rel="stylesheet" href="/assets/vendor/normalize-css/normalize.css">
<link rel="stylesheet" href="/assets/vendor/qtip2/jquery.qtip.min.css">
<link rel="stylesheet" href="/assets/css/application.css">
<link rel="stylesheet" href="/assets/css/application.css?v={{ site.github.build_revision }}">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<!--[if lt IE 9]>
<script src="/assets/vendor/html5shiv/dist/html5shiv.js"></script>

1
_sass/jquery.qtip.scss Symbolic link
View File

@ -0,0 +1 @@
../assets/vendor/qtip2/jquery.qtip.css

1
_sass/normalize.scss vendored Symbolic link
View File

@ -0,0 +1 @@
../assets/vendor/normalize-css/normalize.css

View File

@ -1,3 +1,9 @@
---
---
@import "normalize";
@import "jquery.qtip";
body {
background-image: url(../img/bg.jpg);
color: #5c5855;
@ -22,7 +28,7 @@ h1, h2, h3, h5 {
}
h1 {
font-size: 40px;
font-size: 35px;
margin-bottom: 25px;
}