From: Jakub Steiner <[email protected]>
---
src/app/stylesheets/_base.scss | 8 +++++++
src/app/stylesheets/aggregator.scss | 23 +++++++++++++++++---
src/app/views/user_sessions/new.haml | 37 +++++++++++++++++----------------
3 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/src/app/stylesheets/_base.scss b/src/app/stylesheets/_base.scss
index 2467b50..86e24c6 100644
--- a/src/app/stylesheets/_base.scss
+++ b/src/app/stylesheets/_base.scss
@@ -6,6 +6,8 @@ $headlinefont: FreeWay, Interstate, sans-serif;
/* colors */
$headerbg: #0B3559;
+$formheadbg: #eee;
+$formheadfg: #333;
@import "text";
@@ -14,3 +16,9 @@ $headerbg: #0B3559;
-moz-border-radius: $radius;
-webkit-border-radius: $radius;
}
+
+...@mixin box-shadow($x,$y,$blur,$color) {
+ box-shadow: $x $y $blur $color;
+ -moz-box-shadow: $x $y $blur $color;
+ -webkit-box-shadow: $x $y $blur $color;
+}
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index d4427ad..88ee331 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -6,7 +6,7 @@ html {
#head {
background-color: $headerbg;
- border-bottom: 1px solid rgba(255,255,255,.15);
+ border-bottom: 2px solid desaturate(lighten($headerbg,30%),50%);
overflow: hidden;
#header {
h1 {
@@ -14,15 +14,30 @@ html {
font-size: 110%;
color: #fff;
margin: 2px 0 0;
- padding: 6px 0 4px 67px;
- background: url(/images/rh_logo.png) no-repeat left center;
+ padding: 6px 0 4px 77px;
+ background: url(/images/rh_logo.png) no-repeat 10px center;
position: relative;
img.dc {
position: absolute;
- left: 33px;
+ left: 43px;
top: 7px;
}
}
}
}
+.modalbox {
+ margin: 150px auto;
+ @include box-shadow(0,1px,5px,rgba(0, 0, 0, 0.6));
+ width: 500px;
+ h2 {
+ background-color: $formheadbg;
+ color: $formheadfg;
+ text-transform: uppercase;
+ font-size: 120%;
+ padding: 10px;
+ }
+ dcloud_form {
+ margin: 10px;
+ }
+}
diff --git a/src/app/views/user_sessions/new.haml
b/src/app/views/user_sessions/new.haml
index 314f344..65e5a24 100644
--- a/src/app/views/user_sessions/new.haml
+++ b/src/app/views/user_sessions/new.haml
@@ -1,18 +1,19 @@
-.dcloud_form
- %h2 Welcome to the Deltacloud Aggregator. Please sign in.
- - form_for @user_session, :url => user_session_path do |f|
- = f.error_messages
- %ul
- %li
- = f.label :login, "Username"
- = f.text_field :login
- %li
- = f.label :password
- = f.password_field :password
- = f.check_box :remember_me
- = f.label :remember_me
- = f.submit "Login", :class => "submit"
- %div
- = link_to "Don't have an account? Create one now.", |
- {:controller => 'users', :action => 'new'}, |
- :class => 'actionlink' |
+.modalbox
+ %h2 Log In
+ .dcloud_form
+ - form_for @user_session, :url => user_session_path do |f|
+ = f.error_messages
+ %ul
+ %li
+ = f.label :login, "Username"
+ = f.text_field :login
+ %li
+ = f.label :password
+ = f.password_field :password
+ = f.check_box :remember_me
+ = f.label :remember_me
+ = f.submit "Login", :class => "submit"
+ %div
+ = link_to "Don't have an account? Create one now.", |
+ {:controller => 'users', :action => 'new'}, |
+ :class => 'actionlink' |
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
