From 9d64e8898f767b42ce231b34abe4333007d7d0df Mon Sep 17 00:00:00 2001 From: Tomer Kimia Date: Sat, 1 Mar 2014 21:31:39 -0500 Subject: Added bootstrap and games to routes --- app/assets/stylesheets/custom.css.scss | 1 + 1 file changed, 1 insertion(+) create mode 100644 app/assets/stylesheets/custom.css.scss (limited to 'app') diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss new file mode 100644 index 0000000..b0692d8 --- /dev/null +++ b/app/assets/stylesheets/custom.css.scss @@ -0,0 +1 @@ +@import "bootstrap"; \ No newline at end of file -- cgit v1.2.3-2-g168b From c1f3f731cdf3201905fd8797dd4fe33783f2bc53 Mon Sep 17 00:00:00 2001 From: Tomer Kimia Date: Sat, 1 Mar 2014 22:53:08 -0500 Subject: quick and dirty css --- app/assets/stylesheets/scaffolds.css.scss | 78 +++++++++++++++++++++++++++++++ app/views/games/index.html.erb | 35 ++++++++++++++ app/views/layouts/application.html.erb | 14 ++++-- app/views/tournaments/index.html.erb | 27 +++++++++++ 4 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 app/assets/stylesheets/scaffolds.css.scss create mode 100644 app/views/games/index.html.erb create mode 100644 app/views/tournaments/index.html.erb (limited to 'app') diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss new file mode 100644 index 0000000..7561529 --- /dev/null +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -0,0 +1,78 @@ +body { + background-color: #909090; + color: #333; + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; + + h1, h2, h3, h4, h5{ + color: #F0F0F0; + } +} + +p, ol, ul, td { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; +} + +pre { + background-color: #eee; + padding: 10px; + font-size: 11px; +} + +a { + color: #000; + &:visited { + color: #666; + } + &:hover { + color: #fff; + background-color: #000; + } +} + +div { + &.field, &.actions { + margin-bottom: 10px; + } +} + +#notice { + color: green; +} + +.field_with_errors { + padding: 2px; + background-color: red; + display: table; +} + +#error_explanation { + width: 450px; + border: 2px solid red; + padding: 7px; + padding-bottom: 0; + margin-bottom: 20px; + background-color: #f0f0f0; + h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px; + margin-bottom: 0px; + background-color: #c00; + color: #fff; + } + ul li { + font-size: 12px; + list-style: square; + } +} + + +#footer{ + text-align: center; +} diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb new file mode 100644 index 0000000..2c178f5 --- /dev/null +++ b/app/views/games/index.html.erb @@ -0,0 +1,35 @@ +

Listing games

+ + + + + + + + + + + + + + + + + <% @games.each do |game| %> + + + + + + + + + + + <% end %> + +
NamePlayers per teamTeams per matchSet roundsRandomized teams
<%= game.name %><%= game.players_per_team %><%= game.teams_per_match %><%= game.set_rounds %><%= game.randomized_teams %><%= link_to 'Show', game %><%= link_to 'Edit', edit_game_path(game) %><%= link_to 'Destroy', game, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e2b8e02..0deede3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,17 +7,21 @@ <%= csrf_meta_tags %> + <%= yield %> -