diff options
| author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:51:46 -0500 |
|---|---|---|
| committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-04 19:51:46 -0500 |
| commit | d73a82b74685df29eb37c1a8b250951827dc164b (patch) | |
| tree | e9fc3e56cc60e4262f4870e834b7dbc5f13e31d2 /app/assets/stylesheets | |
| parent | 7ea754bef9e07405a86ce3fc9b0597fef3c1aa35 (diff) | |
| parent | 6db29eb669a85e5b0aac7a1e8879781a1cb77772 (diff) | |
I REALLY hope I'm not overwriting anything
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/custom.css.scss
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 13 | ||||
| -rw-r--r-- | app/assets/stylesheets/scaffolds.css.scss | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index 906780e..489914b 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -7,6 +7,7 @@ header > nav { #log-buttons { margin-top: 8px; +<<<<<<< HEAD } .signup { @extend .btn; @@ -43,3 +44,15 @@ p.errors { } +======= + form { display: inline; } + a, input[type="submit"] { + @extend .btn; + &.user { @extend .btn-info; } + &.signup { @extend .btn-success; } + &.signin { @extend .btn-info; } + &.signout { @extend .btn-danger; } + } + } +} +>>>>>>> 6db29eb669a85e5b0aac7a1e8879781a1cb77772 diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 9400133..07c7676 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; } } |