diff --git a/app/assets/images/buttons/edit2@2x.png b/app/assets/images/buttons/edit2@2x.png new file mode 100644 index 000000000..818ce2b29 Binary files /dev/null and b/app/assets/images/buttons/edit2@2x.png differ diff --git a/app/assets/images/buttons/edit@2x.png b/app/assets/images/buttons/edit@2x.png deleted file mode 100644 index 96b91998a..000000000 Binary files a/app/assets/images/buttons/edit@2x.png and /dev/null differ diff --git a/app/assets/images/buttons/pub@2x.png b/app/assets/images/buttons/pub@2x.png deleted file mode 100644 index 004eff66b..000000000 Binary files a/app/assets/images/buttons/pub@2x.png and /dev/null differ diff --git a/app/assets/images/press_logos/mashable_logo.png b/app/assets/images/press_logos/mashable_logo.png deleted file mode 100644 index 242c57197..000000000 Binary files a/app/assets/images/press_logos/mashable_logo.png and /dev/null differ diff --git a/app/assets/images/press_logos/nymag_logo.png b/app/assets/images/press_logos/nymag_logo.png deleted file mode 100644 index a1811d61c..000000000 Binary files a/app/assets/images/press_logos/nymag_logo.png and /dev/null differ diff --git a/app/assets/images/press_logos/techcrunch_logo.png b/app/assets/images/press_logos/techcrunch_logo.png deleted file mode 100644 index dead15d5b..000000000 Binary files a/app/assets/images/press_logos/techcrunch_logo.png and /dev/null differ diff --git a/app/assets/images/press_logos/the_new_york_times_logo.png b/app/assets/images/press_logos/the_new_york_times_logo.png deleted file mode 100644 index 09571e029..000000000 Binary files a/app/assets/images/press_logos/the_new_york_times_logo.png and /dev/null differ diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss index 8a499ce11..3b7782ddf 100644 --- a/app/assets/stylesheets/new_styles/_profile.scss +++ b/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; } diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs index 33dbe1490..786ee70b2 100644 --- a/app/assets/templates/profile.jst.hbs +++ b/app/assets/templates/profile.jst.hbs @@ -47,11 +47,11 @@
{{#if is_own_profile}} - - + + MAKE - - + +