diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:56:33 -0500 |
commit | a1700f50ee800cfbfb93bd7dfff7b5d79ae2cb2f (patch) | |
tree | c9db0b8bdd4818f5ce2ff982657e2aedfda98f8f /app/assets/stylesheets/tournaments.css.scss | |
parent | 706392b7c4520382ddd8f827b31205c6b71f5320 (diff) | |
parent | 63830b0f939db5f6911218950525428420c4d467 (diff) |
Merge branch 'master2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/tournament.rb
app/views/tournaments/_selected.html.erb
app/views/tournaments/new.html.erb
config/routes.rb
Diffstat (limited to 'app/assets/stylesheets/tournaments.css.scss')
-rw-r--r-- | app/assets/stylesheets/tournaments.css.scss | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss index e372b90..458897e 100644 --- a/app/assets/stylesheets/tournaments.css.scss +++ b/app/assets/stylesheets/tournaments.css.scss @@ -1,3 +1,12 @@ // Place all the styles related to the tournaments controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ + +p.default-field { + display: inline; +} + +span.default-explanation { + color: gray; + font-style: italic; +} |