adding some texture to the header to distinguish the branch

This commit is contained in:
danielgrippi 2011-12-17 23:32:11 -08:00 committed by Dennis Collinson
parent 1ffdfa8465
commit 193e5d61c5
4 changed files with 37 additions and 25 deletions

View file

@ -1,6 +1,10 @@
<header> <header>
<div class="container" style="position:relative;"> <div class="container" style="position:relative;">
<a href="/stream"><img alt="Logo_small" class="diaspora_header_logo" height="16px" src="/images/logo_small.png?1322618579" width="161px"></a>
<a href="/stream">
<img alt="Logo_small" class="diaspora_header_logo" height="38px" width="38px" src="/images/header-logo.png" />
</a>
<div id="global_search"> <div id="global_search">
<form accept-charset="UTF-8" action="/people" class="search_form" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓"></div> <form accept-charset="UTF-8" action="/people" class="search_form" method="get"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="✓"></div>
<input id="q" name="q" placeholder="Find people or #tags" results="5" type="search" autocomplete="off" class="ac_input"> <input id="q" name="q" placeholder="Find people or #tags" results="5" type="search" autocomplete="off" class="ac_input">

BIN
public/images/header-bg.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

@ -148,8 +148,11 @@ form
:margin 0 :margin 0
header header
@include box-shadow(0,1px,2px,rgba(0,0,0,0.5)) @include box-shadow(0,1px,3px,rgba(0,0,0,0.9))
@include linear-gradient(rgb(40,35,35),rgb(35,30,30))
:background
:color rgb(40,35,35)
:image url('/images/header-bg.png')
:z-index 1001 :z-index 1001
:padding 6px 0 :padding 6px 0
@ -163,7 +166,7 @@ header
:left 0 :left 0
:border :border
:bottom 1px solid rgb(4,0,0) :bottom 1px solid #444
&.fixit &.fixit
:position fixed :position fixed
@ -201,9 +204,6 @@ header
:top -2px :top -2px
:right -5px :right -5px
:background
:color rgba(24,20,20,0.5)
:border :border
:left 1px solid #333 :left 1px solid #333
:right 1px solid #333 :right 1px solid #333
@ -214,10 +214,6 @@ header
:top -4px :top -4px
:right 0 :right 0
&:hover
:background
:color #222
li li
a a
:padding 4px :padding 4px
@ -300,11 +296,13 @@ ul.as-selections
.diaspora_header_logo .diaspora_header_logo
:position relative :position relative
:top 4px :top -6px
:padding 0 10px
:margin :margin
:right 26px :left 60px
&:active :right 69px
:top 5px
.stream .stream
audio audio
@ -1159,33 +1157,43 @@ header #global_search
:display inline :display inline
:position relative :position relative
:top -20px
form form
:display inline :display inline
input input
@include box-shadow(0,1px,0px,#444) @include box-shadow(0,1px,1px,#444)
@include border-radius(3px)
@include transition(background-color)
:display inline :display inline
:background-color #ccc :background-color #555
:background-color rgba(60,60,60,0.6)
:border :border
:top 1px solid #111 :top 1px solid #111
:font :font
:size 13px :size 14px
:border 1px solid #000 :border 1px solid #222
&:hover &:hover
:background-color #eee :background-color #888
:background-color rgba(90,90,90,0.6)
&.active &.active
:background-color #fafafa :background-color #fafafa
:background-color rgba(160,160,160,0.6)
&:focus
@include box-shadow(0,0,5px,#fff)
:outline none
input[type='search'] input[type='search']
:width 250px :width 220px
:padding 3px :padding 5px
.aspect .aspect
h3 h3
@ -1642,7 +1650,7 @@ h3 span.current_gs_step
:display inline-block :display inline-block
:min-width 170px :min-width 170px
:top 3px :top 3px
:left 440px :left 410px
:margin :margin
:left 20px :left 20px
@ -3092,7 +3100,7 @@ a.toggle_selector
:border solid #888 1px :border solid #888 1px
:position absolute :position absolute
:top 32px :top 32px
:left 492px :left 462px
:width 380px :width 380px
:display none :display none