Permalink
Browse files

Adding .gitignore.

  • Loading branch information...
1 parent ed9872d commit 30a0ee47a960f64c6fe25610064e7f5c7b1fefb7 Jameson Tyler committed Mar 22, 2013
Showing with 42 additions and 107 deletions.
  1. +5 −0 .gitignore
  2. +9 −5 assets/css/master.css
  3. +23 −45 assets/css/scss/_responsive-layout.scss
  4. +5 −57 assets/css/scss/_variables.scss
View
@@ -0,0 +1,5 @@
+*.pyc
+.DS_Store
+local_settings.py
+_uploads
+uploads
View
@@ -12,7 +12,7 @@ h3,
h4,
h5,
h6 {
- font-family: "Ideal Sans", Verdana, sans-serif;
+ font-family: "Proxima Nova", Verdana, sans-serif;
font-weight: 500;
color: #333333; }
@@ -945,7 +945,6 @@ footer {
.not-phone-demo {
background: #f0d8d8;
color: #913838; } }
-/* Global */
body {
max-width: 1140px;
-moz-font-feature-settings: "liga=1, dlig=1";
@@ -965,11 +964,15 @@ body {
font-size: 1.5rem;
line-height: 1.4em; }
+@media (min-width: 103.125em) {
+ body {
+ font-size: 162.5%;
+ width: 70%; } }
@media (min-width: 75em) {
body {
font-size: 150%;
width: 70%; } }
-@media (min-width: 64.375em) and (max-width: 74.937em) {
+@media (min-width: 64.375em) {
body {
font-size: 137.5%;
width: 80%; } }
@@ -993,5 +996,6 @@ body {
h5 {
font-size: 1.375em; } }
-body {
- font-size: 100%; }
+@media (max-width: 25em) {
+ body {
+ font-size: 100%; } }
@@ -1,6 +1,6 @@
// This is where all of the layout modifications should live, anything that deviates from proto or base.
-/* Global */
+// Global
body {
max-width: 1140px;
@@ -16,6 +16,8 @@ body {
}
}
+// Helper Classes (Non-Proto)
+
.lead {
font-size: 1.5rem; // 24px
line-height: 1.4em;
@@ -27,37 +29,43 @@ body {
// Page specific
+// This is where you insert page specific styles. These may also be split out into partials in the future.
-// Desktop
+// Width X-Large
+@media (min-width: $widthXlg) {
+ body {
+ font-size: 162.5%;
+ width: 70%;
+ // max-width: 1360px;
+ }
+}
+// Width Large
@media (min-width: $widthLg) {
body {
font-size: 150%;
width: 70%;
}
}
-// Tablet Up To Desktop
-
-@media (min-width: $widthMed) and (max-width: $widthLg - 0.063em) {
+// Width Med
+@media (min-width: $widthMed) {
body {
font-size: 137.5%;
width: 80%;
}
}
-// Tablet Down To Phone
-
+// Unnamed for now.
@media (max-width: $widthMed - 0.063em) {
body {
font-size: 125%;
width: 85%;
}
}
-// Phone
-
+// Width Small
@media (max-width:$widthSm) {
body {
font-size: 112.5%;
@@ -82,39 +90,9 @@ body {
}
}
-body {
-
- font-size: 100%;
-}
-
-
-
-// @media screen and (min-width: 20.000em) { // 320px
-// }@media screen and (min-width: 25.000em) { // 400px
-// }@media screen and (max-width: 37.438em) { // 599px
-// }@media screen and (min-width: 37.500em) { // 600px
-// body {
-// font-size: 112.5%}
-// h2, h3, h4, h5 {
-// font-size: 1.875em;
-// line-height: 1.3em;
-// }
-// h5 {
-// font-size: 1.375em;
-// }
-
-// }@media screen and (min-width: 64.375em) { // 1030px
-// body {
-// font-size: 137.5%}
-
-// }@media screen and (min-width: 75.000em) and (min-height:31.250em) { // 1200px and 500px
-// body {
-// font-size: 150%}
-
-// }@media screen and (min-width: 103.125em) and (min-height:50.000em) { // 1650px and 800px
-// body {
-// font-size: 162.5%}
-// .container {
-// max-width: 1360px;
-
-// }@media screen and (min-height:43.750em) { // 700px
+// Width X-Small
+@media (max-width:$widthXsm) {
+ body {
+ font-size: 100%;
+ }
+}
@@ -2,76 +2,25 @@
$blockColor: #333333;
$blockBackground: #eee;
$centerWidth: 70%;
-// $colCount: 2;
-// $colSpan: 1;
$gutter: 4%;
// Demo
$DemoPass: #dff0d8;
$DemoFail: #f0d8d8;
// Media Query
-// FIX: These need to be thought over more thoroughly
+// Width
$widthXlg: 103.125em; // 1650px
$widthLg: 75.000em; // 1200px
$widthMed: 64.375em; // 1030px
$widthSm: 37.500em; // 600px
+$widthXsm: 25.000em; // 400px
-// @media screen and (min-width: 20.000em) { // 320px
-// }@media screen and (min-width: 25.000em) { // 400px
-// }@media screen and (max-width: 37.438em) { // 599px
-// }@media screen and (min-width: 37.500em) { // 600px
-// body {
-// font-size: 112.5%}
-// h2, h3, h4, h5 {
-// font-size: 1.875em;
-// line-height: 1.3em;
-// }
-// h5 {
-// font-size: 1.375em;
-// }
-
-// }@media screen and (min-width: 64.375em) { // 1030px
-// body {
-// font-size: 137.5%}
-
-// }@media screen and (min-width: 75.000em) and (min-height:31.250em) { // 1200px and 500px
-// body {
-// font-size: 150%}
-
-// }@media screen and (min-width: 103.125em) and (min-height:50.000em) { // 1650px and 800px
-// body {
-// font-size: 162.5%}
-// .container {
-// max-width: 1360px;
-
-// }@media screen and (min-height:43.750em) { // 700px
-
-
-
-// FIX: Define these later
+// Heights
$heightSm: 31.250em; // 500px
$heightMed: 43.750em; // 700px
$heightLg: 50.000em; // 800px
-
-
-// These are from Kabam
-// Media Query Width
-// FIX: Ensure there isn't a break from
-// $desktopWidth: 76em; // 1024px;
-// $widthLg: 78em;
-// $widthMed: 48em; // 768px;
-// $widthSm: 32em; // 480px;
-
-// Media Query Height
-// $heightSm: 45em; // 720px;
-// $heightMed: 55em; // 880px;
-// $heightLg: 65em; // 1040px;
-// These are from Kabam
-
-
-
// Colors
$textColor: #333333;
$linkColor: #30466f;
@@ -82,7 +31,6 @@ $red: #c92425;
$cream: #f1e3c6;
$black: #000;
-
-// Type
-$sans: "Ideal Sans", Verdana, sans-serif;
+// Typography
+$sans: "Proxima Nova", Verdana, sans-serif;
$serif: "Elena Basic", Georgia, serif;

0 comments on commit 30a0ee4

Please sign in to comment.