change language around explore/participate.

app/views/aspects/_aspect_listings.haml

@@ -4,7 +4,7 @@
 
 %ul#aspect_nav.left_nav.sub
   %li.all_aspects
-    = link_to t('aspects.index.your_aspects'), aspects_path, :class => 'home_selector'
+    = link_to t('streams.aspects.title'), aspects_path, :class => 'home_selector'
 
     - if @stream.is_a?(Stream::Aspect)
       %ul.sub_nav

config/locales/diaspora/en.yml

@@ -159,7 +159,6 @@ en:
     index:
       donate: "Donate"
       keep_us_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
-      your_aspects: "Your Aspects"
       no_tags: "+ Find a tag to follow"
       unfollow_tag: "Stop following #%{tag}"
       handle_explanation: "This is your Diaspora ID. Like an email address, you can give this to people to reach you."
@@ -927,14 +926,15 @@ en:
       contacts_title: "Recent Posters"
 
     multi:
-      title: "Explore"
+      title: "Stream"
       contacts_title: "People in your Explore Stream"
 
     aspects:
-      title: "Your Aspects"
+      title: "My Aspects"
 
     participate:
-      title: "Participate"
+      title: "My Activity"
+
   users:
     logged_out:
       signed_out: "You've signed out of Diaspora*"

config/locales/javascript/javascript.en.yml

@@ -25,8 +25,8 @@ en:
         year: "about a year"
         years: "%d years"
 
-      participate: "Participate"
+      my_activity: "My Activity"
-      explore: "Explore"
+      my_stream: "Stream"
 
       videos:
           watch: "Watch this video on <%= provider %>"

public/javascripts/app/templates/header.handlebars

@@ -7,13 +7,13 @@
   <span class="header-nav">
     <span>
         <a href="/explore">
-          {{t "explore"}}
+          {{t "my_stream"}}
         </a>
     </span>
 
     <span>
         <a href="/participate">
-          {{t "participate"}}
+          {{t "my_activity"}}
         </a>
      </span>
   </span>

public/stylesheets/sass/application.sass

@@ -935,7 +935,6 @@ img.scaled_full
   :float right
 
   :margin
-    :top -1px
     :right 10px
 
   form
@@ -949,6 +948,9 @@ img.scaled_full
 
       :border 1px solid #222
 
+      :font-size 13px
+      :padding 4px
+
       &:hover
         :background-color #555
 
@@ -961,11 +963,10 @@ img.scaled_full
         :background-color white
         :width 200px
 
-      &[type='search']
+      &::-webkit-input-placeholder
-        &::-webkit-input-placeholder
+        :text-shadow none
-          :text-shadow none
+      &:-moz-placeholder
-        &:-moz-placeholder
+        :text-shadow none
-          :text-shadow none
 
 ul#settings_nav
   :display inline