Merge branch 'master' of github.com:diaspora/diaspora_rails

app/views/albums/index.html.haml

@@ -6,7 +6,7 @@
     %li= your_albums_link
 
   .button.right#add_album_button
-    = link_to 'new album', "#"
+    = link_to 'New Album', "#"
 
   #add_album_box.contextual_pane
     = render "albums/new_album"
@@ -17,5 +17,6 @@
 #pagination
   = will_paginate @albums
 
-%h3
-  = link_to "make a new album", new_album_path unless params[:friends]
+#content_bottom
+  .back
+    = link_to "⇧ home", root_path

app/views/photos/show.html.haml

@@ -4,10 +4,12 @@
   = @photo.image
 
   .button.right
-    = link_to 'edit', '#'
+    = link_to 'Edit', '#'
+
+.sub_header
+  = link_to "full size", @photo.image.url
 
 %div{:id => @photo.id}
-  = link_to "full size", @photo.image.url
 
   #show_photo
     = link_to_prev @photo, @album
@@ -19,7 +21,7 @@
       = link_to "⇧ #{@album.name}", album_path(@album)
     -if mine? @album
       .button.right
-        = link_to 'Delete Album', @album, :confirm => 'Are you sure?', :method => :delete
+        = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete
 
   %h4{:class => "show_post_comments"}
     = "comments (#{@photo.comments.count})"

app/views/requests/_new_request.haml

@@ -1,7 +1,8 @@
 = form_for @request  do |f|
   = f.error_messages
 
-  enter a diaspora url, diaspora username, or random email address:  
+  Enter a Diaspora URL, Diaspora username, or random email address:  
   .field_with_submit
     = f.text_field :destination_url
     = f.submit
+

app/views/requests/index.html.haml

@@ -11,3 +11,6 @@
   - for request in @remote_requests
     = render "request", :request => request
 
+#content_bottom
+  .back
+    = link_to "⇧ home", root_path

public/stylesheets/application.css

@@ -352,7 +352,7 @@ ul#publisher_content_pickers li {
     -moz-border-radius: 3px; }
 
 .field_with_submit input[type='text'] {
-  width: 85%;
+  width: 82%;
   display: inline; }
 
 h1.big_text {
@@ -381,3 +381,10 @@ h1.big_text {
 
 .show_post_comments ul.comment_set {
   width: 100%; }
+
+.sub_header {
+  text-align: center;
+  font-style: italic;
+  margin-top: -5px;
+  margin-bottom: 20px;
+  color: #999999; }

public/stylesheets/sass/application.sass

@@ -430,7 +430,7 @@ ul#publisher_content_pickers li
 
 .field_with_submit
   input[type='text']
-    :width 85%
+    :width 82%
     :display inline 
 
 h1.big_text
@@ -452,9 +452,6 @@ h1.big_text
   :font
     :size 12px
 
-
-
-
 #content_bottom
   :position relative
   :line-height 36px
@@ -471,3 +468,13 @@ h1.big_text
 
 .show_post_comments ul.comment_set
   :width 100%
+
+.sub_header
+  :text
+    :align center
+  :font
+    :style italic
+  :margin
+    :top -5px
+    :bottom 20px
+  :color #999

public/stylesheets/sass/ui.sass

@@ -0,0 +1,122 @@
+.button, .button_set
+  :font
+    :family "Lucida Grande", sans-serif
+
+  :display inline
+
+  :color #777
+  :font-size 12px
+  :line-height 100%
+
+  :text-shadow 0 1px 0 #fff
+
+  :min-height 14px
+
+  :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#E0E0E0))
+
+  :border 1px solid #ccc
+    :bottom 1px solid #666
+    :left 1px solid #999
+    :right 1px solid #999
+
+  :border-radius 3px
+  :-moz-border-radius 3px
+  :-webkit-border-radius 3px
+
+  :cursor pointer
+
+
+  :box-shadow 0 1px 1px #ccc
+  :-webkit-box-shadow 0 1px 1px #ccc
+  :-moz-box-shadow 0 1px 1px #ccc
+
+  a
+    :font-weight normal
+    :color #777
+
+
+.button
+  :padding 5px
+
+  &:active
+    :box-shadow 0 0px 2px #000
+    :-webkit-box-shadow 0 0px 2px #000
+    :-moz-box-shadow 0 0px 2px #000
+    :color #555
+
+ul.button_set
+
+  :padding 5px 0
+
+  > li
+    :padding 5px
+    :display inline
+    :height 100%
+    :border
+      :left 1px solid #ccc
+      :right 1px solid #fff
+
+    :margin
+      :left -3px
+      :right -3px
+
+    &:first-child
+      :margin
+        :left 0
+      :border
+        :left none
+
+    &:last-child
+      :margin
+        :right 0
+      :border
+        :right none
+
+.button .selected, .button_set .selected
+  :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#E0E0E0), to(#FAFAFA))
+  :border
+    :top 1px solid #aaa
+
+.right
+  :position absolute
+  :right 0
+  :margin
+    :top 5px
+
+.contextual_pane
+  :z-index 20
+
+  :position absolute
+
+  :display none
+
+  :right 0
+  :background
+    :color rgba( 30,30,30,0.95 )
+
+  :border 2px solid #999
+
+  :border-radius 5px
+  :-moz-border-radius 5px
+  :-webkit-border-radius 5px
+
+  :color #999
+
+  :font
+    :size 12px
+    :weight normal
+
+  :line-height auto
+
+  form
+    :margin 0
+    :padding 10px
+    :color #999
+    
+    input[type='text']
+      :width 80%
+      :display block
+
+    p
+      :padding 10px
+      :display inline