diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | app/assets/images/.keep | 0 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 70 | ||||
| -rw-r--r-- | app/assets/stylesheets/forms.css.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/media-queries.css.scss | 56 | ||||
| -rw-r--r-- | app/assets/stylesheets/mixins.css.scss | 10 | ||||
| -rw-r--r-- | app/views/layouts/_navigation.html.erb | 1 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 82 |
10 files changed, 135 insertions, 102 deletions
@@ -16,11 +16,9 @@ gem 'pg' # Use ActiveModel has_secure_password # gem 'bcrypt-ruby', '~> 3.0.0' -# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' gem 'gibbon' gem 'dotenv-rails' -gem 'high_voltage', '~> 1.2.1' +gem 'high_voltage' gem 'bootstrap-sass' group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 57293f7..54ece38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -180,8 +180,6 @@ GEM treetop (1.4.14) polyglot polyglot (>= 0.3.1) - turbolinks (1.3.0) - coffee-rails tzinfo (0.3.37) uglifier (2.1.2) execjs (>= 0.3.0) @@ -205,7 +203,7 @@ DEPENDENCIES dotenv-rails factory_girl_rails gibbon - high_voltage (~> 1.2.1) + high_voltage jbuilder (~> 1.2) jquery-rails pg @@ -217,6 +215,5 @@ DEPENDENCIES sass-rails (~> 4.0.0) simplecov teaspoon - turbolinks uglifier (>= 1.3.0) unicorn diff --git a/app/assets/images/.keep b/app/assets/images/.keep deleted file mode 100644 index e69de29..0000000 --- a/app/assets/images/.keep +++ /dev/null diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e3a9f2d..921aebe 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,5 +13,4 @@ //= require jquery //= require jquery_ujs //= require bootstrap -//= require turbolinks //= require_tree . diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index cf31633..76fb068 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -1,5 +1,6 @@ @import "bootstrap"; @import "bootstrap-responsive"; +@import "mixins.css.scss"; @import "settings.css.scss"; body { @@ -7,24 +8,28 @@ body { background-color: $beige; } -footer{ +footer { background-color: $blue; bottom: 0; width: 100%; padding: 20px 0 220px; text-align: center; - .content{ + .content { color: white; - .row { margin: 0 auto; } - a{ + .row { + margin: 0 auto; + } + a { color: white; - &:hover{ text-decoration: underline; } + &:hover { + text-decoration: underline; + } } } } -h1#logo{ +h1#logo { background: transparent asset-url('utility-belt/logo.png') no-repeat 0 0; width: 313px; height: 86px; @@ -33,11 +38,15 @@ h1#logo{ margin-right: 50px; } -h2 { font-size: 44px; line-height: 48px; color: #333;} +h2 { + font-size: 44px; + line-height: 48px; + color: #333; +} -a{ +a { color: $green; - &:hover{ + &:hover { color: $lightgreen; text-decoration: none; } @@ -49,48 +58,59 @@ a{ font-weight: 200; color: #666; } -.customers{ color: $blue; } -.product{ color: $green; } -.features{ color: $orange; } -.static{ +.customers { + color: $blue; +} + +.product { + color: $green; +} + +.features { + color: $orange; +} + +.static { clear: both; padding-top: 45px; margin-bottom: 100px; - p{ + p { font: 36px/48px "Helvetica Neue"; font-weight: 200; } - - .back{ + .back { font: 36px/48px "Helvetica Neue"; font-weight: 500; } } -#new_sign_up{ +#new_sign_up { position: relative; - label{ + label { font-style: italic; font-weight: 200; color: #666; } - - .field{ + .field { float: left; - input[type="email"]{ + input[type="email"] { width: 350px; } margin-right: 20px; } - .actions{ + .actions { float: left; margin-top: 24px; } @include clearfix; } -#privacy{ - strong { font: 36px/48px "Helvetica Neue"; } - p{ font: 14px/18px "Helvetica Neue"; } +#privacy { + strong { + font: 36px/48px "Helvetica Neue"; + } + p { + font: 20px/24px "Helvetica Neue"; + } } diff --git a/app/assets/stylesheets/forms.css.scss b/app/assets/stylesheets/forms.css.scss index 96d50be..84b57c5 100644 --- a/app/assets/stylesheets/forms.css.scss +++ b/app/assets/stylesheets/forms.css.scss @@ -1,12 +1,12 @@ @import "mixins.css.scss"; @import "settings.css.scss"; -input[type="email"], input[type="submit"]{ +input[type="email"], input[type="submit"] { border-color: #79a8c4; font-size: 24px; } -input[type="email"]{ +input[type="email"] { padding: 20px; color: #bacdd8; @include appearance(textfield); @@ -16,12 +16,15 @@ input[type="email"]{ margin-top: 3px; color: #bacdd8; } + :-moz-placeholder { /* Mozilla Firefox 4 to 18 */ color: #bacdd8; } + ::-moz-placeholder { /* Mozilla Firefox 19+ */ color: #bacdd8; } + :-ms-input-placeholder { /* Internet Explorer 10+ */ color: #bacdd8; } @@ -46,7 +49,6 @@ input[type="submit"][disabled] { *background-color: #003bb3; } - #error_explanation{ position: absolute; bottom: -10px; diff --git a/app/assets/stylesheets/media-queries.css.scss b/app/assets/stylesheets/media-queries.css.scss index 28834fe..53323b8 100644 --- a/app/assets/stylesheets/media-queries.css.scss +++ b/app/assets/stylesheets/media-queries.css.scss @@ -1,13 +1,17 @@ /* Large desktop */ @media (min-width: 1200px) { - .container { min-height: 600px; } + .container { + min-height: 600px; + } } @media (max-width: 979px) and (orientation: landscape) { - h1#logo { float: none; } + h1#logo { + float: none; + } #new_sign_up{ .field{ - input[type="email"]{ + input[type="email"] { width: 540px; } margin-right: 20px; @@ -17,31 +21,49 @@ /* Portrait tablet to landscape and desktop */ @media (min-width: 768px) and (max-width: 979px) { - h1#logo { float: none; } + h1#logo { + float: none; + } } /* Landscape phone to portrait tablet */ @media (max-width: 767px) { - body { padding: 0; } - #main{ padding: 0 20px; } - h2, .about {font-size: 1.5em; line-height: 1.25em;} + body { + padding: 0; + } + #main { + padding: 0 20px; + } + h2, .about { + font-size: 1.5em; + line-height: 1.25em; + } } /* Landscape phones and down */ @media (max-width: 480px) { - body { padding: 0; } - - h2, .about {font-size: 1.5em; line-height: 1.25em;} - footer{ width: 100%; margin: 0;} - #main{ padding: 0 20px; } + body { + padding: 0; + } + h2, .about { + font-size: 1.5em; + line-height: 1.25em; + } + footer { + width: 100%; margin: 0; + } + #main { + padding: 0 20px; + } h1#logo { background: transparent asset-url('mobile/logo.png') no-repeat 0 0; width: 250px; height: 69px; } - #logo, .field, .action { float: none; } - - #new_sign_up{ + #logo, .field, .action { + float: none; + } + #new_sign_up { .field{ input[type="email"]{ width: 240px; @@ -52,9 +74,9 @@ } @media (max-width: 480px) and (orientation: landscape){ - #new_sign_up{ + #new_sign_up { .field{ - input[type="email"]{ + input[type="email"] { width: 400px; } margin-right: 20px; diff --git a/app/assets/stylesheets/mixins.css.scss b/app/assets/stylesheets/mixins.css.scss index d69e5eb..e098fec 100644 --- a/app/assets/stylesheets/mixins.css.scss +++ b/app/assets/stylesheets/mixins.css.scss @@ -12,19 +12,19 @@ border-radius: $pixels; } -@mixin box-shadow($shadows...){ +@mixin box-shadow($shadows...) { -webkit-box-shadow: $shadows; -moz-box-shadow: $shadows; box-shadow: $shadows; } -@mixin appearance($appearance){ +@mixin appearance($appearance) { -webkit-appearance: $appearance; -moz-appearance: $appearance; appearance: $appearance; } -@mixin gradient($top, $bottom){ +@mixin gradient($top, $bottom) { background-color: $bottom; *background-color: $bottom; background-image: -moz-linear-gradient(top, $top, $bottom); @@ -45,5 +45,7 @@ clear: both; visibility: hidden; } - * html & { height: 1px } + * html & { + height: 1px; + } } diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb deleted file mode 100644 index e84e1cd..0000000 --- a/app/views/layouts/_navigation.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%# navigaion %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 995cf49..aa95dd2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,58 +1,52 @@ -<!doctype html> +<!DOCTYPE html> <html> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title><%= content_for?(:title) ? yield(:title) : "Parley" %></title> - <meta name="description" content=""> - <meta name="author" content=""> - <%= favicon_link_tag 'favicon.ico' %> - <link rel="apple-touch-icon" href="/assets/touch-icon-iphone.png" /> - <link rel="apple-touch-icon" sizes="72x72" href="/assets/touch-icon-ipad.png" /> - <link rel="apple-touch-icon" sizes="114x114" href="/assets/touch-icon-iphone4.png" /> - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <%= csrf_meta_tags %> - <%= yield(:head) %> - </head> - <body> - <div id="main" role="main"> - <div class="container"> - <div class="content"> - <div class="row"> - <div class="span12"> - <h1 id="logo">Parley</h1> - <%= render 'layouts/messages' %> - <%= yield %> - </div> - </div> - </div> - </div> <!--! end of .container --> - </div> <!--! end of #main --> - <footer> - <div class="content"> - <div class="row"> - <%= link_to "Privacy Policy", page_path("privacy") %> © 2013 Parley, Inc. All rights reserved. - </div> - </div> - </footer> - <%= javascript_include_tag :application %> +<head> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> - <%= yield :javascript %> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <title><%= content_for?(:title) ? yield(:title) : "Parley" %></title> + <meta name="description" content=""> + <meta name="author" content=""> + <%= favicon_link_tag 'favicon.ico' %> + <link rel="apple-touch-icon" href="/assets/touch-icon-iphone.png" /> + <link rel="apple-touch-icon" sizes="72x72" href="/assets/touch-icon-ipad.png" /> + <link rel="apple-touch-icon" sizes="114x114" href="/assets/touch-icon-iphone4.png" /> + <%= stylesheet_link_tag "application", :media => "all" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> +</head> +<body> + <div id="main" role="main"> + <div class="container"> + <div class="content"> + <div class="row"> + <div class="span12"> + <h1 id="logo">Parley</h1> + <%= render 'layouts/messages' %> + <%= yield %> + </div> + </div> + </div> + </div> +</div> +<footer> + <div class="content"> + <div class="row"> + <%= link_to "Privacy Policy", page_path("privacy") %> © 2013 Parley, Inc. All rights reserved. + </div> + </div> +</footer> <script type="text/javascript"> - var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-42669511-1']); _gaq.push(['_trackPageview']); - (function() { var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); - -</script> - </body> + </script> +</body> </html> |