From cd54af413c57581f35026f60dc24e4bc21bb0bd1 Mon Sep 17 00:00:00 2001 From: tkimia Date: Tue, 22 Apr 2014 18:25:02 -0400 Subject: footer is ok? --- app/assets/stylesheets/application.css | 7 ------- app/assets/stylesheets/scaffolds.css.scss | 13 +++++++------ app/assets/stylesheets/static.css.scss | 3 ++- 3 files changed, 9 insertions(+), 14 deletions(-) (limited to 'app/assets') diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index ebb963c..677791c 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -22,10 +22,3 @@ padding: 0px 5px; } -footer { - clear: both; - margin: 0 auto; - margin-top: 10px; - color: white; - width: 90%; -} \ No newline at end of file diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss index 509cb19..e8fe9c5 100644 --- a/app/assets/stylesheets/scaffolds.css.scss +++ b/app/assets/stylesheets/scaffolds.css.scss @@ -19,7 +19,7 @@ body { height: 100%; } -h1, h2, h3, h4, h5, p{ +h1, h2, h3, h4, h5, p, li{ color: $orange; } @@ -96,20 +96,21 @@ div { .wrapper { width: 80%; - margin: 0 auto; margin-top: 10px; + min-height: 80%; + height: auto !important; + height: 99%; + margin: 0 auto; } button, input[type="submit"] { @extend .btn; } - - footer { clear: both; border-top: solid 1px $orange; - padding-top: 10px; text-align: center; - bottom: 0; + margin: 0 auto; + width: 90%; } \ No newline at end of file diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss index 14443f3..6732370 100644 --- a/app/assets/stylesheets/static.css.scss +++ b/app/assets/stylesheets/static.css.scss @@ -5,7 +5,8 @@ .jumbotron { background-color: #FFF; box-shadow: 1px 1px 20px black; - + width: 93%; + p { line-height: 1.5em; } -- cgit v1.2.3-2-g168b From b7cbf3df615575fe1d24a9ea1ddfded094ae529f Mon Sep 17 00:00:00 2001 From: AndrewMurrell Date: Tue, 22 Apr 2014 18:27:30 -0400 Subject: Added images for League and chess, need copyright notice for league and copyleft notice for chess. --- app/assets/images/ChessBlackKnightIcon.png | Bin 0 -> 893 bytes app/assets/images/LOLG_icon_large.gif | Bin 0 -> 8207 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/assets/images/ChessBlackKnightIcon.png create mode 100644 app/assets/images/LOLG_icon_large.gif (limited to 'app/assets') diff --git a/app/assets/images/ChessBlackKnightIcon.png b/app/assets/images/ChessBlackKnightIcon.png new file mode 100644 index 0000000..6bcffe6 Binary files /dev/null and b/app/assets/images/ChessBlackKnightIcon.png differ diff --git a/app/assets/images/LOLG_icon_large.gif b/app/assets/images/LOLG_icon_large.gif new file mode 100644 index 0000000..1f0fa43 Binary files /dev/null and b/app/assets/images/LOLG_icon_large.gif differ -- cgit v1.2.3-2-g168b