From fb76b4db64583def6db3aac43e31c25d3bd489df Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Tue, 4 Mar 2014 16:22:22 -0500 Subject: Git is telling me to commit I dont know why --- app/assets/stylesheets/scaffolds.css.scss | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 8279f4f..6ec6a8f 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -1,13 +1,9 @@ body { - background-color: #EEEEEE; + background-color: #fff; color: #333; font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; - - h1, h2, h3, h4, h5{ - color: #0f0f0f; - } } p, ol, ul, td { @@ -71,19 +67,3 @@ div { list-style: square; } } - -hr { - -moz-border-bottom-colors: none; - -moz-border-image: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - border-color: #999 -moz-use-text-color #FFFFFF; - border-style: solid none; - border-width: 1px 0; - margin: 18px 0; -} - -#footer{ - text-align: center; -} -- cgit v1.2.3-2-g168b From 489a9f7291b6b7c1143bb482f637020d82f944d5 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Tue, 4 Mar 2014 17:44:40 -0500 Subject: Buttons fixed --- app/assets/stylesheets/custom.css.scss | 21 +++++++++++++++++---- app/assets/stylesheets/scaffolds.css.scss | 4 ++-- 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index a8a8e68..faecdce 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -4,7 +4,20 @@ header > nav { @extend .navbar; @extend .navbar-inverse; color: white; -} -header > nav > #log-buttons{ - margin-top: 8px; -} + + #log-buttons { + margin-top: 8px; + } + .signup { + @extend .btn; + @extend .btn-success; + } + .signin { + @extend .btn; + @extend .btn-info; + } + .signout { + @extend .btn; + @extend .btn-danger; + } + } \ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 39b6845..252cb2b 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -25,10 +25,10 @@ pre { a { color: #000; &:visited { - color: #666; + color: white; } &:hover { - color: #000; + color: white; text-decoration: none; } } -- cgit v1.2.3-2-g168b From 6d48e4641520ce03796e5b9edd258f704cee3e82 Mon Sep 17 00:00:00 2001 From: DavisLWebb Date: Tue, 4 Mar 2014 17:46:05 -0500 Subject: Changed some username validation stuff --- app/assets/stylesheets/scaffolds.css.scss | 7 ------- 1 file changed, 7 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 566d05d..f705417 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -4,13 +4,10 @@ body { font-family: verdana, arial, helvetica, sans-serif; font-size: 13px; line-height: 18px; -<<<<<<< HEAD -======= } h1, h2, h3, h4, h5{ color: #0f0f0f; ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b } p, ol, ul, td { @@ -74,9 +71,6 @@ div { list-style: square; } } -<<<<<<< HEAD -======= - hr { -moz-border-bottom-colors: none; -moz-border-image: none; @@ -102,4 +96,3 @@ hr { #footer{ text-align: center; } ->>>>>>> aca85cf084702c29014a17eafb090421061fae8b -- cgit v1.2.3-2-g168b