Skip to content
Browse files

Merge pull request #13 from aeoth/master

Reverted some incorrect err.. reverts, fixed OLs
  • Loading branch information...
2 parents d29ed97 + fc04b0c commit a23fcb53a164118cff25e05afef2d2dde4957fdc @shiftbot shiftbot committed Feb 10, 2012
Showing with 100 additions and 58 deletions.
  1. +2 −0 demos/blog/index.html
  2. +10 −9 less/colours.less
  3. +13 −14 less/fonts.less
  4. +49 −13 less/metro.less
  5. +15 −11 less/metroblog.less
  6. +11 −11 less/variables.less
View
2 demos/blog/index.html
@@ -35,6 +35,7 @@
<article>
<header>
<h2>Some header post</h2>
+ <span class="date">February 10th</span>
</header>
<p>You think water moves fast? You should see ice. It moves like it has a mind. Like it knows it killed the world once and got a taste for murder. After the avalanche, it took us a week to climb out. Now, I don't know exactly when we turned on each other, but I know that seven of us survived the slide... and only five made it out. Now we took an oath, that I'm breaking now. We said we'd say it was the snow that killed the other two, but it wasn't. Nature is lethal but it doesn't hold a candle to man.</p>
@@ -72,6 +73,7 @@
<article>
<header>
<h2>A follow up post</h2>
+ <span class="date">February 9th</span>
</header>
<p>Look, just because I don't be givin' no man a foot massage don't make it right for Marsellus to throw Antwone into a glass mother@#$%in' house, @#$%in' up the way the nigger talks. Mother@#$%er do that &amp;@#$% to me, he better paralyze my ass, 'cause I'll kill the mother@#$%er, know what I'm sayin'? </p>
View
19 less/colours.less
@@ -1,11 +1,12 @@
.accent { color: @accent; }
+
+.blue { color: @blue; }
+.brown { color: @brown; }
+.green { color: @green; }
+.lime { color: @lime; }
.magenta { color: @magenta; }
-.purple{ color: @purple;}
-.teal { color: @teal;}
-.lime { color: @lime;}
-.brown { color: @brown;}
-.pink { color: @pink;}
-.orange { color: @orange;}
-.blue { color: @blue;}
-.red { color: @red;}
-.green { color: @green;}
+.orange { color: @orange; }
+.pink { color: @pink; }
+.purple { color: @purple; }
+.red { color: @red; }
+.teal { color: @teal; }
View
27 less/fonts.less
@@ -21,28 +21,27 @@
}
#headingstyles {
- font-family: @headingfonts;
- font-weight: 100;
- text-transform: lowercase;
- margin-top:5px;
- margin-bottom:0px;
+ font-family: @headingfonts;
+ font-weight: 100;
+ margin-top: 5px;
+ margin-bottom: 0px;
+ text-transform: lowercase;
}
-
body {
- font-family: @fonts;
- font-size: @baseFontSize;
+ font-family: @fonts;
+ font-size: @baseFontSize;
}
h1, h2, h3, h4, h5, h6
{
- #headingstyles;
+ #headingstyles;
}
-h1 { font-size: @baseFontSize * 4; }
-h2 { font-size: @baseFontSize * 3; }
-h3 { font-size: @baseFontSize * 2; }
+h1 { font-size: @h1fontSize; }
+h2 { font-size: @h2fontSize; }
+h3 { font-size: @h3fontSize; }
h4, h5, h6 {
- font-weight: normal;
- text-transform: uppercase;
+ font-weight: normal;
+ text-transform: uppercase;
}
View
62 less/metro.less
@@ -2,32 +2,68 @@
@import "colours.less";
@import "fonts.less";
-#bundle {
- .pivot-header {
- color: @inactive;
- font-size: 20px;
- text-decoration: none;
- text-transform: lowercase;
+metro-pivot .headers {
+ clear: both;
+ display: block;
+ white-space: nowrap;
+}
- &.active {
- color: @foreground;
- }
- }
+.metro-pivot .pivot-item h3,
+.metro-pivot .headers .header {
+ #headingstyles;
+ cursor: pointer;
+ display: inline-block;
+ font-size: @h2fontSize;
+ margin-right: 24px;
+ padding: 0;
+ vertical-align: top;
}
+
.metro-pivot .headers { white-space: nowrap; display: block; clear: both; }
-.metro-pivot .pivot-item h3, .metro-pivot .headers .header { #headingstyles; font-size: @h2fontsize; display: inline-block; vertical-align: top; padding: 0; cursor: pointer; margin-right:24px; }
+.metro-pivot .pivot-item h3, .metro-pivot .headers .header { #headingstyles; font-size: @h2fontSize; display: inline-block; vertical-align: top; padding: 0; cursor: pointer; margin-right:24px; }
.metro-pivot .headers .header.current { }
.metro-pivot .items { position: relative; }
.metro-pivot .items .pivotItem { display: block; white-space: normal; text-align: justify; width: 100%; }
ul.metro-list, ol.metro-list { padding: 0; }
-ul.metro-list li, ol.metro-list li { display: block; margin: 10px 0; height: 20px; padding: 5px; overflow: hidden; border-left: solid 30px; list-style: none; }
+
+ul.metro-list li, ol.metro-list li
+{
+ display: block;
+ list-style-type: none;
+ border-left: solid 30px @accent;
+ height: 20px;
+ list-style-position: inside;
+ margin: 10px 0;
+ padding:5px;
+
+}
+ul.metro-list {
+ overflow: hidden;
+}
+ol.metro-list {
+ text-indent: -25px;
+ counter-reset: item;
+}
+ol.metro-list li:before {
+ color:white;
+ margin-right:25px;
+ content: counter(item) " ";
+ counter-increment: item;
+}
pre {
padding: 15px;
border: 1px solid @inactive;
background: @faded;
}
-code { padding-left:5px; padding-right: 5px; border: 1px solid @inactive; background: @faded; }
+code {
+ background: @faded;
+ border: 1px solid @inactive;
+ padding-left: 5px;
+ padding-right: 5px;
+}
+.clear { clear:both; }
+
View
26 less/metroblog.less
@@ -1,5 +1,4 @@
@import "metro.less";
-
nav {
ul {
list-style-type: none;
@@ -8,9 +7,17 @@ nav {
li {
display: inline;
margin-right: 20px;
-
- a {
- #bundle > .pivot-header;
+ }
+
+ a {
+ color: @inactive;
+ font-size: @baseFontSize * 1.6;
+ text-decoration: none;
+ text-transform: lowercase;
+
+ &.active
+ {
+ color: @foreground;
}
}
}
@@ -20,14 +27,10 @@ footer {
font-size: 90%;
}
-footer {
- font-size: 90%;
-}
-
img {
margin-top: 20px;
margin-bottom: 20px;
- box-shadow: 3px 3px 7px #777;
+ box-shadow: 0px 0px 7px #777;
}
img.left {
float: left;
@@ -48,10 +51,11 @@ h1, h2, h3, h4, h5, h6 {
color: @blue;
}
-ul.metro-list li, ol.metro-list li { border-left: solid 30px @blue; }
+article { .clear }
+.date { text-transform: uppercase; }
section.title { float: left; font-size: @baseFontSize * 4; }
nav { float: right; margin-left: 140px; margin-top: 20px; margin-bottom: 20px; }
-nav a:hover { color: black; }
+nav a:hover { color: black; }
View
22 less/variables.less
@@ -1,25 +1,25 @@
/* Type */
@fonts: "Segoe UI", "Segoe WP", "Helvetica Neue", 'RobotoRegular', sans-serif;
@headingfonts: "Segoe UI Light", "Helvetica Neue", 'RobotoLight', "Segoe UI", "Segoe WP", sans-serif;
-@h1fontsize: 3.8em;
-@h2fontsize: 2em;
@baseFontSize: 14px;
+@h1fontSize: @baseFontSize * 4;
+@h2fontSize: @baseFontSize * 3;
+@h3fontSize: @baseFontSize * 2;
/* Colors */
+@blue: #1BA1E2;
+@brown: #A05000;
+@green: #339933;
+@lime: #8CBF26;
@magenta: #FF0097;
+@orange: #F09609;
+@pink: #E671B8;
@purple: #A200FF;
+@red: #E51400;
@teal: #00ABA9;
-@lime: #8CBF26;
-@brown: #A05000;
-@pink: #E671B8;
-@orange: #F09609;
-@blue: #1BA1E2;
-@red: #E51400;
-@green: #339933;
-
@accent: @blue;
@background: white;
@foreground: black;
@inactive: #aaaaaa;
-@faded: #fafafa;
+@faded: #fafafa;

0 comments on commit a23fcb5

Please sign in to comment.
Something went wrong with that request. Please try again.