Ajustando Topo

This commit is contained in:
eduardogusmao
2019-09-03 14:14:54 -03:00
parent ee8345d785
commit 503ed90b8a
7 changed files with 65 additions and 50 deletions

View File

@@ -56,7 +56,7 @@ $scallus = get_string('callus', 'theme_qualisaude');
$semail = get_string('email', 'theme_qualisaude'); $semail = get_string('email', 'theme_qualisaude');
// Footer Content. // Footer Content.
$logourl = get_logo_url(); $footlogourl = get_footer_logo_url();
$footlogo = theme_qualisaude_get_setting('footlogo'); $footlogo = theme_qualisaude_get_setting('footlogo');
$footlogo = (!$footlogo) ? 0 : 1; $footlogo = (!$footlogo) ? 0 : 1;
$footnote = theme_qualisaude_get_setting('footnote', 'format_html'); $footnote = theme_qualisaude_get_setting('footnote', 'format_html');
@@ -144,7 +144,8 @@ $templatecontext = [
"footerblock" => $footerblock, "footerblock" => $footerblock,
"footerblock1" => $footerblock1, "footerblock1" => $footerblock1,
"colclass" => $colclass, "colclass" => $colclass,
"block1" => $block1 "block1" => $block1,
"footlogourl" => $footlogourl
]; ];
$templatecontext['flatnavigation'] = $PAGE->flatnav; $templatecontext['flatnavigation'] = $PAGE->flatnav;

View File

@@ -332,7 +332,7 @@ if (!function_exists('get_logo_url')) {
$theme = theme_config::load('qualisaude'); $theme = theme_config::load('qualisaude');
} }
$logo = $theme->setting_file_url('logo', 'logo'); $logo = $theme->setting_file_url('logo', 'logo');
$logo = empty($logo) ? $OUTPUT->image_url('home/logo', 'theme') : $logo; $logo = empty($logo) ? $OUTPUT->image_url('logos/logo-topo', 'theme') : $logo;
return $logo; return $logo;
} }
@@ -345,7 +345,7 @@ function get_footer_logo_url() {
$theme = theme_config::load('qualisaude'); $theme = theme_config::load('qualisaude');
} }
$logo = $theme->setting_file_url('logo', 'logo'); $logo = $theme->setting_file_url('logo', 'logo');
$logo = empty($logo) ? $OUTPUT->image_url('logos/logo-footer2x', 'theme') : $logo; $logo = empty($logo) ? $OUTPUT->image_url('logos/logo-footer', 'theme') : $logo;
return $logo; return $logo;
} }

View File

@@ -192,4 +192,20 @@ section#inicial{
height: 50px; height: 50px;
} }
} }
}
/* ################################### HEADER ################################# */
#header{
.navbar-nav{
.logo{
img{
max-height: 50px !important;
}
}
.usermenu{
a.dropdown-toggle {
color: #919191;
}
}
}
} }

View File

@@ -292,13 +292,13 @@ i.icon {
#header { #header {
border-bottom: 1px solid $color_ebb_approx; border-bottom: 1px solid $color_ebb_approx;
background: #fff!important; background: #fff!important;
max-height: 85px; max-height: 120px;
height: 85px; height: 120px;
box-shadow: none; box-shadow: none;
.popover-region { .popover-region {
margin-top: 5px; //margin-top: 5px;
i.icon:before { i.icon:before {
color: #919191; color: #09486b;
} }
} }
.right-menu .usermenu { .right-menu .usermenu {
@@ -360,20 +360,21 @@ i.icon {
} }
} }
> div.navbar-nav{ > div.navbar-nav{
width: 90%; width: 1280px;
margin: auto; margin: auto;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
ul.menu-topo-logado{ ul.menu-topo-logado{
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 14px 0 0 0; margin: 12px 0 0 0;
li{ li{
float: left; float: left;
margin: 0 32px 0 0; margin: 0 32px 0 0;
a{ a{
font-size: 18px; font-size: 14px;
color: #919191; color: #09486b;
text-transform: uppercase;
} }
} }
} }
@@ -479,10 +480,10 @@ i.icon {
.moodle-actionmenu{ .moodle-actionmenu{
.userbutton{ .userbutton{
.usertext{ .usertext{
border: 1px solid #9aafd9; //border: 1px solid #9aafd9;
padding: 5px 10px; padding: 5px 5px;
border-radius: 15px; //border-radius: 15px;
color: #9aafd9; //color: #9aafd9;
font-size: .7675rem; font-size: .7675rem;
} }
} }
@@ -1006,7 +1007,7 @@ i.icon {
background: #ffffff url([[pix:theme|bg/bg_footer]]) no-repeat; background: #ffffff url([[pix:theme|bg/bg_footer]]) no-repeat;
background-size: cover; background-size: cover;
.footer-main { .footer-main {
padding: 160px 0 50px; padding: 120px 0 50px;
h2 { h2 {
font-weight: 100; font-weight: 100;
line-height: 36px; line-height: 36px;
@@ -1335,7 +1336,7 @@ i.icon {
} }
.header-main { .header-main {
margin-top: 84px; margin-top: 120px;
background: $white; background: $white;
border-bottom: 1px solid $color_ebb_approx; border-bottom: 1px solid $color_ebb_approx;
.navbar-toggler { .navbar-toggler {
@@ -1372,7 +1373,7 @@ i.icon {
.logo img { .logo img {
width: 100%; width: 100%;
height: auto; height: auto;
max-height: none; max-height: 50px !important;
} }
} }
.infoarea { .infoarea {

View File

@@ -46,9 +46,6 @@ a:focus {
#page-site-index #header { #page-site-index #header {
margin-bottom: 0; margin-bottom: 0;
} }
#header .usermenu a.dropdown-toggle {
color: #fff;
}
#header .usermenu .dropdown .dropdown-menu { #header .usermenu .dropdown .dropdown-menu {
top: auto; top: auto;
} }

View File

@@ -21,38 +21,38 @@
{{>theme_qualisaude/navbar}} {{>theme_qualisaude/navbar}}
<div class="header-main"> <div class="header-main">
<!--<div class="container">--> <!-- <div class="container">-->
<!--<nav class="navbar navbar-light bg-faded">--> <!-- <nav class="navbar navbar-light bg-faded">-->
<!--<a href="{{{ config.wwwroot }}}/?redirect=0" class="navbar-brand {{# logourl }}has-logo{{/ logourl }}--> <!-- <a href="{{{ config.wwwroot }}}/?redirect=0" class="navbar-brand {{# logourl }}has-logo{{/ logourl }}-->
<!--{{^ logourl }}--> <!-- {{^ logourl }}-->
<!--hidden-sm-down--> <!-- hidden-sm-down-->
<!--{{/ logourl }}--> <!-- {{/ logourl }}-->
<!--">--> <!-- ">-->
<!--{{# logourl }}--> <!-- {{# logourl }}-->
<!--<span class="logo">--> <!-- <span class="logo">-->
<!--<img src="{{logourl}}" alt="{{sitename}}">--> <!-- <img src="{{logourl}}" alt="{{sitename}}">-->
<!--</span>--> <!-- </span>-->
<!--{{/ logourl }}--> <!-- {{/ logourl }}-->
<!--{{^ logourl }}--> <!-- {{^ logourl }}-->
<!--<span class="site-name hidden-sm-down">{{{ sitename }}}</span>--> <!-- <span class="site-name hidden-sm-down">{{{ sitename }}}</span>-->
<!--{{/ logourl }}--> <!-- {{/ logourl }}-->
<!--</a>--> <!-- </a>-->
<!--<button class="navbar-toggler hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"></button>--> <!-- <button class="navbar-toggler hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation"></button>-->
<!--<div class="collapse navbar-toggleable-md" id="navbarResponsive">--> <!-- <div class="collapse navbar-toggleable-md" id="navbarResponsive">-->
<!--<div class="infoarea ">--> <!-- <div class="infoarea ">-->
<!--&lt;!&ndash; custom_menu &ndash;&gt;--> <!-- &lt;!&ndash; custom_menu &ndash;&gt;-->
<!--{{{ output.custom_menu }}}--> <!-- {{{ output.custom_menu }}}-->
<!--&lt;!&ndash; page_heading_menu &ndash;&gt;--> <!-- &lt;!&ndash; page_heading_menu &ndash;&gt;-->
<!--{{{ output.page_heading_menu }}}--> <!-- {{{ output.page_heading_menu }}}-->
<!--</div>--> <!-- </div>-->
<!--</div>--> <!-- </div>-->
<!--</nav>--> <!-- </nav>-->
<!--</div>--> <!-- </div>-->
{{{ output.standard_after_main_region_html }}} {{{ output.standard_after_main_region_html }}}
</div> </div>

View File

@@ -33,7 +33,7 @@
<a href="{{{ config.wwwroot }}}/?redirect=0" class="logo-topo"> <a href="{{{ config.wwwroot }}}/?redirect=0" class="logo-topo">
{{# logourl }} {{# logourl }}
<span class="logo"> <span class="logo">
<img src="{{logourl}}" alt="{{sitename}}"> <img src="{{logourl}}" alt="{{sitename}}" class="img-responsive">
</span> </span>
{{/ logourl }} {{/ logourl }}
{{^ logourl }} {{^ logourl }}