From 5ce55c00ac72bc6fbdd095d7ee697cfa35ea8cc4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 12:11:15 -0400 Subject: Redo styles to be "pure"/simple bootstrap, and fix found issues with forms. --- app/assets/stylesheets/colors.css.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/assets/stylesheets/colors.css.scss') diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss index c875caa..7ab3024 100644 --- a/app/assets/stylesheets/colors.css.scss +++ b/app/assets/stylesheets/colors.css.scss @@ -1,5 +1,5 @@ $darker-orange: #9D4102; $link-yellow: #FFC50D; $orange: #DD9125; -$page-color: #444; -$toolbar-color: black; +/*$page-color: #444;*/ +/*$toolbar-color: black;*/ -- cgit v1.2.3 From 8c5772072066eb57cda4b0b8953aebe3af33ca2d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 17:01:48 -0400 Subject: condense the stylesheets --- app/assets/stylesheets/colors.css.scss | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'app/assets/stylesheets/colors.css.scss') diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss index 7ab3024..8e0b3de 100644 --- a/app/assets/stylesheets/colors.css.scss +++ b/app/assets/stylesheets/colors.css.scss @@ -1,5 +1,24 @@ +/* $darker-orange: #9D4102; $link-yellow: #FFC50D; $orange: #DD9125; -/*$page-color: #444;*/ -/*$toolbar-color: black;*/ +$page-color: #444; +$toolbar-color: black; +*/ + +// See this file for a complete list of variables: +// vendor/bundle/ruby/2.0.0/gems/bootstrap-sass-3.1.1.1/vendor/assets/stylesheets/bootstrap/_variables.scss +/* +$gray-darker: lighten(#000, 13.5%) !default; // #222 +$gray-dark: lighten(#000, 20%) !default; // #333 +$gray: lighten(#000, 33.5%) !default; // #555 +$gray-light: lighten(#000, 60%) !default; // #999 +$gray-lighter: lighten(#000, 93.5%) !default; // #eee + +$brand-primary: #428bca !default; +$brand-success: #5cb85c !default; +$brand-info: #5bc0de !default; +$brand-warning: #f0ad4e !default; +$brand-danger: #d9534f !default; +*/ +$legend-border-color: #ccc; // matches the default $input-border and $btn-default-border -- cgit v1.2.3 From e2796a3f26c200123f81a9957b84378aad6fc952 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 3 May 2014 19:26:52 -0400 Subject: foo --- app/assets/stylesheets/colors.css.scss | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 app/assets/stylesheets/colors.css.scss (limited to 'app/assets/stylesheets/colors.css.scss') diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss deleted file mode 100644 index 8e0b3de..0000000 --- a/app/assets/stylesheets/colors.css.scss +++ /dev/null @@ -1,24 +0,0 @@ -/* -$darker-orange: #9D4102; -$link-yellow: #FFC50D; -$orange: #DD9125; -$page-color: #444; -$toolbar-color: black; -*/ - -// See this file for a complete list of variables: -// vendor/bundle/ruby/2.0.0/gems/bootstrap-sass-3.1.1.1/vendor/assets/stylesheets/bootstrap/_variables.scss -/* -$gray-darker: lighten(#000, 13.5%) !default; // #222 -$gray-dark: lighten(#000, 20%) !default; // #333 -$gray: lighten(#000, 33.5%) !default; // #555 -$gray-light: lighten(#000, 60%) !default; // #999 -$gray-lighter: lighten(#000, 93.5%) !default; // #eee - -$brand-primary: #428bca !default; -$brand-success: #5cb85c !default; -$brand-info: #5bc0de !default; -$brand-warning: #f0ad4e !default; -$brand-danger: #d9534f !default; -*/ -$legend-border-color: #ccc; // matches the default $input-border and $btn-default-border -- cgit v1.2.3