From 204522062209b21cea2581c23f34f01a760dfd85 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 7 Feb 2014 17:25:02 -0500 Subject: [PATCH] styled lightboxes further, changed FAQ to PAQ --- app/assets/javascripts/application.js | 6 --- app/assets/stylesheets/application.css | 13 ++++- app/views/layouts/_lightboxes.html.erb | 5 +- app/views/layouts/application.html.erb | 2 +- app/views/main/paq.html.erb | 71 ++++++++++++++++++++++++++ config/routes.rb | 2 +- 6 files changed, 87 insertions(+), 12 deletions(-) create mode 100644 app/views/main/paq.html.erb diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 81009e0e..5f92b1d7 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -703,12 +703,6 @@ function openLightbox(which) { $('.lightboxContent').hide(); $('#' + which).show(); - if (which == "forkmap" || which == "newmap") { - $('#lightbox_content').css('background','white'); - } else { - $('#lightbox_content').css('background','silver'); - } - $('#lightbox_overlay').show(); $('#lightbox_main').css('margin-top', '-' + ($('#lightbox_main').height() / 2) + 'px' ); } diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 81f54d8b..5dd81d74 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1493,6 +1493,7 @@ background-size: 30px 30px; position: relative; top:50%; background-color: transparent; + color:black; } #lightbox_screen { @@ -1532,8 +1533,9 @@ border: solid 2px #000; } #lightbox_content { - background: silver; + background: white; padding: 20px; + border-radius:5px; } .lightboxContent h3 { @@ -1559,7 +1561,7 @@ border: solid 2px #000; #about > p { color: #000; font-size: 16px; - line-height: 20px; + line-height: 24px; margin:10px 0; } @@ -1582,6 +1584,7 @@ border: solid 2px #000; #invite p { margin:10px 0; + line-height:24px; } #invite .green { @@ -1751,6 +1754,12 @@ font-family:arial; font-style: italic; width: auto; padding: 0 30px; + cursor:pointer; +} +.onConsole .new_map button:hover, .onConsole .new_map input.add:hover { + background: #19C8E4; + -webkit-box-shadow: none; + box-shadow: none; } /* FAQ */ diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 6cba6e6e..d916d4b7 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -26,7 +26,7 @@