MS merged master
This commit is contained in:
maxwell
commit
eb4262dfc7
12 changed files with 42 additions and 27 deletions
|
|
@ -4,7 +4,7 @@
|
|||
= link_to post.name, object_path(post)
|
||||
|
||||
%div.time
|
||||
by:
|
||||
by
|
||||
= album_person(post)
|
||||
%br
|
||||
= link_to(how_long_ago(post), object_path(post))
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
%h1.big_text
|
||||
.back
|
||||
= link_to "⇧ home", root_path
|
||||
%ul.button_set
|
||||
%li.selected= friends_albums_link
|
||||
%li= your_albums_link
|
||||
|
||||
Albums
|
||||
.button.right#add_album_button
|
||||
= link_to 'New Album', "#"
|
||||
|
||||
#add_album_box.contextual_pane
|
||||
= render "albums/new_album"
|
||||
|
||||
.sub_header
|
||||
%ul.button_set
|
||||
%li.selected= friends_albums_link
|
||||
%li= your_albums_link
|
||||
|
||||
%ul#stream
|
||||
- for album in @albums
|
||||
= render "album", :post => album
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
= render "photos/new_photo", :photo => @photo, :album => @album
|
||||
|
||||
.sub_header
|
||||
="last updated: #{how_long_ago(@album)}"
|
||||
="updated #{how_long_ago(@album)}"
|
||||
|
||||
-unless mine? @album
|
||||
%h4= "by #{@album.person.real_name}"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
%h1#user_name
|
||||
= link_to current_user.real_name, root_path
|
||||
%span= title_for_page
|
||||
%h3
|
||||
#latest_message= my_latest_message
|
||||
%h3#latest_message
|
||||
= my_latest_message
|
||||
= render "shared/publisher"
|
||||
%ul#stream
|
||||
- for post in @posts
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@
|
|||
|
||||
.container
|
||||
.span-24.last
|
||||
.span-19.append-1.last
|
||||
.span-20.append-1.last
|
||||
= yield
|
||||
.span-4.last
|
||||
.span-3.last
|
||||
= link_to(person_image_tag(current_user), root_path)
|
||||
%br
|
||||
= link_to "Edit your profile", edit_user_path(current_user)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
- title "People"
|
||||
%h1.big_text
|
||||
.back
|
||||
= link_to '⇧ home', root_path
|
||||
Friends
|
||||
.button.right
|
||||
= link_to 'Add Friend', requests_path
|
||||
|
||||
%table
|
||||
%tr
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
%h1.big_text
|
||||
.back
|
||||
= link_to "⇧ home", root_path
|
||||
requests
|
||||
Requests
|
||||
|
||||
= render "requests/new_request", :request => @request
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,4 @@
|
|||
#publisher
|
||||
%sp
|
||||
POST:
|
||||
%ul#publisher_content_pickers
|
||||
%li{ :class => "status_message selected" }= link_to "status message", "#"
|
||||
%li{ :class => "bookmark" }= link_to "bookmark", "#"
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ header {
|
|||
margin-bottom: 1em;
|
||||
color: #555555;
|
||||
background-color: #2b2726;
|
||||
border-bottom: 1px solid #444444;
|
||||
border-bottom: 3px solid #333333;
|
||||
padding: 6px 0;
|
||||
padding-top: 0; }
|
||||
header #diaspora_text {
|
||||
|
|
@ -172,6 +172,9 @@ form {
|
|||
color: #dddddd;
|
||||
float: right; }
|
||||
|
||||
#latest_message {
|
||||
font-weight: normal; }
|
||||
|
||||
#stream div.comments {
|
||||
display: none; }
|
||||
|
||||
|
|
@ -208,7 +211,8 @@ ul.comment_set {
|
|||
#profile ul {
|
||||
list-style-type: none; }
|
||||
|
||||
#stream img.person_picture {
|
||||
#stream img.person_picture, #profile img.person_picture,
|
||||
.comments img.person_picture {
|
||||
border-radius: 3px;
|
||||
-webkit-border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
|
|
@ -289,9 +293,6 @@ label {
|
|||
color: #999999;
|
||||
padding: 20px 1em;
|
||||
padding-top: 10px; }
|
||||
#publisher sp {
|
||||
font-family: "BrandonGrotesqueLightRegular";
|
||||
font-size: large; }
|
||||
|
||||
#new_blog,
|
||||
#new_bookmark {
|
||||
|
|
@ -341,7 +342,8 @@ ul#publisher_content_pickers li {
|
|||
padding: 1em;
|
||||
background: rgba(0, 0, 0, 0.8);
|
||||
bottom: 20px;
|
||||
font-size: 18px; }
|
||||
font-size: 18px;
|
||||
text-shadow: 0 2px 0 black; }
|
||||
.album .name .time {
|
||||
font-size: 12px; }
|
||||
.album .name .time a {
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ header
|
|||
:background
|
||||
:color #2B2726
|
||||
:border
|
||||
:bottom 1px solid #444
|
||||
:bottom 3px solid #333
|
||||
:padding 6px 0
|
||||
:top 0
|
||||
|
||||
|
|
@ -202,6 +202,10 @@ form
|
|||
:size 30%
|
||||
:color #dddddd
|
||||
:float right
|
||||
|
||||
#latest_message
|
||||
:font
|
||||
:weight normal
|
||||
|
||||
|
||||
#stream div.comments
|
||||
|
|
@ -243,6 +247,7 @@ ul.comment_set
|
|||
:padding
|
||||
:bottom 8px
|
||||
|
||||
|
||||
.profile_photo
|
||||
:float left
|
||||
:margin-right 10px
|
||||
|
|
@ -250,7 +255,9 @@ ul.comment_set
|
|||
ul
|
||||
:list-style-type none
|
||||
|
||||
#stream
|
||||
|
||||
#stream, #profile,
|
||||
.comments
|
||||
img.person_picture
|
||||
:border-radius 3px
|
||||
:-webkit-border-radius 3px
|
||||
|
|
@ -344,11 +351,6 @@ label
|
|||
:color #999
|
||||
:padding 20px 1em
|
||||
:top 10px
|
||||
sp
|
||||
:font
|
||||
:family 'BrandonGrotesqueLightRegular'
|
||||
:font-size large
|
||||
|
||||
|
||||
#new_blog,
|
||||
#new_bookmark
|
||||
|
|
@ -414,6 +416,8 @@ ul#publisher_content_pickers li
|
|||
:bottom 20px
|
||||
:font
|
||||
:size 18px
|
||||
|
||||
:text-shadow 0 2px 0 #000
|
||||
|
||||
.time
|
||||
:font
|
||||
|
|
@ -478,3 +482,5 @@ h1.big_text
|
|||
:top -5px
|
||||
:bottom 20px
|
||||
:color #999
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
.button, .button_set
|
||||
:font
|
||||
:family "Lucida Grande", sans-serif
|
||||
:style normal
|
||||
|
||||
:display inline
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
.button, .button_set {
|
||||
font-family: "Lucida Grande", sans-serif;
|
||||
font-style: normal;
|
||||
display: inline;
|
||||
color: #777777;
|
||||
font-size: 12px;
|
||||
|
|
|
|||
Loading…
Reference in a new issue