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

touch up header

Browse source
This commit is contained in:
danielgrippi 2011-10-11 08:00:36 -07:00
parent 8bc67f983c
commit a2b79d0338
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/layouts/_header.html.haml
View file

@ -26,10 +26,6 @@
= link_to aspects_path, :title => t('_home') do = link_to aspects_path, :title => t('_home') do
= image_tag 'icons/home_grey.svg', :height => 16, :alt => t('_home') = 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 #notification_badge.badge
= link_to notifications_path, :title => new_notification_text(@notification_count) do = 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) = 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) = owner_image_tag(:thumb_small)
= link_to current_user.name, '#', :title => current_user.diaspora_handle = link_to current_user.name, '#', :title => current_user.diaspora_handle
%li= link_to t('.profile'), current_user.person %li= link_to t('.profile'), current_user.person
%li= link_to t('_contacts'), contacts_link
%li= link_to t('.settings'), edit_user_path %li= link_to t('.settings'), edit_user_path
-if current_user.admin? -if current_user.admin?
%li= link_to t('.admin'), user_search_path %li= link_to t('.admin'), user_search_path

6
config/locales/diaspora/en.yml
View file

@ -338,9 +338,9 @@ en:
layouts: layouts:
header: header:
profile: "profile" profile: "Profile"
settings: "settings" settings: "Settings"
logout: "log out" logout: "Log out"
blog: "blog" blog: "blog"
login: "log in" login: "log in"
code: "code" code: "code"

13
public/stylesheets/sass/application.sass
View file

@ -139,7 +139,7 @@ form
:margin 0 :margin 0
header 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)) @include linear-gradient(rgba(35,30,30,0.95),rgba(35,30,30,1))
:z-index 50 :z-index 50
@ -153,6 +153,9 @@ header
:top 0 :top 0
:left 0 :left 0
:border
:bottom 1px solid rgb(4,0,0)
&.fixit &.fixit
:position fixed :position fixed
:top -30px :top -30px
@ -285,9 +288,9 @@ ul.as-selections
.diaspora_header_logo .diaspora_header_logo
:position relative :position relative
:top 5px :top 4px
:margin :margin
:right 49px :right 26px
&:active &:active
:top 5px :top 5px
@ -1153,7 +1156,7 @@ header #global_search
:top 1px solid #111 :top 1px solid #111
:font :font
:size 12px :size 13px
:border 1px solid #000 :border 1px solid #000
@ -1624,7 +1627,7 @@ h3 span.current_gs_step
:display inline-block :display inline-block
:min-width 170px :min-width 170px
:top 3px :top 3px
:left 460px :left 440px
:margin :margin
:left 20px :left 20px