summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-03-04 17:46:20 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-03-04 17:46:20 -0500
commit19b135ec55e040c78009400f389d19ae58cc628c (patch)
tree6494c92a75f7c28f64bee81f2ed9a4eca8b7c28f /app/assets
parent6d48e4641520ce03796e5b9edd258f704cee3e82 (diff)
parent6b27e11f1613967d2b97b0eead6cf06263e6140b (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/custom.css.scss21
-rw-r--r--app/assets/stylesheets/scaffolds.css.scss4
2 files changed, 19 insertions, 6 deletions
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 f705417..2c8c009 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;
}
}