Skip to content

Q
question2answer
Commit 0b23f415 by Félicie
Options

navbar added

parent 1cac3886
Showing with 31 additions and 22 deletions
qa-include/app/options.php
......@@ -433,9 +433,9 @@ function qa_default_option($name)
$value = qa_lang_html('main/anonymous');
break;
case 'custom_sidebar':
$value = qa_lang_html_sub('options/default_sidebar', qa_html(qa_opt('site_title')));
break;
// case 'custom_sidebar':
// $value = qa_lang_html_sub('options/default_sidebar', qa_html(qa_opt('site_title')));
// break;
case 'editor_for_qs':
case 'editor_for_as':
......
qa-include/qa-theme-base.php
......@@ -708,7 +708,7 @@ class qa_html_theme_base
public function sidepanel()
{
$this->output('<div class="qa-sidepanel">');
// $this->output('<div class="qa-sidepanel">');
$this->widgets('side', 'top');
$this->sidebar();
$this->widgets('side', 'high');
......@@ -735,8 +735,8 @@ class qa_html_theme_base
$feed = @$this->content['feed'];
if (!empty($feed)) {
$this->output('<div class="qa-feed">');
$this->output('<a href="' . $feed['url'] . '" class="qa-feed-link">' . @$feed['label'] . '</a>');
// $this->output('<div class="qa-feed">');
// $this->output('<a href="' . $feed['url'] . '" class="qa-feed-link">' . @$feed['label'] . '</a>');
$this->output('</div>');
}
}
......
qa-lang/fr/qa-lang-main.php
......@@ -95,7 +95,7 @@
'image_too_big_x_pc' => 'Cette image est trop grande. Mettez-la à l\'échelle ^% puis réessayez.',
'in_category_x' => 'dans ^',
'ip_address_x' => 'adresse IP ^',
'logged_in_x' => 'Mon profil ^',
'logged_in_x' => 'Bonjour, ^',
'max_length_x' => 'La longueur maximale est de ^ caractères',
'me' => 'moi',
'meta_order' => '^what^who^when^where', // you can reorder but DO NOT translate! e.g. <answered> <15 hours ago> <in Problems> <by me (500 points)>
......
qa-theme/Classic/qa-styles.css
......@@ -12,7 +12,7 @@
/* General page layout */
body {background:#cfd1c4; margin:0; padding:0; text-align:center;}
body {margin:0; padding:0;}
body,td,input,textarea {font-size:12px; font-family:"Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif;}
a:link,a:active,a:visited {text-decoration:none;}
a:hover {text-decoration:underline;}
......@@ -20,7 +20,7 @@ p {margin-top:0;}
.qa-notice {background:#fdd; border-bottom:2px solid #00A473; color:#b00; font-size:18px; padding:.5em 32px; font-weight:bold; position:relative;}
.qa-notice-close-button {font-family:"Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; color:#c00; font-size:20px; background:none; cursor:pointer; position:absolute; height:24px; border:none; top:4px; right:6px}
.qa-body-wrapper {background:#fff; border:1px solid #00A473; width:980px; margin: -1px auto 0; text-align:left;}
/* Ajax loading spinner */
......@@ -67,7 +67,7 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
/* Page sections */
.qa-header {padding:10px 20px 0 20px; border-bottom:2px solid #00A473;}
.qa-sidepanel {float:right; width:176px; margin-right:18px; word-wrap:break-word;}
* html .qa-sidepanel {margin-right:10px;} /* IE6 */
.qa-sidebar {padding:12px; font-size:14px; background:#f5e4c3; border:1px solid #f3c772; margin:24px 0;}
......@@ -95,10 +95,10 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
.qa-logo {float:left; margin-bottom:16px; font-size:40px; font-weight:bold; color:#00A473;}
.qa-logo-link, .qa-logo-link:hover {color:#00A473;}
.qa-nav-user {float:right; font-size:14px; color:#00A473; white-space:nowrap;}
.qa-nav-user {float:right; font-size:14px; color:#333; white-space:nowrap;}
.qa-nav-user-list {list-style:none; padding:0; margin:0; display:inline;}
.qa-nav-user-item {display:inline; margin-left:12px; font-weight:bold;}
.qa-nav-user-link {color:#00A473;}
.qa-nav-user-link {color:#333;}
.qa-logged-in {display:inline;}
.qa-search {float:right; clear:right; margin-top:12px; white-space:nowrap;}
......@@ -107,12 +107,21 @@ h2 {font-size:16px; padding-top:12px; clear:both;}
/* Main, sub and category navigation */
.qa-nav-main {clear:both;}
.qa-nav-main-list {font-size:16px; list-style:none; padding:0; margin:0;}
.qa-nav-main-item,.qa-nav-main-item-opp {border-top:1px solid #1f2e2b; border-left:1px solid #1f2e2b; border-right:1px solid #1f2e2b;}
.qa-nav-main-item {float:left; margin-right:4px;}
.qa-nav-main-item-opp {float:right; margin-left:4px;}
.qa-nav-main-link {color:#FFF; display:block; padding:6px 10px; background:#00A473;}
.qa-nav-main-link:hover, .qa-nav-main-selected {background:#396e63; text-decoration:none;}
.qa-nav-main-list {
font-size:17px;
font-weight: bold;
text-align: center;
text-decoration:none;
float: left;
display: block;
list-style:none;
margin:0;
padding: 0;
}
.qa-nav-main-item {float:left;}
.qa-nav-main-link {color:#333; display:block; padding:1rem 0.5rem; background:#fff;}
.qa-nav-main-link:hover {background:#E6e9ed; text-decoration:none;}
.qa-nav-main-selected {color:#fff; background:#00a473; text-decoration:none; pointer-events: none;}
.qa-nav-main-hot .qa-nav-main-link {background:#f33;}
.qa-nav-main-hot .qa-nav-main-link:hover, .qa-nav-main-hot .qa-nav-main-selected {background:#f66;}
......
qa-theme/SnowFlat/qa-theme.php
......@@ -305,17 +305,17 @@ class qa_html_theme extends qa_html_theme_base
return;
$this->output('<div id="qam-sidepanel-toggle"><i class="icon-left-open-big"></i></div>');
$this->output('<div class="qa-sidepanel" id="qam-sidepanel-mobile">');
// $this->output('<div class="qa-sidepanel" id="qam-sidepanel-mobile">');
$this->qam_search();
$this->widgets('side', 'top');
$this->sidebar();
$this->widgets('side', 'high');
$this->widgets('side', 'low');
if (isset($this->content['sidepanel']))
$this->output_raw($this->content['sidepanel']);
// if (isset($this->content['sidepanel']))
// $this->output_raw($this->content['sidepanel']);
$this->feed();
$this->widgets('side', 'bottom');
$this->output('</div> <!-- qa-sidepanel -->', '');
// $this->output('</div> <!-- qa-sidepanel -->', '');
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment