github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 00:07:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

some restyling in the header area

Browse Source
This commit is contained in:
spez
2008-11-09 13:22:45 -08:00
parent 4585d61d6a
commit 5b1fcbed78
4 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
r2/r2/lib/pages/pages.py
View File

@@ -110,6 +110,9 @@ class Reddit(Wrapped):
ps = PaneStack(css_class='spacer')
if self.searchbox:
ps.append(SearchForm())
if not c.user_is_loggedin and self.loginbox:
ps.append(LoginFormWide())
@@ -175,9 +178,9 @@ class Reddit(Wrapped):
buttons += [JsButton(g.lang_name.get(lang, lang),
onclick = "return showlang();",
css_class = "pref-lang")]
buttons += [NamedButton("stats", False, nocname=True)]
buttons += [NamedButton("help", False, nocname=True),
NamedButton("blog", False, nocname=True)]
#buttons += [NamedButton("stats", False, nocname=True)]
#buttons += [NamedButton("help", False, nocname=True),
#NamedButton("blog", False, nocname=True)]
if c.user_is_loggedin:
buttons += [NamedButton("logout", False,
@@ -188,7 +191,10 @@ class Reddit(Wrapped):
def footer_nav(self):
"""navigation buttons in the footer."""
buttons = [NamedButton("feedback", False),
buttons = [NamedButton("help", False, nocname=True),
NamedButton("blog", False, nocname=True),
NamedButton("stats", False, nocname=True),
NamedButton("feedback", False),
NamedButton("bookmarklets", False),
NamedButton("socialite", False),
NamedButton("buttons", True),

49
r2/r2/public/static/reddit.css
View File

@@ -108,8 +108,12 @@ input[type=checkbox], input[type=radio] { margin-top: .4em; }
#header-bottom-right {
position: absolute;
right: 5px;
bottom: 5px;
right: 0px;
bottom: 0px;
background-color: #EFF7FF;
padding: 4px;
-moz-border-radius-topleft: 7px;
-webkit-border-top-left-radius: 7px;
}
#mail img {position: relative; top: 2px}
@@ -225,26 +229,19 @@ input[type=checkbox], input[type=radio] { margin-top: .4em; }
z-index: 100;
}
#search {
margin-top: 0px;
}
#search input {
vertical-align: middle;
height: 19px;
}
#search input[type=text] {
border: 1px solid gray;
height: 17px;
width: 274px;
height: 22px;
font-size: 18px;
width: 295px;
color: gray;
padding-left: 5px;
padding: 2px;
}
.content {
z-index: 1;
margin: 5px 0px 0px 5px;
margin: 7px 0px 0px 5px;
}
.content .spacer { margin-bottom: 5px }
@@ -256,12 +253,12 @@ input[type=checkbox], input[type=radio] { margin-top: .4em; }
.side {
float: right;
background-color: white;
margin: 5px 5px 0 5px;
margin: 0px 5px 0 5px;
width: 300px;
}
.side .spacer {
margin-bottom: 10px;
margin: 7px 0;
}
.subredditbox {
@@ -336,7 +333,7 @@ input[type=checkbox], input[type=radio] { margin-top: .4em; }
border: 1px solid gray;
padding-left: 44px;
}
.sidebox .spacer { margin-bottom: 5px }
.sidebox .spacer { margin: 0 0 5px 0 }
.sidebox.create {
background: url(/static/create-a-reddit.png) no-repeat scroll center left;
@@ -1636,22 +1633,26 @@ ul#image-preview-list .description pre {
#sr-header-area {
padding: 3px 0px;
background-color: #369;
background-color: #e0e0e0;
white-space: nowrap;
overflow: hidden;
text-transform: uppercase;
border-bottom: 1px solid gray;
font-size: 90%;
}
.dropdown.srdrop .selected {
background: transparent url(/static/droparrowwhite.gif) no-repeat scroll center right;
background: transparent url(/static/droparrowgray.gif) no-repeat scroll center right;
display: inline-block;
vertical-align: bottom;
padding-right: 21px;
padding-left: 5px; /* have to use padding instead of margin cause of ie */
color: white;
color: black;
font-weight: normal;
}
.srdrop .choice {margin-top: 3px;}
.srdrop .choice.top-option {
font-style: italic;
border-bottom: 1px dotted #369;
@@ -1663,12 +1664,12 @@ ul#image-preview-list .description pre {
}
#sr-bar { margin-left: 10px; }
#sr-bar .separator {color: white}
#sr-bar a {color: white;}
#sr-bar .separator {color: gray; }
#sr-bar a {color: black;}
#sr-more-link {
color: white;
background-color: #369;
color: black;
background-color: #e0e0e0;
position: absolute;
right: 0px;
top: 3px;

47
r2/r2/templates/redditheader.html
View File

@@ -33,7 +33,30 @@
${thing.srtopbar.render()}
%endif
<div id="header-top" class="hover">
##<div id="header-top" class="hover">
##</div>
<div id="header-bottom-${'right' if c.lang_rtl else 'left'}">
<%
if g.css_killswitch or not c.site.header:
header_img = DefaultSR.header
else:
header_img = c.site.header
%>
${img_link(c.site.name, header_img, '/', _id = "header-img-a", img_id = 'header-img')}
##keeps the height of the header from varying when there isnt any content
&nbsp;
%for toolbar in thing.toolbars:
${toolbar.render()}
%endfor
</div>
<div id="header-bottom-${'left' if c.lang_rtl else 'right'}">
## %if thing.searchbox:
## ${SearchForm().render()}
## %endif
%if not c.user_is_loggedin:
<span class="user">
${text_with_js(_("want to join? %(register)s in seconds"),
@@ -62,28 +85,6 @@
${separator("|")}
${thing.corner_buttons().render()}
</div>
<div id="header-bottom-${'right' if c.lang_rtl else 'left'}">
<%
if g.css_killswitch or not c.site.header:
header_img = DefaultSR.header
else:
header_img = c.site.header
%>
${img_link(c.site.name, header_img, '/', _id = "header-img-a", img_id = 'header-img')}
##keeps the height of the header from varying when there isnt any content
&nbsp;
%for toolbar in thing.toolbars:
${toolbar.render()}
%endfor
</div>
<div id="header-bottom-${'left' if c.lang_rtl else 'right'}">
%if thing.searchbox:
${SearchForm().render()}
%endif
</div>
</div>

3
r2/r2/templates/searchform.html
View File

@@ -29,8 +29,7 @@
%if thing.prev_search:
value="${thing.prev_search}" style="color:black"
%else:
value="${_('search')}" style="color:gray"
value="${_('search reddit')}" style="color:gray"
%endif
name="q" onfocus="clearTitle(this)"/>
<input type="image" src="${static('/static/find.png')}" />
</form>