Permalink
Browse files

Revert "updated LESS rules"

This reverts commit 7fec363.

Conflicts:

	less/metro.less
  • Loading branch information...
1 parent a640023 commit 10f41b62737c538ef1d1dbeb14184563f9bd12c2 aeoth committed Feb 10, 2012
Showing with 67 additions and 69 deletions.
  1. +10 −9 less/colours.less
  2. +13 −14 less/fonts.less
  3. +33 −15 less/metro.less
  4. +0 −20 less/metroblog.less
  5. +11 −11 less/variables.less
View
@@ -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
@@ -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
@@ -2,34 +2,52 @@
@import "colours.less";
@import "fonts.less";
-#bundle {
- .pivot-header {
- color: @inactive;
- font-size: 20px;
- text-decoration: none;
- text-transform: lowercase;
-
- &.active {
- color: @foreground;
- }
- }
+metro-pivot .headers {
+ clear: both;
+ display: block;
+ white-space: nowrap;
}
+.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 {
+ border-left: solid 30px;
+ display: block;
+ height: 20px;
+ list-style: none;
+ margin: 10px 0;
+ overflow: hidden;
+ padding: 5px;
+}
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
@@ -1,25 +1,5 @@
@import "metro.less";
-nav {
- ul {
- list-style-type: none;
- padding-left: 0;
-
- li {
- display: inline;
- margin-right: 20px;
-
- a {
- #bundle > .pivot-header;
- }
- }
- }
-}
-
-footer {
- font-size: 90%;
-}
-
footer {
font-size: 90%;
}
View
@@ -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 10f41b6

Please sign in to comment.