From: Jakub Steiner <[email protected]>
---
src/app/stylesheets/_base.scss | 7 +++++
src/app/stylesheets/aggregator.scss | 49 +++++++++++++++++++++++++--------
src/app/views/user_sessions/new.haml | 18 +++++++-----
3 files changed, 54 insertions(+), 20 deletions(-)
diff --git a/src/app/stylesheets/_base.scss b/src/app/stylesheets/_base.scss
index 86e24c6..697fab2 100644
--- a/src/app/stylesheets/_base.scss
+++ b/src/app/stylesheets/_base.scss
@@ -5,6 +5,7 @@ $screenfont: "Liberation Sans", "Droid Sans", Helvetica, Arial,
sans-serif;
$headlinefont: FreeWay, Interstate, sans-serif;
/* colors */
+$dcprimary: #1E74BB;
$headerbg: #0B3559;
$formheadbg: #eee;
$formheadfg: #333;
@@ -22,3 +23,9 @@ $formheadfg: #333;
-moz-box-shadow: $x $y $blur $color;
-webkit-box-shadow: $x $y $blur $color;
}
+
+...@mixin inset-box-shadow($x,$y,$blur,$color) {
+ box-shadow: inset $x $y $blur $color;
+ -moz-box-shadow: inset $x $y $blur $color;
+ -webkit-box-shadow: inset $x $y $blur $color;
+}
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index 81cae58..fdeb89c 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -4,6 +4,16 @@
html {
}
+a {
+ color: $dcprimary;
+ &:hover, &:focus {
+ color: lighten($dcprimary, 20%);
+ }
+ &:active {
+ color: darken($dcprimary, 20%);
+ }
+}
+
input[type='submit'],button {
background: -moz-linear-gradient(top, #f9f9f9, #f0f0f0, #e5e5e5, #e9e9e9);
background: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9),
color-stop(0.9, #e5e5e5), to(#e9e9e9));
@@ -23,7 +33,7 @@ input[type='submit'],button {
&:hover {
background: -moz-linear-gradient(top, #fff, #fff, #cfcfcf);
background: -webkit-gradient(linear, left top, left bottom, from(#fff),
color-stop(0.6, #fff), to(#cfcfcf));
- /* @import box-shadow(0, 1px, 2px, rgba(0,0,0,0.5)); */
+ @include box-shadow(0, 1px, 2px, rgba(0,0,0,0.5));
}
&:active {
background: -moz-linear-gradient(top, #c2c3c0, #e4e5e4);
@@ -33,6 +43,9 @@ input[type='submit'],button {
-moz-box-shadow: none;
padding: 5px 12px 3px;
}
+ &.dialogbutton {
+ float: right;
+ }
}
#head {
@@ -57,9 +70,22 @@ input[type='submit'],button {
}
}
+input[type="text"],input[type="password"],textarea {
+ @include inset-box-shadow(0,1px,1px,rgba(0, 0, 0, 0.2));
+ border: 1px solid #BBBCBA;
+ background-color: #f0f0f0;
+ padding: 4px;
+ margin: 1px;
+ &:focus {
+ border-width: 2px;
+ margin: 0;
+ background-color: #fff;
+ }
+}
+
.modalbox {
margin: 150px auto;
- @include box-shadow(0,1px,5px,rgba(0, 0, 0, 0.6));
+ @include box-shadow(0,1px,5px,rgba(0, 0, 0, 0.6));
width: 500px;
overflow: hidden;
h2 {
@@ -70,28 +96,27 @@ input[type='submit'],button {
padding: 10px;
}
.dcloud_form {
- margin: 10px;
- overflow: hidden;
- ul {
- display: block;
- li {
- display: block;
- }
- }
+ margin: 20px;
}
}
.dcloud_form {
fieldset {
overflow: hidden;
- label {
+ margin: 10px 0 0;
+ &>label {
width: 140px;
float: left;
text-align: right;
font-weight: bold;
+ padding: 4px 10px 0 0;
}
input {
- float: right;
+
}
}
+ .indented {
+ margin: 10px 0 0;
+ padding-left: 150px;
+ }
}
diff --git a/src/app/views/user_sessions/new.haml
b/src/app/views/user_sessions/new.haml
index 9228cba..78aeeb2 100644
--- a/src/app/views/user_sessions/new.haml
+++ b/src/app/views/user_sessions/new.haml
@@ -4,15 +4,17 @@
- form_for @user_session, :url => user_session_path do |f|
= f.error_messages
%fieldset
- = f.label :login, "Username"
+ = f.label :login, "Username:"
= f.text_field :login
%fieldset
= 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' |
+ %div.indented
+ = f.check_box :remember_me
+ = f.label :remember_me
+ %div.indented
+ = link_to "Don't have an account? Create one now.", |
+ {:controller => 'users', :action => 'new'}, |
+ :class => 'actionlink' |
+ = f.submit "Login", :class => "submit dialogbutton"
+
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
