diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
| commit | 2eb8e1c090071abf3108828efc831f12128e17df (patch) | |
| tree | a1410e2cc118db1b410808b7f339e4c5f52bd43c /app/assets/stylesheets/application.css | |
| parent | fb76b4db64583def6db3aac43e31c25d3bd489df (diff) | |
| parent | aca85cf084702c29014a17eafb090421061fae8b (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/assets/stylesheets/application.css')
| -rw-r--r-- | app/assets/stylesheets/application.css | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 355c0d4..896d7c1 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -9,16 +9,15 @@ * compiled file, but it's generally better to create a new file per style scope. * *= require_self - *= require_tree - + *= require_tree . */ #query{ - background-color: #888; + background-color: white; border: 2px solid #ED9C28; border-radius: 5px; color: #FFF; font-weight: bold; height: 30px; -}
\ No newline at end of file +} |