Commit 6c3ec99f by Kyle Fiedler

Start to change to ems and remove all of cream

parent cdd37eeb
...@@ -2,6 +2,7 @@ $fg-column: 70px; ...@@ -2,6 +2,7 @@ $fg-column: 70px;
$fg-gutter: 26px; $fg-gutter: 26px;
$fg-max-columns: 12; $fg-max-columns: 12;
$body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; $body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
$sans-serif: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
$body-font-size: 14px; $body-font-size: 14px;
$body-line-height: 20px; $body-line-height: 20px;
...@@ -12,6 +13,7 @@ $orange: #f96e5b; ...@@ -12,6 +13,7 @@ $orange: #f96e5b;
$yellow: #fff8af; $yellow: #fff8af;
$cream: #F6EFD4; $cream: #F6EFD4;
$mit-red: #933; $mit-red: #933;
$border-color: #ddd;
@mixin hide-text { @mixin hide-text {
background-color: transparent; background-color: transparent;
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
@import 'base/reset'; @import 'base/reset';
@import 'base/font_face'; @import 'base/font_face';
@import 'base/mixins';
@import 'base/variables'; @import 'base/variables';
@import 'base/base'; @import 'base/base';
@import 'base/mixins';
@import 'base/extends'; @import 'base/extends';
@import 'base/animations'; @import 'base/animations';
......
@function em($pxval, $base: 16) {
@return #{$pxval / $base}em;
}
// Line-height // Line-height
@function lh($amount: 1) { @function lh($amount: 1) {
@return $body-line-height * $amount; @return $body-line-height * $amount;
......
...@@ -4,6 +4,8 @@ $gw-gutter: 20px; ...@@ -4,6 +4,8 @@ $gw-gutter: 20px;
$fg-column: $gw-column; $fg-column: $gw-column;
$fg-gutter: $gw-gutter; $fg-gutter: $gw-gutter;
$fg-max-columns: 12; $fg-max-columns: 12;
$fg-max-width: 1400px;
$fg-min-width: 810px;
$sans-serif: 'Open Sans', $verdana; $sans-serif: 'Open Sans', $verdana;
$serif: $georgia; $serif: $georgia;
...@@ -19,14 +21,10 @@ $border-color: #C8C8C8; ...@@ -19,14 +21,10 @@ $border-color: #C8C8C8;
// old variables // old variables
$body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; $body-font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
$body-font-size: 14px; $body-font-size: em(14);
$body-line-height: golden-ratio($body-font-size, 1); $body-line-height: golden-ratio(.875em, 1);
$fg-max-width: 1400px;
$fg-min-width: 810px;
$light-gray: #ddd; $light-gray: #ddd;
$dark-gray: #333; $dark-gray: #333;
$mit-red: #993333; $mit-red: #993333;
$cream: #F6EFD4;
$text-color: $dark-gray; $text-color: $dark-gray;
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
@import 'base/reset'; @import 'base/reset';
@import 'base/font_face'; @import 'base/font_face';
@import 'base/mixins';
@import 'base/variables'; @import 'base/variables';
@import 'base/base'; @import 'base/base';
@import 'base/mixins';
@import 'base/extends'; @import 'base/extends';
@import 'base/animations'; @import 'base/animations';
......
...@@ -3,6 +3,7 @@ div.info-wrapper { ...@@ -3,6 +3,7 @@ div.info-wrapper {
section.updates { section.updates {
@extend .content; @extend .content;
line-height: lh();
> h1 { > h1 {
@extend .top-header; @extend .top-header;
...@@ -19,26 +20,29 @@ div.info-wrapper { ...@@ -19,26 +20,29 @@ div.info-wrapper {
> li { > li {
@extend .clearfix; @extend .clearfix;
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
margin-bottom: lh(.5);
padding-bottom: lh(.5); padding-bottom: lh(.5);
list-style-type: disk; list-style-type: disk;
&:first-child { &:first-child {
background: $cream;
border-bottom: 1px solid darken($cream, 10%);
margin: 0 (-(lh(.5))) lh(); margin: 0 (-(lh(.5))) lh();
padding: lh(.5); padding: lh(.5);
} }
ol, ul { ol, ul {
margin: lh() 0 0 lh(); margin: 0;
list-style-type: disk;
ol,ul {
list-style-type: circle; list-style-type: circle;
} }
}
h2 { h2 {
float: left; float: left;
margin: 0 flex-gutter() 0 0; margin: 0 flex-gutter() 0 0;
width: flex-grid(2, 9); width: flex-grid(2, 9);
font-size: body-font-size;
font-weight: bold;
} }
section.update-description { section.update-description {
...@@ -94,7 +98,7 @@ div.info-wrapper { ...@@ -94,7 +98,7 @@ div.info-wrapper {
border-bottom: 1px solid #d3d3d3; border-bottom: 1px solid #d3d3d3;
@include box-shadow(0 1px 0 #eee); @include box-shadow(0 1px 0 #eee);
@include box-sizing(border-box); @include box-sizing(border-box);
padding: 7px lh(.75); padding: em(7) lh(.75);
position: relative; position: relative;
&.expandable, &.expandable,
...@@ -108,13 +112,13 @@ div.info-wrapper { ...@@ -108,13 +112,13 @@ div.info-wrapper {
ul { ul {
background: none; background: none;
margin: 7px (-(lh(.75))) 0; margin: em(7) (-(lh(.75))) 0;
li { li {
border-bottom: 0; border-bottom: 0;
border-top: 1px solid #d3d3d3; border-top: 1px solid #d3d3d3;
@include box-shadow(inset 0 1px 0 #eee); @include box-shadow(inset 0 1px 0 #eee);
padding-left: 18px + lh(.75); padding-left: lh(1.5);
} }
} }
...@@ -150,7 +154,7 @@ div.info-wrapper { ...@@ -150,7 +154,7 @@ div.info-wrapper {
border-bottom: 0; border-bottom: 0;
@include box-shadow(none); @include box-shadow(none);
color: #999; color: #999;
font-size: 12px; font-size: $body-font-size;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
} }
......
...@@ -62,7 +62,6 @@ div.book-wrapper { ...@@ -62,7 +62,6 @@ div.book-wrapper {
@extend .clearfix; @extend .clearfix;
li { li {
background-color: darken($cream, 4%);
&.last { &.last {
display: block; display: block;
......
...@@ -72,7 +72,6 @@ body.user-profile-page { ...@@ -72,7 +72,6 @@ body.user-profile-page {
margin-bottom: 30px; margin-bottom: 30px;
li { li {
background-color: lighten($cream, 3%);
background-position: 10px center; background-position: 10px center;
background-repeat: no-repeat; background-repeat: no-repeat;
@include border-radius(4px); @include border-radius(4px);
......
...@@ -32,8 +32,6 @@ div.question-header { ...@@ -32,8 +32,6 @@ div.question-header {
&.post-vote { &.post-vote {
@include border-radius(4px); @include border-radius(4px);
background-color: lighten($cream, 5%);
border: 1px solid darken( $cream, 10% );
@include box-shadow(inset 0 1px 0px #fff); @include box-shadow(inset 0 1px 0px #fff);
} }
...@@ -149,7 +147,7 @@ div.question-header { ...@@ -149,7 +147,7 @@ div.question-header {
&.revision { &.revision {
text-align: center; text-align: center;
background:lighten($cream, 7%); // background:lighten($cream, 7%);
a { a {
color: black; color: black;
......
...@@ -24,7 +24,6 @@ div.wiki-wrapper { ...@@ -24,7 +24,6 @@ div.wiki-wrapper {
} }
p { p {
color: darken($cream, 55%);
float: left; float: left;
line-height: 46px; line-height: 46px;
margin-bottom: 0; margin-bottom: 0;
...@@ -40,14 +39,12 @@ div.wiki-wrapper { ...@@ -40,14 +39,12 @@ div.wiki-wrapper {
input[type="button"] { input[type="button"] {
@extend .block-link; @extend .block-link;
background-color: darken($cream, 5%);
background-position: 12px center; background-position: 12px center;
background-repeat: no-repeat; background-repeat: no-repeat;
border: 0; border: 0;
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken(#f6efd4, 20%);
@include border-radius(0); @include border-radius(0);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%)); @include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
color: darken($cream, 80%);
display: block; display: block;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment