From cb6943fd4ae108306b25a41f724aba751b5223c5 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 18 Sep 2013 15:06:57 +0200 Subject: [PATCH] Moved to BS3. --- .../javascripts/app/views/login.jst.eco | 82 ++++++++----------- app/assets/stylesheets/zzz.css | 8 ++ 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco index a703d8dbe..c237d23bb 100644 --- a/app/assets/javascripts/app/views/login.jst.eco +++ b/app/assets/javascripts/app/views/login.jst.eco @@ -3,57 +3,47 @@

<%- @T( 'Welcome stranger!' ) %>

-
-
-

<%- @T( 'Sign in with' ) %>

-
- - - -
- <%- @T( 'Remember me' ) %> - <% if @C('user_lost_password'): %> - · - <%- @T( 'Forgot password?' ) %> - <% end %> -
-
-
-
- - <% if !_.isEmpty( @auth_providers ): %> -
-
-

--- <%- @T( 'or' ) %> ---

-
-
- -
-
-

<%- @T( 'Sign in using' ) %>

-
-
- <% end %> + +
- <% if @C('user_create_account'): %> -
-
-

--- <%- @T( 'or' ) %> ---

-
-
+ <% if !_.isEmpty( @auth_providers ): %> +
+

--- <%- @T( 'or' ) %> ---

+
-
-
-

<%- @T( 'New to %s join today!', @C( 'product_name' ) ) %>

-

<%- @T( 'Sign up' ) %> -

-
+
+

<%- @T( 'Sign in using' ) %>

+ +
+ <% end %> + + <% if @C('user_create_account'): %> +
+

--- <%- @T( 'or' ) %> ---

+
+ +
+

<%- @T( 'New to %s join today!', @C( 'product_name' ) ) %>

+

<%- @T( 'Sign up' ) %> +

+ <% end %> diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css index 5bd0e1059..6940e1b53 100644 --- a/app/assets/stylesheets/zzz.css +++ b/app/assets/stylesheets/zzz.css @@ -454,6 +454,10 @@ h5 { */ } +.dropdown-menu > li > a { + font-weight: 200; +} + .dropdown-menu .count { padding-top: 1px; margin-left: 10px; @@ -497,6 +501,10 @@ h5 { border-radius: 6px; } +.hero-unit h1 { + font-size: 52px; +} + .hero-unit p { font-size: 16px; font-weight: 200;