1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-05 03:08:51 +01:00

Merge pull request #161 from XhmikosR/css

patch-2
This commit is contained in:
Phil Haack 2013-12-16 08:48:22 -08:00
commit 0b6213cb5e
7 changed files with 60 additions and 61 deletions

View File

@ -1,5 +1,5 @@
{% unless page.hide_breadcrumbs == true %}
<ol class="breadcrumbs">
<ol>
<li>
{% if page.layout == "license" %}
<a href="/">Home</a> / <a href="/licenses/">Licenses</a>

File diff suppressed because one or more lines are too long

View File

@ -10,7 +10,6 @@
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<!--[if lt IE 9]>
<script src="/js/html5shiv.js"></script>
<script src="/js/selectivizr-min.js"></script>
<![endif]-->
</head>
<body class="{{ page.layout }}{% if page.class %} {{ page.class }}{% endif %}">

File diff suppressed because one or more lines are too long

View File

@ -6,7 +6,7 @@ layout: nil
{% include css/jquery.qtip.min.css %}
body {
background: #f5f1ec url(../img/bg.jpg);
background-image: url(../img/bg.jpg);
color: #5c5855;
font: 14px/1.4 "Helvetica Neue", Helvetica, Arial, sans-serif;
}
@ -21,44 +21,6 @@ a:hover {
text-decoration: underline;
}
.button {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border-color: #ceccc9 #b6b4b1 #a6a4a2 #b6b4b1;
border-style: solid;
border-width: 1px;
color: #443b34;
-webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 2px 4px, rgba(255, 255, 255, 0.8) 0 1px 0 0 inset;
-moz-box-shadow: rgba(0, 0, 0, 0.1) 0 2px 4px, rgba(255, 255, 255, 0.8) 0 1px 0 0 inset;
box-shadow: rgba(0, 0, 0, 0.1) 0 2px 4px, rgba(255, 255, 255, 0.8) 0 1px 0 0 inset;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e7e5e0), color-stop(100%, #d5d3cf));
background-image: -webkit-linear-gradient(#e7e5e0, #d5d3cf);
background-image: -moz-linear-gradient(#e7e5e0, #d5d3cf);
background-image: -o-linear-gradient(#e7e5e0, #d5d3cf);
background-image: linear-gradient(#e7e5e0, #d5d3cf);
display: -moz-inline-stack;
display: inline-block;
vertical-align: middle;
font-size: 12px;
font-weight: normal;
padding: 5px 10px;
text-align: center;
}
.button:hover {
text-decoration: none;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e7e5e0), color-stop(100%, #d0ceca));
background-image: -webkit-linear-gradient(#e7e5e0, #d0ceca);
background-image: -moz-linear-gradient(#e7e5e0, #d0ceca);
background-image: -o-linear-gradient(#e7e5e0, #d0ceca);
background-image: linear-gradient(#e7e5e0, #d0ceca);
}
h1, h2, h3, h5 {
font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
font-weight: 900;
@ -110,7 +72,6 @@ strong {
}
.home {
padding-top: 20px;
text-align: center;
}
@ -146,10 +107,9 @@ strong {
width: 280px;
float: left;
margin-left: 27px;
text-align: center;
}
.triptych li:first-child {
.triptych .first-li {
margin-left: 0;
}
@ -187,7 +147,6 @@ strong {
.circular { background-position: 0 -129px; width: 72px; height: 69px; }
.license-family {
clear: both;
margin-bottom: 50px;
@ -199,12 +158,18 @@ strong {
}
.license-details {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
float: left;
width: 55%;
padding-left: 20px;
}
.license-variations {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
height: 31px;
padding-top: 23px;
margin-left: -10px;
@ -242,6 +207,9 @@ strong {
}
.license-rules .name {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
border-right: solid 1px #d9d7d2;
padding-left: 0;
width: 280px;
@ -346,6 +314,44 @@ strong {
font: 0.7em "Courier new", courier;
}
.button {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border-color: #ceccc9 #b6b4b1 #a6a4a2 #b6b4b1;
border-style: solid;
border-width: 1px;
color: #443b34;
-webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 2px 4px, rgba(255, 255, 255, 0.8) 0 1px 0 0 inset;
-moz-box-shadow: rgba(0, 0, 0, 0.1) 0 2px 4px, rgba(255, 255, 255, 0.8) 0 1px 0 0 inset;
box-shadow: rgba(0, 0, 0, 0.1) 0 2px 4px, rgba(255, 255, 255, 0.8) 0 1px 0 0 inset;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e7e5e0), color-stop(100%, #d5d3cf));
background-image: -webkit-linear-gradient(#e7e5e0, #d5d3cf);
background-image: -moz-linear-gradient(#e7e5e0, #d5d3cf);
background-image: -o-linear-gradient(#e7e5e0, #d5d3cf);
background-image: linear-gradient(#e7e5e0, #d5d3cf);
display: inline-block;
font-size: 12px;
font-weight: normal;
padding: 5px 10px;
text-align: center;
vertical-align: middle;
}
.button:hover {
text-decoration: none;
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e7e5e0), color-stop(100%, #d0ceca));
background-image: -webkit-linear-gradient(#e7e5e0, #d0ceca);
background-image: -moz-linear-gradient(#e7e5e0, #d0ceca);
background-image: -o-linear-gradient(#e7e5e0, #d0ceca);
background-image: linear-gradient(#e7e5e0, #d0ceca);
}
.projects-with-license li {
padding-bottom: 3px;
}
@ -380,11 +386,10 @@ strong {
}
.bullets {
margin-bottom: 1em;
list-style-type: disc;
}
.bullets li {
list-style-type: disc;
.bullets > li {
margin-left: 2em;
}
@ -416,6 +421,7 @@ strong {
font-size: 90%;
}
/* Qtip styles */
.qtip-required,

View File

@ -12,7 +12,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
<span>}</span>
</h2>
<ul class="triptych situations clearfix">
<li class="whatever">
<li class="whatever first-li">
<a href="licenses/mit">
<span class="triptych-sprite three-arrows"></span>
<h3>I want it simple and permissive.</h3>
@ -55,7 +55,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
<span>}</span>
</h2>
<ul class="triptych see-more clearfix">
<li>
<li class="first-li">
<h3>My content isn't code.</h3>
<p>
Check out <a href="http://creativecommons.org/choose/">Creative Commons</a>.

File diff suppressed because one or more lines are too long