nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change create and edit buttons on new profile; remove old press assets

Browse source
This commit is contained in:
danielgrippi 2012-05-11 15:12:22 -07:00
parent e1e4ce8e4f
commit 132bdd3bc5
9 changed files with 41 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/buttons/edit2@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/assets/images/buttons/edit@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
app/assets/images/buttons/pub@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/assets/images/press_logos/mashable_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.1 KiB

BIN
app/assets/images/press_logos/nymag_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.2 KiB

BIN
app/assets/images/press_logos/techcrunch_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
app/assets/images/press_logos/the_new_york_times_logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.5 KiB

42
app/assets/stylesheets/new_styles/_profile.scss
View file

@ -77,22 +77,54 @@
#profile-controls { #profile-controls {
text-align : right; text-align : right;
padding : 10px 12px; padding : 10px 16px;
/* when our buttons aren't there, we still want to maintain a persistent height */ /* when our buttons aren't there, we still want to maintain a persistent height */
min-height : 40px; min-height : 40px;
.control { .control {
@include transition(opacity); @include transition(opacity);
@include opacity(0.4); @include opacity(0.6);
@include border-radius(3px);
@include box-shadow(0, 1px, 2px, rgba(0,0,0,0.8));
&.small img { font-family : Roboto-Bold;
height : 40px; color : #ccc;
width : 40px;
position : relative;
top : 11px;
background-color : #000;
border : 1px solid #666;
padding : 10px;
padding-top : 10px;
margin-left : 8px;
&#composer-button {
position : relative;
font-size : 14px;
line-height : 14px;
padding-bottom : 8px;
padding-top : 9px;
padding-right : 8px;
}
&#edit-mode-toggle {
top : 10px;
padding-bottom : 10px;
img {
margin-top : -5px;
}
}
img {
height : 16px;
} }
&:hover { &:hover {
@include opacity(1); @include opacity(1);
background-color : #000;
text-decoration : none; text-decoration : none;
} }

8
app/assets/templates/profile.jst.hbs
View file

@ -47,11 +47,11 @@
<section id="profile-controls"> <section id="profile-controls">
{{#if is_own_profile}} {{#if is_own_profile}}
<a href="#composer" id="composer-button" class="control small" rel="facebox"> <a href="#composer" id="composer-button" class="control small label label-inverse" rel="facebox">
<img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/> MAKE
</a> </a>
<a href="#" id="edit-mode-toggle" class="control small"> <a href="#" id="edit-mode-toggle" class="control small label label-inverse" title="Edit Posts" rel="tooltip">
<img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/> <img src='{{imageUrl "buttons/edit2@2x.png"}}'/>
</a> </a>
<!-- only load up this iframe if the current user is on their own page. <!-- only load up this iframe if the current user is on their own page.