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/static.css.scss | |
| 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/static.css.scss')
| -rw-r--r-- | app/assets/stylesheets/static.css.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss index 9457e7f..d73e77d 100644 --- a/app/assets/stylesheets/static.css.scss +++ b/app/assets/stylesheets/static.css.scss @@ -1,6 +1,6 @@ // Place all the styles related to the static controller here. // They will automatically be included in application.css. -// You can use Sass (SCSS) here: +// You can use Sass (SCSS) here: http://sass-lang.com/ .jumbotron { background-color: #FFF; @@ -9,4 +9,4 @@ line-height: 1.5em; } -}
\ No newline at end of file +} |