From 1f6deeaf37152b1e18e91fa0f25e469f990084e1 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Mon, 18 Jun 2012 10:26:34 -0400 Subject: [PATCH 01/15] Initial commit --- _base.scss | 61 +++++++++++++++++++++++++++++++++++++ _reset.scss | 47 +++++++++++++++++++++++++++++ _settings.scss | 73 ++++++++++++++++++++++++++++++++++++++++++++ application.scss | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ index.haml | 13 ++++++++ 5 files changed, 272 insertions(+) create mode 100644 _base.scss create mode 100644 _reset.scss create mode 100644 _settings.scss create mode 100644 application.scss create mode 100644 index.haml diff --git a/_base.scss b/_base.scss new file mode 100644 index 0000000..8ca3e7f --- /dev/null +++ b/_base.scss @@ -0,0 +1,61 @@ +//----------------------------------------------------------------------- +// Base +//----------------------------------------------------------------------- + +html { + background: #FFF; + font-size: 16px; +} +body { + color: $color-base; + font: 62.5%/1.5 $font-base; +} + +// ----- Text Content ----- // + +// Headings + +h1, h2, h3, +h4, h5, h6 { font-weight: bold; } +h1 { font-size: 4em; } +h2 { font-size: 3.5em; } +h3 { font-size: 3em; } +h4 { font-size: 2.5em; } +h5 { font-size: 2em; } +h6 { font-size: 1.6em; } + +// Paragraphs + +p { + font-size: 1.6em; +} + +// ----- Inline Content ----- // + +// Links + +a { + color: $color-highlight; + text-decoration: none; + &:hover, + &:focus { + text-decoration: underline; + } +} + +// Formatting + +em { font-style: italic; } +strong { font-weight: bold; } + +// ----- Base Containers ----- // + +.inner { + +} +.block { + +} +.overlay { + +} diff --git a/_reset.scss b/_reset.scss new file mode 100644 index 0000000..3633eab --- /dev/null +++ b/_reset.scss @@ -0,0 +1,47 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/_settings.scss b/_settings.scss new file mode 100644 index 0000000..fe18d46 --- /dev/null +++ b/_settings.scss @@ -0,0 +1,73 @@ +//----------------------------------------------------------------------- +// Settings +//----------------------------------------------------------------------- + +// ----- @font-face ----- // + +// ... + +// ----- Variables ----- // + +// Colors + +$color-base: #222; +$color-highlight: #0053C9; + +// Fonts + +$font-base: 'Helvetica Neue', Helvetica, Arial, sans-serif; +$font-header: Arial, Helvetica, sans-serif; + +// ----- Mixins ----- // + +@mixin linear-gradient($direction, $color, $start, $end) { + background-color: $color; + background-image: -webkit-linear-gradient($direction, $start, $end); + background-image: -moz-linear-gradient($direction, $start, $end); + background-image: -ms-linear-gradient($direction, $start, $end); + background-image: -o-linear-gradient($direction, $start, $end); + background-image: linear-gradient($direction, $start, $end); +} +@mixin transform($arguments) { + -webkit-transform: $arguments; + -moz-transform: $arguments; + -ms-transform: $arguments; + transform: $arguments; + -webkit-backface-visibility: hidden; +} +@mixin transition($arguments) { + -webkit-transition: $arguments; + -moz-transition: $arguments; + -ms-transition: $arguments; + transition: $arguments; +} + +// ----- Extends ----- // + +.group { + zoom: 1; + &:before, + &:after { + content: ''; + display: table; + }; + &:after { + clear: both; + } +} +.ir { + background-color: transparent; + border: 0; + color: transparent; + font: 0/0 a; + text-shadow: none; +} +.ellipsis { + overflow: hidden; + -ms-text-overflow: ellipsis; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + white-space: nowrap; +} + +// ----- Animations ----- // diff --git a/application.scss b/application.scss new file mode 100644 index 0000000..66d17a7 --- /dev/null +++ b/application.scss @@ -0,0 +1,78 @@ +//----------------------------------------------------------------------- +// Imports +//----------------------------------------------------------------------- + +@import 'reset'; +@import 'settings'; +@import 'base'; + +//----------------------------------------------------------------------- +// Modules +//----------------------------------------------------------------------- + +// ----- Buttons ----- // + +.btn { + +} +.btn-default { + @extend .btn; +} +.btn-alt { + +} +.btn-highlight { + +} + +// ----- Icons ----- // + +i { + +} +.icn { + +} +// .icn-add, .icn-close, etc. + +// ----- Forms ----- // + +form { + +} + +// ----- Modals ----- // + +.modal { + +} + +// ----- Tooltips ----- // + +.tooltip { + +} + +// ----- Thumbs ----- // + +.thumb { + +} + +// ----- Dropdowns ----- // + +.dropdown { + +} + +//----------------------------------------------------------------------- +// Application +//----------------------------------------------------------------------- + +// Header, Logo, Navigation, Footer, etc. + +//----------------------------------------------------------------------- +// Controller Name +//----------------------------------------------------------------------- + +// ----- Action Name ----- // diff --git a/index.haml b/index.haml new file mode 100644 index 0000000..8b215e6 --- /dev/null +++ b/index.haml @@ -0,0 +1,13 @@ +!!! 5 + + + +%html{ :lang => "en" } + +%head + %meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge,chrome=1" } + %meta{ :charset => "utf-8" } + %title + %link{ :href => "css/application.css", :rel => "stylesheet" } +%body + / Content From fa9f1dba96f9aa28b09195fc369aaf8ae8328d6d Mon Sep 17 00:00:00 2001 From: Nick Walsh Date: Wed, 20 Jun 2012 12:44:37 -0400 Subject: [PATCH 02/15] Readme & License - closes issue #1 --- MIT-LICENSE | 7 +++++++ README.md | 6 ++++++ 2 files changed, 13 insertions(+) create mode 100644 MIT-LICENSE create mode 100644 README.md diff --git a/MIT-LICENSE b/MIT-LICENSE new file mode 100644 index 0000000..751b80f --- /dev/null +++ b/MIT-LICENSE @@ -0,0 +1,7 @@ +Copyright (C) 2012 Drew Barontini & Nick Walsh + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..3e2e51e --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +MVCSS +============= + +More information coming soon. For the time being, visit [the GitHub page](http://mvcss.github.com/MVCSS) for the low down. + +MVCSS is licensed under the MIT License. From c1c3f3b0474f90b8a99fc2987331db9a10f2fd02 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Wed, 20 Jun 2012 12:48:09 -0400 Subject: [PATCH 03/15] Drop Helvetica Neue in the font-base - closes #2 --- _settings.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_settings.scss b/_settings.scss index fe18d46..4a29cec 100644 --- a/_settings.scss +++ b/_settings.scss @@ -15,7 +15,7 @@ $color-highlight: #0053C9; // Fonts -$font-base: 'Helvetica Neue', Helvetica, Arial, sans-serif; +$font-base: Helvetica, Arial, sans-serif; $font-header: Arial, Helvetica, sans-serif; // ----- Mixins ----- // From ada618779b641cad1bd0bdd132076b3dbecd81e6 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Wed, 20 Jun 2012 12:59:19 -0400 Subject: [PATCH 04/15] Change font-header and font-base to use sans-serif - see #2 --- _settings.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_settings.scss b/_settings.scss index 4a29cec..43c84fb 100644 --- a/_settings.scss +++ b/_settings.scss @@ -15,8 +15,8 @@ $color-highlight: #0053C9; // Fonts -$font-base: Helvetica, Arial, sans-serif; -$font-header: Arial, Helvetica, sans-serif; +$font-base: sans-serif; +$font-header: sans-serif; // ----- Mixins ----- // From 4e936cd2f481e06a81c009da7b62e8c5a176b4c6 Mon Sep 17 00:00:00 2001 From: Jacob Swanner Date: Wed, 20 Jun 2012 14:10:30 -0400 Subject: [PATCH 05/15] Nest head and body tags in html tag. Because of the use of Haml for html tag, but no nesting the output was incorrect, and effectively the following: ... ... --- index.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.haml b/index.haml index 8b215e6..2866155 100644 --- a/index.haml +++ b/index.haml @@ -2,7 +2,7 @@ -%html{ :lang => "en" } + %head %meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge,chrome=1" } @@ -11,3 +11,4 @@ %link{ :href => "css/application.css", :rel => "stylesheet" } %body / Content + From 4345fe04a5a558f2f5783a509a5970be7b49e120 Mon Sep 17 00:00:00 2001 From: Jacob Swanner Date: Wed, 20 Jun 2012 14:15:15 -0400 Subject: [PATCH 06/15] Use HTML-style attributes. While this is more of an opinionated change, Haml does provide a more terse, less Ruby-specific attribute syntax, which I think is nicer. --- index.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.haml b/index.haml index 2866155..bcb6103 100644 --- a/index.haml +++ b/index.haml @@ -5,10 +5,10 @@ %head - %meta{ "http-equiv" => "X-UA-Compatible", :content => "IE=edge,chrome=1" } - %meta{ :charset => "utf-8" } + %meta(http-equiv="X-UA-Compatible" content="IE=edge,chrome=1") + %meta(charset="utf-8") %title - %link{ :href => "css/application.css", :rel => "stylesheet" } + %link(href="css/application.css" rel="stylesheet") %body / Content From 69da86cfd0f55d0246e960fa511ddc1191727b99 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Thu, 12 Jul 2012 07:43:55 -0400 Subject: [PATCH 07/15] Initial commit with Sass-style syntax --- _base.sass | 62 +++++++++++++++ _base.scss | 61 --------------- _reset.scss => _reset.sass | 56 ++++++-------- _settings.sass | 65 ++++++++++++++++ _settings.scss | 73 ------------------ application.scss => application.sass | 47 ++++-------- css/application.css | 108 +++++++++++++++++++++++++++ 7 files changed, 275 insertions(+), 197 deletions(-) create mode 100644 _base.sass delete mode 100644 _base.scss rename _reset.scss => _reset.sass (52%) create mode 100644 _settings.sass delete mode 100644 _settings.scss rename application.scss => application.sass (82%) create mode 100644 css/application.css diff --git a/_base.sass b/_base.sass new file mode 100644 index 0000000..9b978cd --- /dev/null +++ b/_base.sass @@ -0,0 +1,62 @@ +//----------------------------------------------------------------------- +// Base +//----------------------------------------------------------------------- + +html + background: #FFF + font-size: 16px +body + color: $color-base + font: 62.5%/1.5 $font-base + +// ----- Text Content ----- // + +// Headings + +h1, h2, h3, +h4, h5, h6 + font-weight: bold +h1 + font-size: 4em +h2 + font-size: 3.5em +h3 + font-size: 3em +h4 + font-size: 2.5em +h5 + font-size: 2em +h6 + font-size: 1.6em + +// Paragraphs + +p + font-size: 1.6em + +// ----- Inline Content ----- // + +// Links + +a + color: $color-highlight + text-decoration: none + &:hover, + &:focus + text-decoration: underline + +// Formatting + +em + font-style: italic +strong + font-weight: bold + +// ----- Base Containers ----- // + +.inner + +.block + +.overlay + diff --git a/_base.scss b/_base.scss deleted file mode 100644 index 8ca3e7f..0000000 --- a/_base.scss +++ /dev/null @@ -1,61 +0,0 @@ -//----------------------------------------------------------------------- -// Base -//----------------------------------------------------------------------- - -html { - background: #FFF; - font-size: 16px; -} -body { - color: $color-base; - font: 62.5%/1.5 $font-base; -} - -// ----- Text Content ----- // - -// Headings - -h1, h2, h3, -h4, h5, h6 { font-weight: bold; } -h1 { font-size: 4em; } -h2 { font-size: 3.5em; } -h3 { font-size: 3em; } -h4 { font-size: 2.5em; } -h5 { font-size: 2em; } -h6 { font-size: 1.6em; } - -// Paragraphs - -p { - font-size: 1.6em; -} - -// ----- Inline Content ----- // - -// Links - -a { - color: $color-highlight; - text-decoration: none; - &:hover, - &:focus { - text-decoration: underline; - } -} - -// Formatting - -em { font-style: italic; } -strong { font-weight: bold; } - -// ----- Base Containers ----- // - -.inner { - -} -.block { - -} -.overlay { - -} diff --git a/_reset.scss b/_reset.sass similarity index 52% rename from _reset.scss rename to _reset.sass index 3633eab..cb7ea8c 100644 --- a/_reset.scss +++ b/_reset.sass @@ -1,7 +1,6 @@ -/* http://meyerweb.com/eric/tools/css/reset/ - v2.0 | 20110126 - License: none (public domain) -*/ +// http://meyerweb.com/eric/tools/css/reset/ +// v2.0 | 20110126 +// License: none (public domain) html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, @@ -15,33 +14,26 @@ table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} +time, mark, audio, video + margin: 0 + padding: 0 + border: 0 + font-size: 100% + font: inherit + vertical-align: baseline article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; -} -body { - line-height: 1; -} -ol, ul { - list-style: none; -} -blockquote, q { - quotes: none; -} +footer, header, hgroup, menu, nav, section + display: block +body + line-height: 1 +ol, ul + list-style: none +blockquote, q + quotes: none blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; -} -table { - border-collapse: collapse; - border-spacing: 0; -} +q:before, q:after + content: '' + content: none +table + border-collapse: collapse + border-spacing: 0 diff --git a/_settings.sass b/_settings.sass new file mode 100644 index 0000000..ea623b0 --- /dev/null +++ b/_settings.sass @@ -0,0 +1,65 @@ +//----------------------------------------------------------------------- +// Settings +//----------------------------------------------------------------------- + +// ----- @font-face ----- // + +// ... + +// ----- Variables ----- // + +// Colors + +$color-base: #222 +$color-highlight: #0053C9 + +// Fonts + +$font-base: sans-serif +$font-header: sans-serif + +// ----- Mixins ----- // + +=linear-gradient($direction, $color, $start, $end) + background-color: $color + background-image: -webkit-linear-gradient($direction, $start, $end) + background-image: -moz-linear-gradient($direction, $start, $end) + background-image: -ms-linear-gradient($direction, $start, $end) + background-image: -o-linear-gradient($direction, $start, $end) + background-image: linear-gradient($direction, $start, $end) +=transform($arguments) + -webkit-transform: $arguments + -moz-transform: $arguments + -ms-transform: $arguments + transform: $arguments + -webkit-backface-visibility: hidden +=transition($arguments) + -webkit-transition: $arguments + -moz-transition: $arguments + -ms-transition: $arguments + transition: $arguments + +// ----- Extends ----- // + +.group + zoom: 1 + &:before, + &:after + content: '' + display: table + &:after + clear: both +.ir + background-color: transparent + border: 0 + color: transparent + font: 0/0 a + text-shadow: none +.ellipsis + overflow: hidden + -ms-text-overflow: ellipsis + -o-text-overflow: ellipsis + text-overflow: ellipsis + white-space: nowrap + +// ----- Animations ----- // diff --git a/_settings.scss b/_settings.scss deleted file mode 100644 index 43c84fb..0000000 --- a/_settings.scss +++ /dev/null @@ -1,73 +0,0 @@ -//----------------------------------------------------------------------- -// Settings -//----------------------------------------------------------------------- - -// ----- @font-face ----- // - -// ... - -// ----- Variables ----- // - -// Colors - -$color-base: #222; -$color-highlight: #0053C9; - -// Fonts - -$font-base: sans-serif; -$font-header: sans-serif; - -// ----- Mixins ----- // - -@mixin linear-gradient($direction, $color, $start, $end) { - background-color: $color; - background-image: -webkit-linear-gradient($direction, $start, $end); - background-image: -moz-linear-gradient($direction, $start, $end); - background-image: -ms-linear-gradient($direction, $start, $end); - background-image: -o-linear-gradient($direction, $start, $end); - background-image: linear-gradient($direction, $start, $end); -} -@mixin transform($arguments) { - -webkit-transform: $arguments; - -moz-transform: $arguments; - -ms-transform: $arguments; - transform: $arguments; - -webkit-backface-visibility: hidden; -} -@mixin transition($arguments) { - -webkit-transition: $arguments; - -moz-transition: $arguments; - -ms-transition: $arguments; - transition: $arguments; -} - -// ----- Extends ----- // - -.group { - zoom: 1; - &:before, - &:after { - content: ''; - display: table; - }; - &:after { - clear: both; - } -} -.ir { - background-color: transparent; - border: 0; - color: transparent; - font: 0/0 a; - text-shadow: none; -} -.ellipsis { - overflow: hidden; - -ms-text-overflow: ellipsis; - -o-text-overflow: ellipsis; - text-overflow: ellipsis; - white-space: nowrap; -} - -// ----- Animations ----- // diff --git a/application.scss b/application.sass similarity index 82% rename from application.scss rename to application.sass index 66d17a7..ce1588d 100644 --- a/application.scss +++ b/application.sass @@ -2,9 +2,9 @@ // Imports //----------------------------------------------------------------------- -@import 'reset'; -@import 'settings'; -@import 'base'; +@import reset +@import settings +@import base //----------------------------------------------------------------------- // Modules @@ -12,58 +12,43 @@ // ----- Buttons ----- // -.btn { +.btn + +.btn-default + @extend .btn -} -.btn-default { - @extend .btn; -} -.btn-alt { +.btn-alt -} -.btn-highlight { +.btn-highlight -} // ----- Icons ----- // -i { +i -} -.icn { +.icn -} // .icn-add, .icn-close, etc. // ----- Forms ----- // -form { - -} +form // ----- Modals ----- // -.modal { - -} +.modal // ----- Tooltips ----- // -.tooltip { - -} +.tooltip // ----- Thumbs ----- // -.thumb { - -} +.thumb // ----- Dropdowns ----- // -.dropdown { - -} +.dropdown //----------------------------------------------------------------------- // Application diff --git a/css/application.css b/css/application.css new file mode 100644 index 0000000..c20e379 --- /dev/null +++ b/css/application.css @@ -0,0 +1,108 @@ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; } + +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; } + +body { + line-height: 1; } + +ol, ul { + list-style: none; } + +blockquote, q { + quotes: none; } + +blockquote:before, blockquote:after, +q:before, q:after { + content: ""; + content: none; } + +table { + border-collapse: collapse; + border-spacing: 0; } + +.group { + zoom: 1; } + .group:before, .group:after { + content: ""; + display: table; } + .group:after { + clear: both; } + +.ir { + background-color: transparent; + border: 0; + color: transparent; + font: 0/0 a; + text-shadow: none; } + +.ellipsis { + overflow: hidden; + -ms-text-overflow: ellipsis; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + white-space: nowrap; } + +html { + background: white; + font-size: 16px; } + +body { + color: #222222; + font: 62.5%/1.5 sans-serif; } + +h1, h2, h3, +h4, h5, h6 { + font-weight: bold; } + +h1 { + font-size: 4em; } + +h2 { + font-size: 3.5em; } + +h3 { + font-size: 3em; } + +h4 { + font-size: 2.5em; } + +h5 { + font-size: 2em; } + +h6 { + font-size: 1.6em; } + +p { + font-size: 1.6em; } + +a { + color: #0053c9; + text-decoration: none; } + a:hover, a:focus { + text-decoration: underline; } + +em { + font-style: italic; } + +strong { + font-weight: bold; } From 9b7cc186ee96e4d127d28e6d22e6c340ca3d4e4c Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Thu, 12 Jul 2012 07:45:17 -0400 Subject: [PATCH 08/15] Remove the CSS output --- css/application.css | 108 -------------------------------------------- 1 file changed, 108 deletions(-) delete mode 100644 css/application.css diff --git a/css/application.css b/css/application.css deleted file mode 100644 index c20e379..0000000 --- a/css/application.css +++ /dev/null @@ -1,108 +0,0 @@ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; } - -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; } - -body { - line-height: 1; } - -ol, ul { - list-style: none; } - -blockquote, q { - quotes: none; } - -blockquote:before, blockquote:after, -q:before, q:after { - content: ""; - content: none; } - -table { - border-collapse: collapse; - border-spacing: 0; } - -.group { - zoom: 1; } - .group:before, .group:after { - content: ""; - display: table; } - .group:after { - clear: both; } - -.ir { - background-color: transparent; - border: 0; - color: transparent; - font: 0/0 a; - text-shadow: none; } - -.ellipsis { - overflow: hidden; - -ms-text-overflow: ellipsis; - -o-text-overflow: ellipsis; - text-overflow: ellipsis; - white-space: nowrap; } - -html { - background: white; - font-size: 16px; } - -body { - color: #222222; - font: 62.5%/1.5 sans-serif; } - -h1, h2, h3, -h4, h5, h6 { - font-weight: bold; } - -h1 { - font-size: 4em; } - -h2 { - font-size: 3.5em; } - -h3 { - font-size: 3em; } - -h4 { - font-size: 2.5em; } - -h5 { - font-size: 2em; } - -h6 { - font-size: 1.6em; } - -p { - font-size: 1.6em; } - -a { - color: #0053c9; - text-decoration: none; } - a:hover, a:focus { - text-decoration: underline; } - -em { - font-style: italic; } - -strong { - font-weight: bold; } From c073c60ff9af3bc1f561955d0525dd2eaf928f30 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Thu, 12 Jul 2012 07:46:35 -0400 Subject: [PATCH 09/15] Remove extra space --- application.sass | 1 - 1 file changed, 1 deletion(-) diff --git a/application.sass b/application.sass index ce1588d..f5751c6 100644 --- a/application.sass +++ b/application.sass @@ -21,7 +21,6 @@ .btn-highlight - // ----- Icons ----- // i From 739e9093d16ac5ead1cad62b90cd9c2210ed237d Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Thu, 12 Jul 2012 09:24:11 -0400 Subject: [PATCH 10/15] Add quotes around @imports --- application.sass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application.sass b/application.sass index f5751c6..30e8c62 100644 --- a/application.sass +++ b/application.sass @@ -2,9 +2,9 @@ // Imports //----------------------------------------------------------------------- -@import reset -@import settings -@import base +@import "reset" +@import "settings" +@import "base" //----------------------------------------------------------------------- // Modules From da7cf02327e8eae89dd88a064afa07127902f09c Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Fri, 24 Aug 2012 06:25:04 -0400 Subject: [PATCH 11/15] Updates to application and _settings --- _settings.sass | 42 ++++++++++++------------------------------ application.sass | 16 ++++++++++------ 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/_settings.sass b/_settings.sass index ea623b0..b38e55b 100644 --- a/_settings.sass +++ b/_settings.sass @@ -18,30 +18,19 @@ $color-highlight: #0053C9 $font-base: sans-serif $font-header: sans-serif -// ----- Mixins ----- // +// ----- Extends ----- // -=linear-gradient($direction, $color, $start, $end) - background-color: $color - background-image: -webkit-linear-gradient($direction, $start, $end) - background-image: -moz-linear-gradient($direction, $start, $end) - background-image: -ms-linear-gradient($direction, $start, $end) - background-image: -o-linear-gradient($direction, $start, $end) - background-image: linear-gradient($direction, $start, $end) -=transform($arguments) - -webkit-transform: $arguments - -moz-transform: $arguments - -ms-transform: $arguments - transform: $arguments - -webkit-backface-visibility: hidden -=transition($arguments) - -webkit-transition: $arguments - -moz-transition: $arguments - -ms-transition: $arguments - transition: $arguments +%debug + background-color: pink !important -// ----- Extends ----- // +%ellipsis + overflow: hidden + -ms-text-overflow: ellipsis + -o-text-overflow: ellipsis + text-overflow: ellipsis + white-space: nowrap -.group +%group zoom: 1 &:before, &:after @@ -49,17 +38,10 @@ $font-header: sans-serif display: table &:after clear: both -.ir + +%ir background-color: transparent border: 0 color: transparent font: 0/0 a text-shadow: none -.ellipsis - overflow: hidden - -ms-text-overflow: ellipsis - -o-text-overflow: ellipsis - text-overflow: ellipsis - white-space: nowrap - -// ----- Animations ----- // diff --git a/application.sass b/application.sass index 30e8c62..ade5efe 100644 --- a/application.sass +++ b/application.sass @@ -2,6 +2,8 @@ // Imports //----------------------------------------------------------------------- +// Import Compass here. + @import "reset" @import "settings" @import "base" @@ -12,14 +14,16 @@ // ----- Buttons ----- // -.btn - -.btn-default - @extend .btn +%btn + +.btn-a + @extend %btn -.btn-alt +.btn-b + @extend %btn -.btn-highlight +.btn-c + @extend %btn // ----- Icons ----- // From d0d8c5dac4248b56009b4b1cafe76e638677acf7 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Fri, 24 Aug 2012 06:25:25 -0400 Subject: [PATCH 12/15] Remove period --- application.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application.sass b/application.sass index ade5efe..5586031 100644 --- a/application.sass +++ b/application.sass @@ -2,7 +2,7 @@ // Imports //----------------------------------------------------------------------- -// Import Compass here. +// Import Compass here @import "reset" @import "settings" From aaa5514514cd4be2c19e8bc003fb66ad0e9d53c3 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Fri, 24 Aug 2012 06:25:56 -0400 Subject: [PATCH 13/15] Add Inbox section --- application.sass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application.sass b/application.sass index 5586031..59f630e 100644 --- a/application.sass +++ b/application.sass @@ -64,3 +64,8 @@ form //----------------------------------------------------------------------- // ----- Action Name ----- // + +//----------------------------------------------------------------------- +// Inbox +//----------------------------------------------------------------------- + From 96c1eee8b7be4f3c506c7a2f83db949bf377842b Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Fri, 24 Aug 2012 06:55:31 -0400 Subject: [PATCH 14/15] Add placeholder comment headings back --- _settings.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_settings.sass b/_settings.sass index b38e55b..dd7f732 100644 --- a/_settings.sass +++ b/_settings.sass @@ -18,6 +18,8 @@ $color-highlight: #0053C9 $font-base: sans-serif $font-header: sans-serif +// ----- Mixins ----- // + // ----- Extends ----- // %debug @@ -45,3 +47,5 @@ $font-header: sans-serif color: transparent font: 0/0 a text-shadow: none + +// ----- Animations ----- // From 307b9e3ecc751b01b4000524de0dc6daaf838207 Mon Sep 17 00:00:00 2001 From: Drew Barontini Date: Fri, 24 Aug 2012 07:12:05 -0400 Subject: [PATCH 15/15] Add respond-to mixin --- _settings.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_settings.sass b/_settings.sass index dd7f732..48a1955 100644 --- a/_settings.sass +++ b/_settings.sass @@ -20,6 +20,10 @@ $font-header: sans-serif // ----- Mixins ----- // +=respond-to($val, $query: min-width, $media: screen) + @media #{$media} and ($query: $val) + @content + // ----- Extends ----- // %debug