Permalink
Browse files

Merge remote branch 'kien/master' into styles/molokai

  • Loading branch information...
2 parents c4c9157 + 966992b commit 7c51301209144881b912cddd3bedcdf371819c71 @jacobrask jacobrask committed Jul 5, 2011
Showing with 58 additions and 64 deletions.
  1. +1 −1 styles/molokai-min.css
  2. +57 −63 styles/molokai.css
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1,78 +1,79 @@
-body {
+body,nav ul {
background:#272822;
- font:92% sans-serif;
+ font:88%/1.5 Palatino Linotype,Palatino;
color:#fff;
}
-h1 {
- color:#f27;
-}
a {
color:#ae3;
text-decoration:none;
}
a:hover {
color:#fff;
}
-article {
- width:33%;
- margin:0 auto;
+article p {
+ text-indent:6px;
}
-h1,footer {
- position:fixed;
- top:0;
- left:0;
+h1,article,footer {
+ width:825px;
+ margin:0 auto;
}
h1 {
- font-size:48px;
- padding-left:25px;
-}
-h1:before {
- content:'{';
+ color:#f27;
+ font-size:94px;
+ margin-bottom:-1.34em;
+ text-shadow:0 1px 0 #444,0 2px 0 #666,0 3px 0 #666,0 4px 0 #666,0 5px 0 #666;
}
-h1:after {
- content:'}';
+h1:hover {
+ color:#f92;
}
-h1:before,
-h1:after {
- font-size:62px;
+h1:before {
+ content:'';
color:#ee7;
}
nav {
float:right;
- overflow:hidden;
margin-left:-50%;
- padding-right:18px;
+ overflow:hidden;
}
nav h2 {
color:#6de;
- font-size:16px;
text-align:right;
+ -webkit-transform:rotate(-90deg);
+ -webkit-transform-origin:right bottom;
+ -moz-transform:rotate(-90deg);
+ -moz-transform-origin:right bottom;
+ -ms-transform:rotate(-90deg);
+ -ms-transform-origin:right bottom;
+ -o-transform:rotate(-90deg);
+ -o-transform-origin:right bottom;
+ transform:rotate(-90deg);
+ transform-origin:right bottom;
+ opacity:.6;
}
nav ul {
- list-style:none outside;
position:relative;
- opacity:0;
left:100%;
- -webkit-transition-property:left,opacity;
- -webkit-transition:.5s ease-in-out;
- -moz-transition-property:left,opacity;
- -moz-transition:.5s ease-in-out;
- -ms-transition-property:left,opacity;
- -ms-transition:.5s ease-in-out;
- -o-transition-property:left,opacity;
- -o-transition:.5s ease-in-out;
- transition-property:left,opacity;
- transition:.5s ease-in-out;
+ opacity:0;
+ color:#272822;
+}
+h1,nav h2,nav ul {
+ -webkit-transition:all .5s ease;
+ -moz-transition:all .5s ease;
+ -ms-transition:all .5s ease;
+ -o-transition:all .5s ease;
+ transition:all .5s ease;
}
nav:hover ul {
- opacity:1;
left:0;
+ opacity:1;
}
-nav ul li {
- font-size:13px;
- margin:0 0 1em;
- padding:0 0 3px;
- border-bottom:1px dotted #b8f;
+nav:hover h2 {
+ -webkit-transform:rotate(0deg);
+ -moz-transform:rotate(0deg);
+ -ms-transform:rotate(0deg);
+ -o-transform:rotate(0deg);
+ transform:rotate(0deg);
+ opacity:1;
}
nav ul li a:first-child {
color:#f92;
@@ -81,30 +82,23 @@ nav ul li a:first-child {
}
nav ul li a:last-child:before {
content:'by ';
- padding-left:2em;
-}
-article header {
- margin-top:60px;
- width:auto;
+ margin-left:2em;
}
-article h2 {
- color:#E53;
+section {
+ float:right;
+ width:48%;
}
-article h2:after {
- content:'';
- color:#272822;
+article header {
+ margin-left:52%;
}
-article h2:hover:after {
- color:#b8f;
+header + section {
+ float:left;
}
-article p {
- text-indent:.5em;
+article h2 {
+ color:#e53;
+ border-bottom:1px dotted #b8f;
}
footer {
- top:8em;
+ border-top:1px dotted #b8f;
+ clear:both;
}
-footer p {
- white-space:pre;
- margin:0;
- opacity:.6;
-}

0 comments on commit 7c51301

Please sign in to comment.