From a2b79d0338eb32817da3c91dcb340bc2b0563cbe Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Tue, 11 Oct 2011 08:00:36 -0700
Subject: [PATCH] touch up header
---
app/views/layouts/_header.html.haml | 5 +----
config/locales/diaspora/en.yml | 6 +++---
public/stylesheets/sass/application.sass | 13 ++++++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index c3588cf7be..ddaf669be2 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -26,10 +26,6 @@
= link_to aspects_path, :title => t('_home') do
= image_tag 'icons/home_grey.svg', :height => 16, :alt => t('_home')
- #contacts_badge.badge
- = link_to contacts_link, :title => t('_contacts') do
- = image_tag 'icons/contacts_grey.svg', :height => 16, :alt => t('_contacts')
-
#notification_badge.badge
= link_to notifications_path, :title => new_notification_text(@notification_count) do
= image_tag 'icons/notifications_grey.svg', :height => 16, :id => "notification-flag", :alt => new_notification_text(@notification_count)
@@ -79,6 +75,7 @@
= owner_image_tag(:thumb_small)
= link_to current_user.name, '#', :title => current_user.diaspora_handle
%li= link_to t('.profile'), current_user.person
+ %li= link_to t('_contacts'), contacts_link
%li= link_to t('.settings'), edit_user_path
-if current_user.admin?
%li= link_to t('.admin'), user_search_path
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 57a3d62c0b..b6ba959149 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -338,9 +338,9 @@ en:
layouts:
header:
- profile: "profile"
- settings: "settings"
- logout: "log out"
+ profile: "Profile"
+ settings: "Settings"
+ logout: "Log out"
blog: "blog"
login: "log in"
code: "code"
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 03ada3969c..dc8f26fd20 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -139,7 +139,7 @@ form
:margin 0
header
- @include box-shadow(0,0px,2px,#777)
+ @include box-shadow(0,1px,2px,rgba(0,0,0,0.5))
@include linear-gradient(rgba(35,30,30,0.95),rgba(35,30,30,1))
:z-index 50
@@ -153,6 +153,9 @@ header
:top 0
:left 0
+ :border
+ :bottom 1px solid rgb(4,0,0)
+
&.fixit
:position fixed
:top -30px
@@ -285,9 +288,9 @@ ul.as-selections
.diaspora_header_logo
:position relative
- :top 5px
+ :top 4px
:margin
- :right 49px
+ :right 26px
&:active
:top 5px
@@ -1153,7 +1156,7 @@ header #global_search
:top 1px solid #111
:font
- :size 12px
+ :size 13px
:border 1px solid #000
@@ -1624,7 +1627,7 @@ h3 span.current_gs_step
:display inline-block
:min-width 170px
:top 3px
- :left 460px
+ :left 440px
:margin
:left 20px
--
GitLab