1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-04 18:58:50 +01:00

Merge pull request #148 from XhmikosR/css

CSS cleanup
This commit is contained in:
Phil Haack 2013-12-09 23:28:43 -08:00
commit 9b6e79344a
5 changed files with 87 additions and 74 deletions

View File

@ -1,4 +1,4 @@
<footer class="site-footer cf">
<footer class="site-footer clearfix">
<nav>
<a href="/about/">About</a>
<a href="/terms-of-service/">Terms of Service</a>
@ -8,7 +8,7 @@
This site is licensed under the <a href="http://creativecommons.org/licenses/by/3.0/">
Creative Commons Attribution 3.0 Unported License</a>.
</p>
<div id="with-♥">
<div class="with-love">
Demystified with &lt;3 by <a href="http://github.com">GitHub, Inc.</a>
</div>
</footer>

View File

@ -1,4 +1,4 @@
<div class="license-family cf">
<div class="license-family clearfix">
<div class="license-family-heading">
<h3 class="license-family-name"><a href="{{ page.permalink }}">{% if page.category %}{{ page.category }}{% else %}{{ page.title }}{% endif %}</a></h3>

View File

@ -1,16 +1,16 @@
{% include header.html %}
<div class="cf">
<div class="clearfix">
<div class="license-body">
<pre id="license-text">
{{ content | replace:"<","[" | replace:">","]" }}
</pre><!-- /license-text -->
</div><!-- /license-body -->
</pre> <!-- /license-text -->
</div> <!-- /license-body -->
{% include sidebar.html %}
</div><!-- /cf -->
</div> <!-- /clearfix -->
{% include footer.html %}

View File

@ -3,13 +3,12 @@ layout: nil
---
{% include css/normalize.min.css %}
{% include css/jquery.qtip.min.css %}
body {
background: #f5f1ec url(../images/bg.jpg);
color: #5c5855;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
line-height: 1.4;
font: 14px/1.4 "Helvetica Neue", Helvetica, Arial, sans-serif;
}
a {
@ -17,6 +16,7 @@ a {
font-weight: bold;
text-decoration: none;
}
a:hover {
text-decoration: underline;
}
@ -62,43 +62,36 @@ a:hover {
background-image: linear-gradient(#e7e5e0, #d0ceca);
}
h1 {
color: #443a33;
h1, h2, h3, h5 {
font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
font-size: 40px;
font-weight: 900;
line-height: 1.1;
}
h1 {
color: #443a33;
font-size: 40px;
margin-bottom: 25px;
}
h2 {
color: #443a33;
opacity: 0.8;
font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
font-size: 24px;
/* font-size: 18px; */
font-weight: 900;
line-height: 1.1;
margin-top: 24px;
margin-bottom: 10px;
}
h3 {
color: #443a33;
font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
font-size: 15px;
font-weight: 900;
line-height: 1.1;
margin-top: 20px;
margin-bottom: 10px;
}
h5 {
color: #443a33;
font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
font-size: 14px;
font-weight: 900;
line-height: 1.1;
margin-bottom: 15px;
}
@ -123,21 +116,22 @@ strong {
padding-top: 20px;
text-align: center;
}
.home h1 {
font-size: 63px;
line-height: 1.1;
margin-bottom: 25px;
}
.home h2 {
color: #149ad4;
font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
font-size: 27px;
font-weight: 900;
line-height: 70px;
margin-bottom: 45px;
vertical-align: middle;
opacity: 1;
}
.home h2 span {
color: #e9e6e2;
font-size: 70px;
@ -150,24 +144,25 @@ strong {
width: 900px;
margin: 0 auto 20px;
}
.triptych li {
width: 280px;
float: left;
margin-left: 27px;
text-align: center;
}
.triptych li:first-child {
margin-left: 0;
}
.triptych li > a {
text-decoration: none;
}
.triptych h3 {
color: #443a33;
font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
font-size: 22px;
font-weight: 900;
line-height: 1.1;
margin: 0 auto 20px auto;
width: 220px;
}
@ -175,9 +170,11 @@ strong {
.situations .whatever {
margin-top: 16px;
}
.situations .copyleft {
margin-top: 3px;
}
.situations .button {
margin-top: 20px;
}
@ -205,10 +202,7 @@ strong {
}
.license-family-name {
font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif;
font-size: 28px;
font-weight: 900;
line-height: 1.1;
}
.license-family-description {
@ -222,36 +216,41 @@ strong {
margin-bottom: 12px;
width: 100%;
}
.license-rules th,
.license-rules td {
width: 33%;
}
.license-rules th {
font-size: 15px;
padding: 5px 10px 5px 0;
vertical-align: bottom;
}
.license-rules th.summary {
line-height: 1.4;
}
.license-rules .name {
border-right: solid 1px #d9d7d2;
padding-left: 0;
width: 280px;
}
.license-rules .name a {
font-family: Chivo, "Helvetica Neue", Helvetica, Arial, serif;
font-size: 28px;
font-weight: 900;
line-height: 1.1;
}
.license-rules .name small a {
font-size: 16px;
}
.license-rules td {
padding: 4px 0 12px 0;
vertical-align: top;
}
.license-rules .label {
font-weight: bold;
}
@ -263,15 +262,19 @@ strong {
margin-bottom: 5px;
padding-left: 16px;
}
.license-rules li:hover {
color: #443a33;
}
.license-required li {
background-image: url(../images/blue-dot@2x.png);
}
.license-permitted li {
background-image: url(../images/green-dot@2x.png);
}
.license-forbidden li {
background-image: url(../images/red-dot@2x.png);
}
@ -290,11 +293,13 @@ strong {
.license-body pre {
font-family: Consolas, Monaco, Courier, monospace;
font-size: 14px;
background-color: #fff;
background-color: rgba(255, 255, 255, 0.8);
border: 1px solid #e9e6e1;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
padding: 20px;
}
@ -309,16 +314,20 @@ strong {
margin-top: -110px;
width: 100%;
}
.sidebar .how-to-apply {
font-size: 12px;
margin-top: -15px;
}
.sidebar .how-to-apply p {
line-height: 1.5;
}
.sidebar .how-to-apply p:last-child {
margin-bottom: 0;
}
.sidebar .note {
font-style: italic;
}
@ -327,6 +336,7 @@ strong {
margin-top: 4px;
margin-bottom: 30px;
}
.sidebar .source a {
padding-left: 20px;
background: transparent url(../images/source@2x.png) 0 1px no-repeat;
@ -334,8 +344,7 @@ strong {
}
.sidebar .boilerplate {
font-family: 'courier new', courier;
font-size: 0.7em;
font: 0.7em "Courier new", courier;
}
.projects-with-license li {
@ -351,17 +360,21 @@ strong {
text-align: left;
line-height: 1.5;
}
.site-footer a {
color: #443a33;
font-weight: normal;
}
.site-footer p {
float: left;
margin-top: 0;
}
.site-footer nav {
float: right;
}
.site-footer nav a {
display: inline-block;
margin-left: 20px;
@ -372,7 +385,7 @@ strong {
}
.bullets li {
list-style: disc;
list-style-type: disc;
margin-left: 2em;
}
@ -404,62 +417,62 @@ strong {
font-size: 90%;
}
{% include css/jquery.qtip.min.css %}
/* Qtip styles */
.qtip-required {
background-color: #d0ebf6 ! important;
border-color: #149ad4 ! important;
color: #0d648a ! important;
font-size: 12px ! important;
line-height: 1.3 ! important;
.qtip-required,
.qtip-permitted,
.qtip-forbidden {
font-size: 12px;
line-height: 1.3;
}
.qtip-required .qtip-titlebar{
background-color: #149ad4 ! important;
color: #fff ! important;
.qtip-required {
background-color: #d0ebf6;
border-color: #149ad4;
color: #0d648a;
}
.qtip-required .qtip-titlebar {
background-color: #149ad4;
color: #fff;
}
.qtip-permitted {
background-color: #d8f4d7 ! important;
border-color: #3dc637 ! important;
color: #298625 ! important;
font-size: 12px ! important;
line-height: 1.3 ! important;
background-color: #d8f4d7;
border-color: #3dc637;
color: #298625;
}
.qtip-permitted .qtip-titlebar{
background-color: #3dc637 ! important;
color: #fff ! important;
.qtip-permitted .qtip-titlebar {
background-color: #3dc637;
color: #fff;
}
.qtip-forbidden {
background-color: #f4d9d8 ! important;
border-color: #c6403d ! important;
color: #812a28 ! important;
font-size: 12px ! important;
line-height: 1.3 ! important;
background-color: #f4d9d8;
border-color: #c6403d;
color: #812a28;
}
.qtip-forbidden .qtip-titlebar{
background-color: #c6403d ! important;
color: #fff ! important;
.qtip-forbidden .qtip-titlebar {
background-color: #c6403d;
color: #fff;
}
/* For modern browsers */
.cf:before,
.cf:after {
content:"";
display:table;
.clearfix:before,
.clearfix:after {
content: "";
display: table;
}
.cf:after {
clear:both;
.clearfix:after {
clear: both;
}
/* For IE 6/7 (trigger hasLayout) */
.cf {
.clearfix {
zoom:1;
}
#with- { float: right; clear: right;}
.with-love { float: right; clear: right; }

View File

@ -11,7 +11,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
Which of the following best describes your situation?
<span>}</span>
</h2>
<ul class="triptych situations cf">
<ul class="triptych situations clearfix">
<li class="whatever">
<a href="licenses/mit">
<img src="images/three-arrows@2x.png" alt="three arrows" width="72" height="57">
@ -54,7 +54,7 @@ description: A site to provide non-judgmental guidance on choosing a license for
What if none of these work for me?
<span>}</span>
</h2>
<ul class="triptych see-more cf">
<ul class="triptych see-more clearfix">
<li>
<h3>My content isn't code.</h3>
<p>