Input width, localization

anatoliychakkaev · Oct 10, 2010 · b5ff391 · b5ff391
1 parent 33224a0
commit b5ff391
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 16 deletions.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -16,6 +16,7 @@ ru:
     design_theme: "Тема оформления"
     email: Электронная почта
     password: Пароль
+    current_password: Текущий пароль
     password_confirmation: Подтверждение пароля
     confirmation_token: Код активации
   errors:
@@ -30,6 +31,8 @@ ru:
         blank: "не может быть пустой"
       password:
         confirmation: " и подтверждение пароля должны совпадать"
+      current_password:
+         invalid: неверен
     template:
       header:
         one: "Не могу сохранить %{model}. Есть одна ошибка"

diff --git a/public/stylesheets/jane/scaffold.css b/public/stylesheets/jane/scaffold.css
@@ -1,4 +1,4 @@
-body { background-color: #fff; color: #333; }
+body {   background: #666691 url(/images/body_blue.png) center top no-repeat; color: #333; }
 
 body, p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;

diff --git a/public/stylesheets/jane/screen.css b/public/stylesheets/jane/screen.css
@@ -1,4 +1,5 @@
 body {
+
   margin: 0;
   padding: 0;
 }
@@ -67,6 +68,8 @@ body {
 .content {
   width: 388px;
   margin: 0 auto;
+  padding-bottom: 5px;
+  background-color: #66691;
 }
 
 .top_nav_wrapper {
@@ -79,9 +82,9 @@ body {
   -webkit-box-shadow: #888 0px 1px 1px;
   box-shadow: #888 0px 1px 1px;
   -moz-box-shadow: #888 0px 1px 1px;
-  background-color: #f2f2f2;
-  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#FCFCFC), to(#E8E8E8));
-  background: -moz-linear-gradient(top, #FCFCFC, #E8E8E8);
+  background-color: #eee;
+  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#eee), to(#ddd));
+  background: -moz-linear-gradient(top, #eee, #ddd);
   border-bottom-color: #eee;
   border-bottom-left-radius: 5px 5px;
   border-bottom-right-radius: 5px 5px;
@@ -112,6 +115,7 @@ span.amount {
   background: url(/images/background-white.png) 0 0 no-repeat transparent;
   padding: 10px;
   padding-top: 1px;
+
 }
 .upper_rounded {
   -webkit-border-top-right-radius: 3px;
@@ -136,8 +140,8 @@ input[type=text]:focus, input[type=password]:focus{
 
 .form_container {
   background-color: #eee;
-  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#f0f0f0), to(#E8E8E8));
-  background: -moz-linear-gradient(top, #f0f0f0, #E8E8E8);
+  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#eee), to(#ddd));
+  background: -moz-linear-gradient(top, #eee, #ddd);
   width: 360px;
   padding: 8px;
   padding-left: 9px;
@@ -180,20 +184,22 @@ input[type=text]:focus, input[type=password]:focus{
   -webkit-box-shadow: #888 0px 1px 1px;
   box-shadow: #888 0px 1px 1px;
   -moz-box-shadow: #888 0px 1px 1px;
+  background-color: #dbddff;
 }
 .day_block .header {
-  color: #333;
   text-shadow: 1px 1px 0 #fff;
   font-weight: 700;
   font-size: 1.3em;
   height: 21px;
-  background-color: #e2e2e2;
-  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#eee), to(#ddd));
-  background: -moz-linear-gradient(top, #eee, #ddd);
+  background-color: #bbd;
+  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#ccd), to(#9f9dd6));
+  background: -moz-linear-gradient(top, #ccd, #9f9dd6);
   margin: -8px;
   margin-left: -9px;
   margin-bottom: 10px;
   padding: 5px;
+  color: #005;
+  opacity: 0.7;
 }
 .day_block .records {
   margin-bottom: 5px;
@@ -219,16 +225,17 @@ p.no_records {
 }
 
 #load_earlier {
-  width: 100%;
+  width: 380px;
+  margin-left: 2px;
   display: block;
   height: 25px;
   color: #999;
   line-height: 25px;
   text-shadow: #fff 1px 1px 0;
-  background-color: #f2f2f2;
-  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#FCFCFC), to(#E8E8E8));
-  background: -moz-linear-gradient(top, #FCFCFC, #E8E8E8);
-  border: 1px solid #ddd;
+  background-color: #eee;
+  background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#eee), to(#ddd));
+  background: -moz-linear-gradient(top, #eee, #ddd);
+  border: 1px solid #ccc;
   text-align: center;
   text-decoration: none;
   font-weight: 700;

diff --git a/public/stylesheets/light/screen.css b/public/stylesheets/light/screen.css
@@ -1,6 +1,8 @@
-body {
+body, html {
   margin: 0;
   padding: 0;
+  height: 100%;
+  min-height: 100%;
 }
 
 .icon {
@@ -149,6 +151,10 @@ input[type=text]:focus, input[type=password]:focus{
   outline: none;
 }
 
+.dialog_content input[type=text], .dialog_content input[type=password] {
+  width: 289px;
+}
+
 .form_container {
   background-color: #eee;
   background: -webkit-gradient(linear, 0% 0, 0% 100%, from(#f0f0f0), to(#E8E8E8));