Permalink
Browse files

merged from dev branch

  • Loading branch information...
1 parent a76d162 commit c28136a8639d5e18482740b7136bd23f8933fb8f @jeffreylouden committed Apr 11, 2012
Showing with 223 additions and 125 deletions.
  1. +128 −61 _assets/css/style.css
  2. +84 −36 _assets/css/style.less
  3. +11 −28 index.html
View
@@ -121,7 +121,7 @@ table {
border-spacing: 0;
}
.wrap {
- max-width: 940px;
+ max-width: 200px;
padding: 0 10px;
margin: 0 auto;
clear: both;
@@ -130,11 +130,11 @@ body {
font-family: "proxima-nova-1", "proxima-nova-2", helvetica, sans-serif;
font-size: 14px;
line-height: 24px;
- color: #231f20;
- background: url('../img/bg.jpg');
+ color: #0D3630;
+ background: #fff;
}
body a {
- color: #EF3E42;
+ color: #36E3CC;
text-decoration: none;
-webkit-transition: all .3s linear;
-moz-transition: all .3s linear;
@@ -144,7 +144,7 @@ body a:hover {
color: #bbb;
}
body section {
- margin-top: 0px;
+ margin-top: 50px;
-webkit-animation: 2s ease;
-moz-animation: 2s ease;
-ms-animation: 2s ease;
@@ -155,21 +155,48 @@ body section {
transition: all .3s linear;
}
body section header {
+ font-family: "kulturista-web-1", "kulturista-web-2", helvetica, sans-serif;
padding: 10px 0;
+ text-align: center;
+ width: 200px;
+ margin: 20px auto 0;
+}
+body section header i {
+ display: block;
+ font-size: 16px;
+ line-height: 32px;
+ font-style: normal;
+ color: #36E3CC;
+ position: relative;
+}
+body section header i:before {
+ content: '';
+ width: 60px;
+ height: 25px;
+ position: absolute;
+ top: 50%;
+ left: 0;
+ display: block;
+ border-top: 1px solid #999;
+}
+body section header i:after {
+ content: '';
+ width: 60px;
+ height: 25px;
+ position: absolute;
+ top: 50%;
+ right: 0;
+ display: block;
+ border-top: 1px solid #999;
}
body section header h1 {
text-transform: uppercase;
- letter-spacing: 2px;
- font-weight: 600;
- text-shadow: 2px 2px 1px white;
-}
-body section header h1 i {
- font-style: normal;
- color: #EF3E42;
+ letter-spacing: 1px;
+ font-size: 20px;
+ margin: 10px 0;
}
body section nav {
- padding: 20px 0;
- background-color: rgba(250, 250, 250, 0.33);
+ padding: 0 0 20px;
}
body section nav ul {
overflow: hidden;
@@ -188,15 +215,36 @@ body section nav ul li {
transition: all .5s linear;
}
body section nav ul li header {
- margin: 0 0 10px;
+ text-align: center;
+ margin: 0 auto 10px;
padding: 0;
border: none;
}
body section nav ul li header h2 {
+ position: relative;
text-transform: uppercase;
letter-spacing: 2px;
font-weight: 600;
- text-shadow: 2px 2px 1px white;
+}
+body section nav ul li header h2:before {
+ content: '';
+ width: 100px;
+ height: 25px;
+ position: absolute;
+ top: 50%;
+ left: 0;
+ display: block;
+ border-top: 1px solid #ccc;
+}
+body section nav ul li header h2:after {
+ content: '';
+ width: 100px;
+ height: 25px;
+ position: absolute;
+ top: 50%;
+ right: 0;
+ display: block;
+ border-top: 1px solid #ccc;
}
body section nav ul li p {
margin-bottom: 20px;
@@ -215,64 +263,83 @@ body section nav ul li aside ul li:first-child.tweet_first p.tweet_time {
margin: 5px 0 0;
font-size: 85%;
}
-body section nav ul li ol li {
- float: none;
- display: inline;
- margin: 0 5px 0 0;
+body section ol li {
+ margin: 5px 0;
+ text-align: center;
}
-body section nav ul li ol li a {
+body section ol li a {
color: #777;
}
body section footer {
color: #666;
font-size: 85%;
- text-shadow: 1px 1px 1px white;
+ text-align: center;
}
body section footer p {
margin: 10px 0;
}
body section footer p a {
color: #999;
}
-@media all and (min-width: 768px) {
- body section {
- margin-top: 100px;
- -webkit-animation: 2s ease;
- -moz-animation: 2s ease;
- -ms-animation: 2s ease;
- -o-animation: 2s ease;
- animation: 2s ease;
- -webkit-transition: all .3s linear;
- -moz-transition: all .3s linear;
- transition: all .3s linear;
- }
- body section nav ul li {
- float: left;
- width: 22.8723404%;
- margin: 0 01.0638298%;
- -webkit-animation: 2s ease;
- -moz-animation: 2s ease;
- -ms-animation: 2s ease;
- -o-animation: 2s ease;
- animation: 2s ease;
- -webkit-transition: all .5s linear;
- -moz-transition: all .5s linear;
- transition: all .5s linear;
- }
- body section nav ul li aside ul li:first-child.tweet_first {
- width: 100%;
- }
- body section nav ul li ol li {
- display: block;
- }
- body section nav ul li:first-child {
- width: 45.7446809%;
- margin: 0 01.0638298% 0 0;
- }
- body section nav ul li:last-child {
- margin: 0 0 0 01.0638298%;
- }
-}
+/* @media all and (min-width:768px) {
+
+ body {
+ section {
+ margin-top: 50px;
+ -webkit-animation: 2s ease;
+ -moz-animation: 2s ease;
+ -ms-animation: 2s ease;
+ -o-animation: 2s ease;
+ animation: 2s ease;
+ -webkit-transition: all .3s linear;
+ -moz-transition: all .3s linear;
+ transition: all .3s linear;
+ nav {
+ ul {
+ li {
+ float: left;
+ width: 22.8723404%;
+ margin: 0 01.0638298%;
+ -webkit-animation: 2s ease;
+ -moz-animation: 2s ease;
+ -ms-animation: 2s ease;
+ -o-animation: 2s ease;
+ animation: 2s ease;
+ -webkit-transition: all .5s linear;
+ -moz-transition: all .5s linear;
+ transition: all .5s linear;
+
+ aside {
+ ul {
+ li:first-child {
+ &.tweet_first {
+ width:100%;
+ }
+ }
+ }
+ }
+
+ ol {
+ li {
+ display: block;
+ }
+ }
+ }
+
+ li:first-child {
+ width: 45.7446809%;
+ margin: 0 01.0638298% 0 0;
+ }
+
+ li:last-child {
+ margin: 0 0 0 01.0638298%;
+ }
+ }
+ }
+ }
+ }
+
+} */
.oldie .wrap {
width: 940px;
}
Oops, something went wrong.

0 comments on commit c28136a

Please sign in to comment.