Next update

mekhovov · May 5, 2011 · 08af83e · 08af83e
1 parent 3c3f3b8
commit 08af83e
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 20 deletions.
diff --git a/app/views/users/_form_photos.haml b/app/views/users/_form_photos.haml
@@ -4,11 +4,11 @@
     = f.label :name, 'Name', :class => :label
     = f.text_field :name
     %span.description
-      add your name
     .avatar
       = image_tag current_user.avatar.url(:medium)
-      = f.label :avatar, 'Avatar', :class => :label
-      = f.file_field :avatar
+      %div
+        = f.label :avatar, 'Avatar', :class => :label
+        = f.file_field :avatar
     .hr
     %button.large.large_w.awesome.green{:type => "submit"} Save
 
diff --git a/app/views/users/index.haml b/app/views/users/index.haml
@@ -1,16 +1,17 @@
 = render(:partial => 'layouts/logo_intro')
-%section.content
-  .flash
-    - flash.each do |type, message|
-      %div{:class => "message #{type}"}
-        %p= message
-  =yield
-  - {"Top rated" => @top_rated, "Recently added" => @new_added}.each_pair do |title, elems|
-    = render :partial => "attaches/images_block", :locals => {:title => title, :photos => elems}
+.wrapper
+  %section.content
+    .flash
+      - flash.each do |type, message|
+        %div{:class => "message #{type}"}
+          %p= message
+    =yield
+    - {"Top rated" => @top_rated, "Recently added" => @new_added}.each_pair do |title, elems|
+      = render :partial => "attaches/images_block", :locals => {:title => title, :photos => elems}
 
-%section.sidebar
-  / Article block comments
-  = render(:partial => 'layouts/article_comments')
-  / Article block tags
-  /= render(:partial => 'layouts/article_tags')
+  %section.sidebar
+    / Article block comments
+    = render(:partial => 'layouts/article_comments')
+    / Article block tags
+    /= render(:partial => 'layouts/article_tags')
 
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
@@ -246,7 +246,9 @@ ul.right li, ul.left li {
 }
 
 .pagination {
-    float:left;
+    position: absolute;
+    top: 110px;
+    left:30px;
 }
 
 .sidebar {
@@ -505,6 +507,7 @@ hr {
   min-width: 0;		        /* trigger hasLayout for IE7 */
   display: inline-block;
   /* \*/ display: block;	/* Hide from IE Mac */
+  position: relative;
 }
 
 * html .clearfix{
@@ -720,10 +723,33 @@ input#search {
                  background-color: #007d9a;
         }
         .attach{
-            width:100%;
-            float: right;
-}
+            width:300px;
+           /* padding-right: 20px;*/
+            float:left;
+        }
+        .avatar img{
+           border: 3px #aaa ridge;
+           -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+           -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+           -moz-border-radius: 3px;
+           -webkit-border-radius: 3px;
+
+
+        }
+      .avatar div{
+            width:300px;
+            float:left;
+        }
+        #user_name {
+            padding: 2px;
+           -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+           -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+           -moz-border-radius: 3px;
+           -webkit-border-radius: 3px;
+        }
+        .avatar input{
 
+        }