From 1e6b309163eb54808a7b5608c7746a23aa109549 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 8 Sep 2010 14:34:42 -0700 Subject: [PATCH 01/10] DG MS; tweaking top nav and publisher. --- app/views/groups/index.html.haml | 3 -- app/views/groups/show.html.haml | 4 -- app/views/layouts/application.html.haml | 19 ++++--- app/views/shared/_group_nav.haml | 1 + app/views/shared/_publisher.haml | 7 +-- public/stylesheets/application.css | 47 +++++++---------- public/stylesheets/sass/application.sass | 66 ++++++++++-------------- public/stylesheets/sass/ui.sass | 3 ++ public/stylesheets/ui.css | 4 ++ 9 files changed, 71 insertions(+), 83 deletions(-) diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml index 1a187810f..9cf6ffd86 100644 --- a/app/views/groups/index.html.haml +++ b/app/views/groups/index.html.haml @@ -1,6 +1,3 @@ -%h1 - stream for - = link_to 'everybody', root_path = render "shared/publisher", :group_ids => :all %ul#stream - for post in @posts diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 8cf7bbfbf..64a7a48a5 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -1,7 +1,3 @@ -%h1 - stream for - = link_to @group.name, @group -= render "shared/publisher", :group_ids => :all %ul#stream - for post in @posts = render type_partial(post), :post => post diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7bdd0f5e1..419510bf1 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -55,14 +55,21 @@ = render "shared/group_nav" + #group_header + .container + .span-5.last + - if @group == :all + %h1 + All Groups + - else + %h1 + = @group.name + + .span-19.last + = render "shared/publisher", :group_ids => :all + .container .span-5.last - %h1 - - if @group == :all - = link_to "Everybody", root_path - - else - = link_to @group.name, @group - = render "shared/group_friends" .span-19.last diff --git a/app/views/shared/_group_nav.haml b/app/views/shared/_group_nav.haml index 6e400001d..730672333 100644 --- a/app/views/shared/_group_nav.haml +++ b/app/views/shared/_group_nav.haml @@ -17,3 +17,4 @@ .yo{ :style => "display:none;"} #add_group_pane = render "groups/new_group" + diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index 73f151e43..5fae9abff 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -6,11 +6,12 @@ %p %label{:for => "status_message_message"} Message = f.text_area :message, :rows => 2 - - %ul.group_selector + + %ul.group_selector{ :style => "display:none;"} going to... - for group in @groups %li = check_box_tag("group_ids[]", group.id, @group == :all || current_group?(group) ) = group.name - = f.submit "Post" + + = f.submit "Share" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 709db609b..a2e66a60a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -75,7 +75,7 @@ header { color: black; background-color: #333333; padding: 0; - border-bottom: 1px solid #555555; } + border-bottom: 1px solid #cccccc; } header #diaspora_text { position: absolute; display: inline; @@ -98,6 +98,14 @@ header { padding-right: 10px; } header #session_action a.new_requests { color: #df0101; } + header #group_header { + text-shadow: 0 2px 0 white; + background-color: #eeeeee; + border-top: 1px solid #555555; + height: 85px; } + header #group_header h1 { + margin-bottom: 0; + margin-top: 25px; } #show_filters { z-index: 100; @@ -120,6 +128,8 @@ ul#stream { list-style: none; padding: 12px 0; border-bottom: 1px solid #eeeeee; } + ul#stream > li:first-child { + padding-top: 0; } li.message { position: relative; @@ -313,8 +323,7 @@ label { color: #999999; position: relative; height: 63px; - margin-bottom: 10px; - border-bottom: 1px solid #666666; } + margin-top: 20px; } #publisher .avatar { float: left; margin-right: 15px; } @@ -326,31 +335,13 @@ label { #publisher form input[type='submit'] { float: right; margin-right: 20px; - margin-top: 28px; } + margin-top: 26px; } + #publisher form input[type='submit'].button { + background: #c3ff68; } #publisher textarea { - width: 485px; + width: 600px; height: 40px; margin-top: 0; } - #publisher ul.group_selector { - left: 510px; - padding: 0; - margin: 0; - width: 110px; - z-index: 10; - position: absolute; - height: auto; - overflow: visible; - list-style: none; } - #publisher ul.group_selector > li { - height: auto; - font-size: smaller; - padding: 2px; - display: none; - background-color: #eeeeee; } - #publisher ul.group_selector > li:active { - background-color: yellow; } - #publisher ul.group_selector:hover li { - display: block; } #publisher .button { margin-left: 100px; } @@ -486,11 +477,11 @@ h1.big_text { color: #999999; } #group_nav ul .selected { font-weight: bold; - background-color: white; - border-bottom: 1px solid white; + background-color: #eeeeee; + border-bottom: 1px solid #eeeeee; color: black; } #group_nav ul .selected:hover { - background-color: #eeeeee; } + background-color: #efefef; } #group_nav ul .selected a { color: black; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 2e9454234..b755aac20 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -82,7 +82,7 @@ header :color #333 :padding 0 :border - :bottom 1px solid #555 + :bottom 1px solid #ccc #diaspora_text :position absolute @@ -114,6 +114,20 @@ header :color #DF0101 :padding-right 10px + #group_header + :text-shadow 0 2px 0 #fff + :background + :color #eee + :border + :top 1px solid #555 + :height 85px + + h1 + :margin + :bottom 0 + :top 25px + + #show_filters :z-index 100 :position absolute @@ -136,6 +150,10 @@ ul#stream :border :bottom 1px solid #eee + > li:first-child + :padding + :top 0 + li.message :position relative :line-height 140% @@ -385,9 +403,7 @@ label :position relative :height 63px :margin - :bottom 10px - :border - :bottom 1px solid #666 + :top 20px .avatar :float left @@ -397,7 +413,7 @@ label p :position absolute :left 0 - + form :display inline @@ -405,41 +421,14 @@ label :float right :margin :right 20px - :top 28px + :top 26px textarea - :width 485px + :width 600px :height 40px :margin :top 0 - ul.group_selector - :left 510px - :padding 0 - :margin 0 - :width 110px - :z-index 10 - :position absolute - :height auto - :overflow visible - :list - :style none - - > li - :height auto - :font-size smaller - :padding 2px - :display none - :background - :color #eee - - &:active - :background - :color yellow - - &:hover li - :display block - .button :margin-left 100px @@ -570,6 +559,7 @@ h1.big_text :position relative :color #000 + #group_edit_button :display inline :margin @@ -621,19 +611,17 @@ h1.big_text a :color #999 - - .selected :font :weight bold :background - :color #fff + :color #eee :border - :bottom 1px solid #fff + :bottom 1px solid #eee :color #000 &:hover :background - :color #eee + :color #efefef a :color #000 diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass index e680232e6..4ab3ace9d 100644 --- a/public/stylesheets/sass/ui.sass +++ b/public/stylesheets/sass/ui.sass @@ -48,6 +48,9 @@ :border :top 1px solid #ccc +input.button + :padding 5px + :bottom 6px ul.button_set diff --git a/public/stylesheets/ui.css b/public/stylesheets/ui.css index 6a0dd8850..685087fbc 100644 --- a/public/stylesheets/ui.css +++ b/public/stylesheets/ui.css @@ -32,6 +32,10 @@ background: -moz-linear-gradient(top, #f0f0f0, #fafafa); border-top: 1px solid #cccccc; } +input.button { + padding: 5px; + padding-bottom: 6px; } + ul.button_set { padding-left: 0; padding-right: 0; } From ca780f35603b675b75a14e5584735f756c159fe8 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 8 Sep 2010 16:35:30 -0700 Subject: [PATCH 02/10] DG MS; hide debug info by default. also, made the text lighter. --- app/views/groups/index.html.haml | 1 - app/views/layouts/application.html.haml | 1 - app/views/posts/_debug.haml | 2 +- public/stylesheets/application.css | 9 +++++---- public/stylesheets/sass/application.sass | 7 +++++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml index 9cf6ffd86..6c3039aef 100644 --- a/app/views/groups/index.html.haml +++ b/app/views/groups/index.html.haml @@ -1,4 +1,3 @@ -= render "shared/publisher", :group_ids => :all %ul#stream - for post in @posts = render type_partial(post), :post => post unless post.class == Album diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 419510bf1..63ef4736a 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -64,7 +64,6 @@ - else %h1 = @group.name - .span-19.last = render "shared/publisher", :group_ids => :all diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml index a5cb32b7b..ad1b3f1d8 100644 --- a/app/views/posts/_debug.haml +++ b/app/views/posts/_debug.haml @@ -1,6 +1,6 @@ #debug_info %h5 DEBUG INFO - #debug_more + #debug_more{ :style => "display:none;" } %ul %li %b params diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a2e66a60a..775c6076e 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -105,7 +105,7 @@ header { height: 85px; } header #group_header h1 { margin-bottom: 0; - margin-top: 25px; } + margin-top: 27px; } #show_filters { z-index: 100; @@ -292,7 +292,10 @@ ul.comment_set { font-size: larger; } #debug_info { - margin-top: 20px; } + margin-top: 20px; + color: #cccccc; } + #debug_info h5 { + color: #cccccc; } input[type='text'], textarea { font-family: "lucida grande", "sans-serif"; @@ -336,8 +339,6 @@ label { float: right; margin-right: 20px; margin-top: 26px; } - #publisher form input[type='submit'].button { - background: #c3ff68; } #publisher textarea { width: 600px; height: 40px; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index b755aac20..e62dc6881 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -125,8 +125,7 @@ header h1 :margin :bottom 0 - :top 25px - + :top 27px #show_filters :z-index 100 @@ -367,6 +366,10 @@ ul.comment_set #debug_info :margin-top 20px + :color #ccc + + h5 + :color #ccc input[type='text'], textarea From e6114e76f5da226fd6fc5e3f97b2b87ed845afa5 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 8 Sep 2010 19:39:24 -0700 Subject: [PATCH 03/10] MS DG more tweaking --- public/stylesheets/application.css | 21 ++++++++++-------- public/stylesheets/sass/application.sass | 27 +++++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 775c6076e..65f622321 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -77,6 +77,7 @@ header { padding: 0; border-bottom: 1px solid #cccccc; } header #diaspora_text { + z-index: 6; position: absolute; display: inline; font-family: "BrandonGrotesqueLightRegular"; @@ -99,6 +100,7 @@ header { header #session_action a.new_requests { color: #df0101; } header #group_header { + z-index: 5; text-shadow: 0 2px 0 white; background-color: #eeeeee; border-top: 1px solid #555555; @@ -342,7 +344,8 @@ label { #publisher textarea { width: 600px; height: 40px; - margin-top: 0; } + margin-top: 0; + -webkit-box-shadow: 0 1px 0 white; } #publisher .button { margin-left: 100px; } @@ -476,15 +479,15 @@ h1.big_text { background-color: #444444; } #group_nav ul > li:hover a { color: #999999; } - #group_nav ul .selected { - font-weight: bold; - background-color: #eeeeee; - border-bottom: 1px solid #eeeeee; - color: black; } - #group_nav ul .selected:hover { - background-color: #efefef; } - #group_nav ul .selected a { + #group_nav ul > li.selected { + font-weight: bold; + background-color: #eeeeee; + border-bottom: 1px solid #eeeeee; color: black; } + #group_nav ul > li.selected:hover { + background-color: #efefef; } + #group_nav ul > li.selected a { + color: black; } #add_photo_loader { position: absolute; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index e62dc6881..01849ce55 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -85,6 +85,7 @@ header :bottom 1px solid #ccc #diaspora_text + :z-index 6 :position absolute :display inline :font @@ -115,6 +116,7 @@ header :padding-right 10px #group_header + :z-index 5 :text-shadow 0 2px 0 #fff :background :color #eee @@ -432,6 +434,8 @@ label :margin :top 0 + :-webkit-box-shadow 0 1px 0 #fff + .button :margin-left 100px @@ -594,7 +598,6 @@ h1.big_text :margin :right 0.5em :padding 3px 8px - :border 1px solid #555 &.last-child @@ -614,19 +617,19 @@ h1.big_text a :color #999 - .selected - :font - :weight bold - :background - :color #eee - :border - :bottom 1px solid #eee - :color #000 - &:hover + &.selected + :font + :weight bold :background - :color #efefef - a + :color #eee + :border + :bottom 1px solid #eee :color #000 + &:hover + :background + :color #efefef + a + :color #000 #add_photo_loader :position absolute From c3a1b362824f0989e28212331d3f499a0abaf588 Mon Sep 17 00:00:00 2001 From: maxwell Date: Wed, 8 Sep 2010 19:49:09 -0700 Subject: [PATCH 04/10] MS fixing this to be request host on the login page --- app/views/devise/sessions/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 263ed8bc9..168352b0c 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -6,7 +6,7 @@ = f.label :username = f.text_field :username %p.user_network - @tom.joindiaspora.com + ="@#{request.host}" %p From 2a9e988b1f61dbf794b7fabde52215ad87c8871e Mon Sep 17 00:00:00 2001 From: maxwell Date: Wed, 8 Sep 2010 20:03:01 -0700 Subject: [PATCH 05/10] MS fixing the zindex on the search --- public/stylesheets/sass/application.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 01849ce55..278745ed4 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -110,6 +110,7 @@ header :position relative :display inline :float right + :z-index 3 a &.new_requests :color #DF0101 From 2ce4fb27fa7ea7b5e7001ec7a436e4cc217274b7 Mon Sep 17 00:00:00 2001 From: maxwell Date: Wed, 8 Sep 2010 20:39:05 -0700 Subject: [PATCH 06/10] MS; removing some dumb user stuff --- app/controllers/users_controller.rb | 3 +-- app/views/layouts/application.html.haml | 2 +- app/views/users/new.html.haml | 13 ------------- app/views/users/show.html.haml | 11 ----------- public/stylesheets/application.css | 1 + 5 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 app/views/users/new.html.haml delete mode 100644 app/views/users/show.html.haml diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9964778fb..904598dfb 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -7,7 +7,6 @@ class UsersController < ApplicationController def show @user = User.find_by_id params[:id] @user_profile = @user.person.profile - respond_with @user end @@ -21,6 +20,6 @@ class UsersController < ApplicationController def update @user = User.find_by_id params[:id] @user.update_profile params[:user] - respond_with @user + respond_with(@user, :location => root_url) end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 63ef4736a..4368d05eb 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -50,7 +50,7 @@ = owner_image_tag = link_to current_user.real_name, current_user.person %li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count) - %li.settings= link_to "settings", edit_user_path(current_user) + %li.settings= link_to "edit profile", edit_user_path(current_user) %li.logout= link_to "logout", destroy_user_session_path = render "shared/group_nav" diff --git a/app/views/users/new.html.haml b/app/views/users/new.html.haml deleted file mode 100644 index 84b971b6e..000000000 --- a/app/views/users/new.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -- title "New User" - -= form_for @user do |f| - = f.error_messages - %p - = f.label :password - %br - = f.password_field :password - %p - = f.submit - - -%p= link_to "Back to List", users_path diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml deleted file mode 100644 index b678b4377..000000000 --- a/app/views/users/show.html.haml +++ /dev/null @@ -1,11 +0,0 @@ -.span-20.last - %h1= "#{@user.real_name}" -- if @user_profile - %p - %b url - %p - = @user.url - %p - %b Serialized Key - %p - = @user.serialized_key diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 65f622321..f516bbaab 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -96,6 +96,7 @@ header { position: relative; display: inline; float: right; + z-index: 3; padding-right: 10px; } header #session_action a.new_requests { color: #df0101; } From 3cf79380289dd61571c742f1abc204ef0b80fc64 Mon Sep 17 00:00:00 2001 From: maxwell Date: Wed, 8 Sep 2010 20:51:46 -0700 Subject: [PATCH 07/10] MS fixing pagination numbers and couple of other things --- app/controllers/groups_controller.rb | 4 ++-- public/stylesheets/application.css | 2 +- public/stylesheets/sass/application.sass | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 34ae5960c..0d1cecf6b 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -5,7 +5,7 @@ class GroupsController < ApplicationController respond_to :json, :only => :show def index - @posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :order => 'created_at DESC' + @posts = current_user.visible_posts(:by_members_of => :all).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC' @group = :all end @@ -27,7 +27,7 @@ class GroupsController < ApplicationController def show @group = Group.find_by_id params[:id] @friends = @group.people - @posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC' + @posts = current_user.visible_posts( :by_members_of => @group ).paginate :per_page => 15, :order => 'created_at DESC' respond_with @group end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index f516bbaab..18efef3c5 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -24,7 +24,7 @@ a { #flash_notice, #flash_error, #flash_alert { - z-index: 3; + z-index: 100; top: 32px; position: absolute; color: black; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 278745ed4..e99358393 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -25,7 +25,7 @@ a #flash_notice, #flash_error, #flash_alert - :z-index 3 + :z-index 100 :top 32px :position absolute :color #000 From 134bdab49d549384d22151283b431dce68ec2121 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 8 Sep 2010 20:52:35 -0700 Subject: [PATCH 08/10] group header now has a page_title field. --- app/views/albums/index.html.haml | 4 +++- app/views/albums/show.html.haml | 13 +++++-------- app/views/groups/index.html.haml | 3 +++ app/views/groups/show.html.haml | 3 +++ app/views/layouts/application.html.haml | 8 ++++++-- app/views/photos/show.html.haml | 4 +++- public/stylesheets/application.css | 10 +++++++++- public/stylesheets/sass/application.sass | 13 ++++++++++++- 8 files changed, 44 insertions(+), 14 deletions(-) diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml index 2be320629..87902a523 100644 --- a/app/views/albums/index.html.haml +++ b/app/views/albums/index.html.haml @@ -4,7 +4,9 @@ $("#add_album_button").fancybox(); }); -.back= link_to "⇧ home", root_path += content_for :page_title do + = link_to "Albums", albums_path + %h1.big_text Albums .right diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml index 80abbacd6..5e6e64817 100644 --- a/app/views/albums/show.html.haml +++ b/app/views/albums/show.html.haml @@ -5,19 +5,16 @@ }); }); += content_for :page_title do + = link_to @album.name, @album + .album_id{:id => @album.id, :style => "display:hidden;"} -.back= link_to '⇧ albums', albums_path -%h1.big_text +%h1.big_text = @album.name - -if current_user.owns? @album - .right - #add_photo_loader - = image_tag 'ajax-loader.gif' - = link_to 'Add Photos', '#new_photo_pane', :class => 'button', :id => "add_photo_button" - +-if current_user.owns? @album =render 'photos/new_photo' .yo{:style => "display:none;"} diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml index 6c3039aef..e4e18829e 100644 --- a/app/views/groups/index.html.haml +++ b/app/views/groups/index.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Home + %ul#stream - for post in @posts = render type_partial(post), :post => post unless post.class == Album diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 64a7a48a5..822a33ef4 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -1,3 +1,6 @@ +- content_for :page_title do + Home + %ul#stream - for post in @posts = render type_partial(post), :post => post diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 63ef4736a..c53434d96 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -60,10 +60,14 @@ .span-5.last - if @group == :all %h1 - All Groups + = link_to "All Groups", root_path - else %h1 - = @group.name + = link_to @group.name, @group + + .page_title + = yield :page_title + .span-19.last = render "shared/publisher", :group_ids => :all diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 27afac74c..51c7234f5 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -10,8 +10,10 @@ } }); += content_for :page_title do + = link_to "Photo", @photo + -.back= link_to "⇧ #{@album.name}", album_path(@album) %h1.big_text = @photo.image diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 65f622321..d5c0f5b90 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -96,6 +96,7 @@ header { position: relative; display: inline; float: right; + z-index: 3; padding-right: 10px; } header #session_action a.new_requests { color: #df0101; } @@ -107,7 +108,14 @@ header { height: 85px; } header #group_header h1 { margin-bottom: 0; - margin-top: 27px; } + margin-top: 15px; } + header #group_header a { + color: #111111; } + header #group_header a:hover { + background: none; + color: #333333; } + header #group_header .page_title { + text-transform: uppercase; } #show_filters { z-index: 100; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 278745ed4..c86603a27 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -128,7 +128,18 @@ header h1 :margin :bottom 0 - :top 27px + :top 15px + + a + :color #111 + &:hover + :background none + :color #333 + + .page_title + :text + :transform uppercase + #show_filters :z-index 100 From 1c2bfa64a1f1a3245b5048a13167c72458f57ec4 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 8 Sep 2010 23:30:08 -0700 Subject: [PATCH 09/10] cleaned login page resources --- app/views/devise/sessions/new.html.haml | 3 -- app/views/layouts/session_wall.html.haml | 9 ++-- public/javascripts/photos.js | 1 - public/javascripts/session_wall.js | 5 --- public/javascripts/stream.js | 20 +++++---- public/stylesheets/sass/sessions.sass | 56 ++++++++++++------------ public/stylesheets/sessions.css | 47 ++++++++++---------- 7 files changed, 67 insertions(+), 74 deletions(-) delete mode 100644 public/javascripts/photos.js delete mode 100644 public/javascripts/session_wall.js diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 168352b0c..1840d7acc 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,14 +1,11 @@ = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| - #user - %p.username = f.label :username = f.text_field :username %p.user_network ="@#{request.host}" - %p = f.label :password = f.password_field :password diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml index 989bf061f..945ddab92 100644 --- a/app/views/layouts/session_wall.html.haml +++ b/app/views/layouts/session_wall.html.haml @@ -2,20 +2,19 @@ %html %head %title - = "diaspora" + DIASPORA | login %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ %meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" } - = stylesheet_link_tag "blueprint/screen", :media => 'screen' = stylesheet_link_tag "sessions" /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" = javascript_include_tag 'jquery142', 'google' = javascript_include_tag 'jquery.infieldlabel' - = javascript_include_tag 'session_wall.js' :javascript $(document).ready(function(){ - $("#user_email").focus(); + $("#user_username").focus(); + $("label").inFieldLabels(); }); = csrf_meta_tag @@ -44,7 +43,7 @@ - flash.each do |name, msg| = content_tag :div, msg, :id => "flash_#{name}" %div#huge_text - diaspora + DIASPORA* = yield /= link_to "signup", "/signup" diff --git a/public/javascripts/photos.js b/public/javascripts/photos.js deleted file mode 100644 index 8b1378917..000000000 --- a/public/javascripts/photos.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/public/javascripts/session_wall.js b/public/javascripts/session_wall.js deleted file mode 100644 index fd8636236..000000000 --- a/public/javascripts/session_wall.js +++ /dev/null @@ -1,5 +0,0 @@ - -$(document).ready(function(){ - $("label").inFieldLabels(); -}); - diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index 82d971f3e..d1d91351a 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -1,11 +1,10 @@ $(document).ready(function(){ - $('.comment_set').each(function(index) { var $this = $(this); if($this.children().length > 1) { - var show_comments_toggle = $this.parent().prev().children(".show_post_comments"); - show_comments_toggle.click(); - }; + var show_comments_toggle = $this.parent().prev().children(".show_post_comments"); + show_comments_toggle.click(); + } }); });//end document ready @@ -19,12 +18,15 @@ $("#stream li").live('mouseout',function() { $(".show_post_comments").live('click', function(event) { event.preventDefault(); - if( $(this).hasClass( "visible")) { - $(this).html($(this).html().replace("hide", "show")); - $(this).closest("li").children(".content").children(".comments").fadeOut(100); + + var $this = $(this); + + if( $this.hasClass( "visible")) { + $this.html($(this).html().replace("hide", "show")); + $this.closest("li").children(".content").children(".comments").fadeOut(100); } else { - $(this).html($(this).html().replace("show", "hide")); - $(this).closest("li").children(".content").children(".comments").fadeIn(100); + $this.html($(this).html().replace("show", "hide")); + $this.closest("li").children(".content").children(".comments").fadeIn(100); } $(this).toggleClass( "visible" ); }); diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass index 34602615e..1ed00a615 100644 --- a/public/stylesheets/sass/sessions.sass +++ b/public/stylesheets/sass/sessions.sass @@ -1,28 +1,37 @@ -body - :padding 2em +@font-face + :font-family 'BrandonGrotesqueLightRegular' + :src url('brandongrotesque_light/Brandon_light-webfont.eot') + :src local('☺'), url('brandongrotesque_light/Brandon_light-webfont.woff') format('woff'), url('brandongrotesque_light/Brandon_light-webfont.ttf') format('truetype'), url('brandongrotesque_light/Brandon_light-webfont.svg#webfont') format('svg') + font + :weight normal + :style normal + + +html /* via blueprint */ + :font + :size 100.01% + +body /* via blueprint */ + :font + :size 75% + :family "Helvetica Neue", Arial, Helvetica, sans-serif + :color #222 + :background #fff + + :margin + :left 2em #huge_text - :display inline block :font :size 40px - :weight bold + :family 'BrandonGrotesqueLightRegular' :line-height 120px - :letter - :spacing -2px - :color #eaeaea + :color #333 :text-shadow 0 1px 1px #999 - span - :display inline - :color #666 - input :font - :size 30px - :width 200px - :margin - :bottom 0 - :top 0 + :size 14px form p :position relative @@ -31,8 +40,9 @@ form p label :color #999 :position absolute - :top 3px - :left 0.48em + :padding + :top 7px + :left 8px :font :size 14px :weight normal @@ -40,18 +50,10 @@ label input[type='text'], input[type='password'] :font - :family 'lucida grande', 'sans-serif' - :size 14px + :family "Helvetica Neue", Arial, Helvetica, sans-serif :padding 0.3em - :display block :width 395px - :box-shadow 0 2px 0px #fff - :-webkit-box-shadow 0 2px 0px #fff - :-moz-box-shadow 0 2px 0px #fff :border-top 1px solid #999 - :height auto - :border-radius 3px - :-moz-border-radius 3px #user :display inline diff --git a/public/stylesheets/sessions.css b/public/stylesheets/sessions.css index f4c48299b..60ad0f519 100644 --- a/public/stylesheets/sessions.css +++ b/public/stylesheets/sessions.css @@ -1,23 +1,30 @@ +@font-face { + font-family: "BrandonGrotesqueLightRegular"; + src: url("brandongrotesque_light/Brandon_light-webfont.eot"); + src: local("☺"), url("brandongrotesque_light/Brandon_light-webfont.woff") format("woff"), url("brandongrotesque_light/Brandon_light-webfont.ttf") format("truetype"), url("brandongrotesque_light/Brandon_light-webfont.svg#webfont") format("svg"); + font { + weight: normal; + style: normal; } } + +html { + font-size: 100.01%; } + body { - padding: 2em; } + font-size: 75%; + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; + color: #222222; + background: white; + margin-left: 2em; } #huge_text { - display: inline block; font-size: 40px; - font-weight: bold; + font-family: "BrandonGrotesqueLightRegular"; line-height: 120px; - letter-spacing: -2px; - color: #eaeaea; + color: #333333; text-shadow: 0 1px 1px #999999; } - #huge_text span { - display: inline; - color: #666666; } input { - font-size: 30px; - width: 200px; - margin-bottom: 0; - margin-top: 0; } + font-size: 14px; } form p { position: relative; @@ -26,25 +33,17 @@ form p { label { color: #999999; position: absolute; - top: 3px; - left: 0.48em; + padding-top: 7px; + left: 8px; font-size: 14px; font-weight: normal; } input[type='text'], input[type='password'] { - font-family: "lucida grande", "sans-serif"; - font-size: 14px; + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; padding: 0.3em; - display: block; width: 395px; - box-shadow: 0 2px 0px white; - -webkit-box-shadow: 0 2px 0px white; - -moz-box-shadow: 0 2px 0px white; - border-top: 1px solid #999999; - height: auto; - border-radius: 3px; - -moz-border-radius: 3px; } + border-top: 1px solid #999999; } #user { display: inline; From a15bf73287f7cbf7c1cf53e9d9f47a17dd91ea4a Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi Date: Wed, 8 Sep 2010 23:35:07 -0700 Subject: [PATCH 10/10] minor textbox css fix --- public/stylesheets/sass/sessions.sass | 24 +++++++++++++++++++++--- public/stylesheets/sessions.css | 13 +++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass index 1ed00a615..810450a6f 100644 --- a/public/stylesheets/sass/sessions.sass +++ b/public/stylesheets/sass/sessions.sass @@ -6,12 +6,13 @@ :weight normal :style normal - -html /* via blueprint */ +/* via blueprint */ +html :font :size 100.01% -body /* via blueprint */ +/* via blueprint */ +body :font :size 75% :family "Helvetica Neue", Arial, Helvetica, sans-serif @@ -21,6 +22,23 @@ body /* via blueprint */ :margin :left 2em +/* via blueprint */ +input[type=text], +input[type=password], +textarea, select + :background + :color #fff + :border 1px solid #bbb + +/* via blueprint */ +input[type=text]:focus, +input[type=password]:focus, +input.text:focus, +input.title:focus, +textarea:focus, select:focus + :border + :color #666 + #huge_text :font :size 40px diff --git a/public/stylesheets/sessions.css b/public/stylesheets/sessions.css index 60ad0f519..c480c899c 100644 --- a/public/stylesheets/sessions.css +++ b/public/stylesheets/sessions.css @@ -16,6 +16,19 @@ body { background: white; margin-left: 2em; } +input[type=text], +input[type=password], +textarea, select { + background-color: white; + border: 1px solid #bbbbbb; } + +input[type=text]:focus, +input[type=password]:focus, +input.text:focus, +input.title:focus, +textarea:focus, select:focus { + border-color: #666666; } + #huge_text { font-size: 40px; font-family: "BrandonGrotesqueLightRegular";