diff --git a/layout/my.php b/layout/my.php
index fc5866b..8ad4d0a 100644
--- a/layout/my.php
+++ b/layout/my.php
@@ -56,7 +56,7 @@ $scallus = get_string('callus', 'theme_qualisaude');
$semail = get_string('email', 'theme_qualisaude');
// Footer Content.
-$logourl = get_logo_url();
+$footlogourl = get_footer_logo_url();
$footlogo = theme_qualisaude_get_setting('footlogo');
$footlogo = (!$footlogo) ? 0 : 1;
$footnote = theme_qualisaude_get_setting('footnote', 'format_html');
@@ -144,7 +144,8 @@ $templatecontext = [
"footerblock" => $footerblock,
"footerblock1" => $footerblock1,
"colclass" => $colclass,
- "block1" => $block1
+ "block1" => $block1,
+ "footlogourl" => $footlogourl
];
$templatecontext['flatnavigation'] = $PAGE->flatnav;
diff --git a/lib.php b/lib.php
index d603e09..1c79566 100644
--- a/lib.php
+++ b/lib.php
@@ -332,7 +332,7 @@ if (!function_exists('get_logo_url')) {
$theme = theme_config::load('qualisaude');
}
$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;
}
@@ -345,7 +345,7 @@ function get_footer_logo_url() {
$theme = theme_config::load('qualisaude');
}
$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;
}
diff --git a/scss/preset/custom.scss b/scss/preset/custom.scss
index 11f5c0e..884fae3 100644
--- a/scss/preset/custom.scss
+++ b/scss/preset/custom.scss
@@ -192,4 +192,20 @@ section#inicial{
height: 50px;
}
}
+}
+
+/* ################################### HEADER ################################# */
+#header{
+ .navbar-nav{
+ .logo{
+ img{
+ max-height: 50px !important;
+ }
+ }
+ .usermenu{
+ a.dropdown-toggle {
+ color: #919191;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/scss/preset/theme.scss b/scss/preset/theme.scss
index ed5aa4d..1ce027b 100644
--- a/scss/preset/theme.scss
+++ b/scss/preset/theme.scss
@@ -292,13 +292,13 @@ i.icon {
#header {
border-bottom: 1px solid $color_ebb_approx;
background: #fff!important;
- max-height: 85px;
- height: 85px;
+ max-height: 120px;
+ height: 120px;
box-shadow: none;
.popover-region {
- margin-top: 5px;
+ //margin-top: 5px;
i.icon:before {
- color: #919191;
+ color: #09486b;
}
}
.right-menu .usermenu {
@@ -360,20 +360,21 @@ i.icon {
}
}
> div.navbar-nav{
- width: 90%;
+ width: 1280px;
margin: auto;
margin-top: 0;
margin-bottom: 0;
ul.menu-topo-logado{
list-style: none;
padding: 0;
- margin: 14px 0 0 0;
+ margin: 12px 0 0 0;
li{
float: left;
margin: 0 32px 0 0;
a{
- font-size: 18px;
- color: #919191;
+ font-size: 14px;
+ color: #09486b;
+ text-transform: uppercase;
}
}
}
@@ -479,10 +480,10 @@ i.icon {
.moodle-actionmenu{
.userbutton{
.usertext{
- border: 1px solid #9aafd9;
- padding: 5px 10px;
- border-radius: 15px;
- color: #9aafd9;
+ //border: 1px solid #9aafd9;
+ padding: 5px 5px;
+ //border-radius: 15px;
+ //color: #9aafd9;
font-size: .7675rem;
}
}
@@ -1006,7 +1007,7 @@ i.icon {
background: #ffffff url([[pix:theme|bg/bg_footer]]) no-repeat;
background-size: cover;
.footer-main {
- padding: 160px 0 50px;
+ padding: 120px 0 50px;
h2 {
font-weight: 100;
line-height: 36px;
@@ -1335,7 +1336,7 @@ i.icon {
}
.header-main {
- margin-top: 84px;
+ margin-top: 120px;
background: $white;
border-bottom: 1px solid $color_ebb_approx;
.navbar-toggler {
@@ -1372,7 +1373,7 @@ i.icon {
.logo img {
width: 100%;
height: auto;
- max-height: none;
+ max-height: 50px !important;
}
}
.infoarea {
diff --git a/style/theme.css b/style/theme.css
index aaed840..c7dabda 100644
--- a/style/theme.css
+++ b/style/theme.css
@@ -46,9 +46,6 @@ a:focus {
#page-site-index #header {
margin-bottom: 0;
}
-#header .usermenu a.dropdown-toggle {
- color: #fff;
-}
#header .usermenu .dropdown .dropdown-menu {
top: auto;
}
diff --git a/templates/header.mustache b/templates/header.mustache
index c6cd76f..6d46f48 100644
--- a/templates/header.mustache
+++ b/templates/header.mustache
@@ -21,38 +21,38 @@
{{>theme_qualisaude/navbar}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
{{{ output.standard_after_main_region_html }}}
diff --git a/templates/navbar.mustache b/templates/navbar.mustache
index 7dab048..3fb2479 100644
--- a/templates/navbar.mustache
+++ b/templates/navbar.mustache
@@ -33,7 +33,7 @@
{{# logourl }}
- 
+
{{/ logourl }}
{{^ logourl }}