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

removed hover user menu

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-13 10:40:09 -07:00
parent ede03fe1d5
commit a74e00c159
3 changed files with 44 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/views/layouts/application.html.haml
View file

@ -30,7 +30,7 @@
= content_tag :div, msg, :id => "flash_#{name}"
%header
.container
.container{:style => "position:relative;"}
#diaspora_text{:href => root_path}
= link_to "DIASPORA*", root_path
%span.sub_text
@ -40,18 +40,16 @@
= link_to "photos", albums_path
#session_action
#global_search
%ul
%li#global_search
= form_tag(people_path, :method => 'get') do
%label{:for => 'q'} Search
= text_field_tag 'q'
%ul#user_menu
%li
= owner_image_tag
= link_to current_user.real_name, current_user.person
%li.requests= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
%li.settings= link_to "edit profile", edit_user_path(current_user)
%li.logout= link_to "logout", destroy_user_session_path
%li= link_to current_user.real_name, current_user.person
%li= link_to "requests (#{@request_count})", requests_path, :class => new_request(@request_count)
%li= link_to "edit profile", edit_user_path(current_user)
%li= link_to "logout", destroy_user_session_path
= render "shared/group_nav"

80
public/stylesheets/application.css
View file

@ -78,7 +78,7 @@ header {
color: black;
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(black), to(#333333));
background: -moz-linear-gradient(19% 75% 90deg, #333333, black);
background-color: #333333;
background-color: #222222;
padding: 0;
padding-top: 5px;
border-bottom: 1px solid #cccccc; }
@ -97,13 +97,20 @@ header {
header #diaspora_text span.sub_text {
text-shadow: none; }
header #session_action {
position: relative;
top: 0;
position: absolute;
display: inline;
float: right;
z-index: 3;
padding-right: 10px; }
header #session_action a.new_requests {
color: #df0101; }
right: 0; }
header #session_action ul {
list-style: none;
padding: 0;
margin: 0;
display: inline; }
header #session_action ul li {
display: inline;
margin-right: 1em; }
header #session_action ul li:last-child {
margin-right: 0; }
header #group_header {
z-index: 5;
text-shadow: 0 2px 0 white;
@ -505,67 +512,10 @@ h1.big_text {
left: -25px;
top: 4px; }
#user_menu {
position: absolute;
z-index: 10;
top: 0;
right: 0;
display: inline-block;
padding: 0;
margin: 0;
list-style: none; }
#user_menu > li {
display: none;
background-color: white;
width: 180px;
height: 29px;
border-left: 2px solid black;
border-right: 2px solid black; }
#user_menu > li:hover {
background-color: #eeeeee; }
#user_menu > li:first-child {
display: block;
background: none;
border-left: 2px solid #333333;
border-right: 2px solid #333333; }
#user_menu > li:first-child a {
color: #999999; }
#user_menu > li:first-child img {
position: absolute;
width: 20px;
height: 20px;
top: 3px;
left: 9px; }
#user_menu > li:last-child {
border-bottom: 2px solid black; }
#user_menu > li a {
display: block;
height: 100%;
padding-left: 40px;
padding-top: 5px;
color: black; }
#user_menu > li a:hover {
background-color: transparent; }
#user_menu .requests {
background-image: url("/images/glyphish-icons/icons/40-inbox.png");
background-repeat: no-repeat;
background-position: 5px; }
#user_menu .settings {
background-image: url("/images/glyphish-icons/icons/20-gear2.png");
background-repeat: no-repeat;
background-position: 5px; }
#user_menu .logout {
background-image: url("/images/glyphish-icons/icons/54-lock.png");
background-repeat: no-repeat;
background-position: 5px; }
#user_menu:hover li {
display: block; }
#global_search {
display: inline;
position: relative;
opacity: 0.5;
padding-right: 167px; }
opacity: 0.5; }
#global_search form {
display: inline; }
#global_search form input {

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

@ -111,14 +111,26 @@ header
:shadow none
#session_action
:position relative
:top 0
:position absolute
:display inline
:float right
:z-index 3
a
&.new_requests
:color #DF0101
:padding-right 10px
:right 0
ul
:list
:style none
:padding 0
:margin 0
:display inline
li
:display inline
:margin
:right 1em
&:last-child
:margin
:right 0
#group_header
:z-index 5
@ -654,91 +666,11 @@ h1.big_text
:left -25px
:top 4px
#user_menu
:position absolute
:z-index 10
:top 0
:right 0
:display inline-block
:padding 0
:margin 0
:list
:style none
> li
:display none
:background
:color #fff
:width 180px
:height 29px
:border
:left 2px solid #000
:right 2px solid #000
&:hover
:background
:color #eee
&:first-child
:display block
:background none
:border
:left 2px solid #333
:right 2px solid #333
a
:color #999
img
:position absolute
:width 20px
:height 20px
:top 3px
:left 9px
&:last-child
:border
:bottom 2px solid #000
a
:display block
:height 100%
:padding
:left 40px
:top 5px
:color #000
&:hover
:background
:color transparent
.requests
:background
:image url('/images/glyphish-icons/icons/40-inbox.png')
:repeat no-repeat
:position 5px
.settings
:background
:image url('/images/glyphish-icons/icons/20-gear2.png')
:repeat no-repeat
:position 5px
.logout
:background
:image url('/images/glyphish-icons/icons/54-lock.png')
:repeat no-repeat
:position 5px
&:hover li
:display block
#global_search
:display inline
:position relative
:opacity 0.5
:padding
:right 167px
form
:display inline