Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 132bdd3bc58db93ecf745a74f3d0673b0444db32 1 parent e1e4ce8
@danielgrippi danielgrippi authored
View
BIN  app/assets/images/buttons/edit2@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/assets/images/buttons/edit@2x.png
Deleted file not rendered
View
BIN  app/assets/images/buttons/pub@2x.png
Deleted file not rendered
View
BIN  app/assets/images/press_logos/mashable_logo.png
Deleted file not rendered
View
BIN  app/assets/images/press_logos/nymag_logo.png
Deleted file not rendered
View
BIN  app/assets/images/press_logos/techcrunch_logo.png
Deleted file not rendered
View
BIN  app/assets/images/press_logos/the_new_york_times_logo.png
Deleted file not rendered
View
42 app/assets/stylesheets/new_styles/_profile.scss
@@ -77,22 +77,54 @@
#profile-controls {
text-align : right;
- padding : 10px 12px;
+ padding : 10px 16px;
/* when our buttons aren't there, we still want to maintain a persistent height */
min-height : 40px;
.control {
@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 {
- height : 40px;
- width : 40px;
+ font-family : Roboto-Bold;
+ color : #ccc;
+
+ 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 {
@include opacity(1);
+ background-color : #000;
text-decoration : none;
}
View
8 app/assets/templates/profile.jst.hbs
@@ -47,11 +47,11 @@
<section id="profile-controls">
{{#if is_own_profile}}
- <a href="#composer" id="composer-button" class="control small" rel="facebox">
- <img src='{{imageUrl "buttons/pub@2x.png"}}' title="New Post" rel="tooltip"/>
+ <a href="#composer" id="composer-button" class="control small label label-inverse" rel="facebox">
+ MAKE
</a>
- <a href="#" id="edit-mode-toggle" class="control small">
- <img src='{{imageUrl "buttons/edit@2x.png"}}' title="Edit Posts" rel="tooltip"/>
+ <a href="#" id="edit-mode-toggle" class="control small label label-inverse" title="Edit Posts" rel="tooltip">
+ <img src='{{imageUrl "buttons/edit2@2x.png"}}'/>
</a>
<!-- only load up this iframe if the current user is on their own page.
Please sign in to comment.
Something went wrong with that request. Please try again.