From cde35e3461bf49a4b32aefca7b8556e344c8090e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 4 Mar 2014 18:48:38 -0500 Subject: login/logout buttons --- app/assets/stylesheets/custom.css.scss | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index faecdce..0599a93 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -7,17 +7,13 @@ header > nav { #log-buttons { margin-top: 8px; - } - .signup { - @extend .btn; - @extend .btn-success; - } - .signin { + form { display: inline; } + a, input[type="submit"] { @extend .btn; - @extend .btn-info; + &.user { @extend .btn-info; } + &.signup { @extend .btn-success; } + &.signin { @extend .btn-info; } + &.signout { @extend .btn-danger; } } - .signout { - @extend .btn; - @extend .btn-danger; - } - } \ No newline at end of file + } +} -- cgit v1.2.3-54-g00ecf From 66d5669dbcc042317ca5d10759276ea5813f7081 Mon Sep 17 00:00:00 2001 From: guntasgrewal Date: Tue, 4 Mar 2014 18:52:58 -0500 Subject: minor color changes --- app/assets/stylesheets/scaffolds.css.scss | 4 ++-- app/views/layouts/application.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/assets/stylesheets') diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 2c8c009..e4b33b3 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: white; + color: #000; } &:hover { - color: white; + color: green; text-decoration: none; } } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9cc30bc..cb4a3d6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,7 @@