moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-45893 user_menu: responsive approach; fixed minor issues

Browse source
This commit is contained in:
Jetha Chan 2014-10-03 17:02:02 +08:00
parent 6da0e4cfff
commit 854a647e62
11 changed files with 91 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
theme/bootstrapbase/layout/columns1.php
View file

@ -46,11 +46,11 @@ echo $OUTPUT->doctype() ?>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<?php echo $OUTPUT->user_menu(); ?>
<div class="nav-collapse collapse">
<?php echo $OUTPUT->custom_menu(); ?>
<ul class="nav pull-right">
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
<li class="navbar-text"><?php echo $OUTPUT->user_menu() ?></li>
</ul>
</div>
</div>

2
theme/bootstrapbase/layout/columns2.php
View file

@ -47,11 +47,11 @@ echo $OUTPUT->doctype() ?>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<?php echo $OUTPUT->user_menu(); ?>
<div class="nav-collapse collapse">
<?php echo $OUTPUT->custom_menu(); ?>
<ul class="nav pull-right">
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
<li class="navbar-text"><?php echo $OUTPUT->user_menu() ?></li>
</ul>
</div>
</div>

2
theme/bootstrapbase/layout/columns3.php
View file

@ -52,11 +52,11 @@ echo $OUTPUT->doctype() ?>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<?php echo $OUTPUT->user_menu(); ?>
<div class="nav-collapse collapse">
<?php echo $OUTPUT->custom_menu(); ?>
<ul class="nav pull-right">
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
<li class="navbar-text"><?php echo $OUTPUT->user_menu(); ?></li>
</ul>
</div>
</div>

66
theme/bootstrapbase/less/moodle/modules.less
View file

@ -343,12 +343,19 @@ div#dock {
// Usermenu
.usermenu {
font-size: 14px;
&.withoutlinks {
.withoutlinks {
display: none;
}
}
font-size: 14px;
.login {
color: @navbarText;
line-height: 40px;
a {
color: @navbarLinkColor;
}
}
> .moodle-actionmenu > .menubar {
display: block;
margin: -40px 0px 2px 0px;
@ -363,13 +370,15 @@ div#dock {
height: 40px;
}
.toggle-display {
color: #777;
color: @navbarLinkColor;
outline: none;
}
.userbutton {
height: 40px;
line-height: 40px;
.avatars{
display: inline-block;
height: 37px;
height: 36px;
vertical-align: middle;
margin-right: 6px;
@ -435,33 +444,57 @@ div#dock {
}
}
.jsenabled .navbar-inverse {
.usermenu:hover {
.userinfo .usertext {
color: @navbarInverseLinkColorHover;
.meta {
color: @navbarInverseText;
.value {
.usermenu {
.login {
color: @navbarInverseText;
a {
color: @navbarInverseLinkColor;
&:hover {
color: @navbarInverseLinkColorHover;
}
}
}
.moodle-actionmenu[data-enhanced] .toggle-display.textmenu {
.caret {
border-top-color: @navbarInverseLinkColorHover;
.toggle-display {
color: @navbarInverseLinkColor;
}
.userinfo .usertext {
color: @navbarInverseLinkColor;
.meta {
color: @navbarInverseText;
.value {
color: @navbarInverseLinkColor;
}
}
}
&:hover {
.userinfo .usertext {
color: @navbarInverseLinkColorHover;
.meta {
color: @navbarInverseText;
.value {
color: @navbarInverseLinkColorHover;
}
}
}
.moodle-actionmenu[data-enhanced] .toggle-display.textmenu {
.caret {
border-top-color: @navbarInverseLinkColorHover;
}
}
}
}
}
.dir-ltr {
.usermenu {
float: right;
.userinfo {
padding-left: 20px;
}
.userbutton {
margin-right: 4px;
padding-right: 16px;
padding-right: 8px;
.avatars{
margin-right: 6px;
margin-left: 6px;
}
}
> .moodle-actionmenu > .menubar li a {
@ -479,11 +512,12 @@ div#dock {
.dir-rtl {
.usermenu {
float: left;
.userbutton {
margin-left: 4px;
padding-left: 16px;
padding-left: 8px;
.avatars{
margin-left: 6px;
margin-right: 6px;
}
}
> .moodle-actionmenu > .menubar li a {

2
theme/bootstrapbase/style/moodle.css
View file

File diff suppressed because one or more lines are too long

2
theme/clean/layout/columns1.php
View file

@ -49,11 +49,11 @@ echo $OUTPUT->doctype() ?>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<?php echo $OUTPUT->user_menu(); ?>
<div class="nav-collapse collapse">
<?php echo $OUTPUT->custom_menu(); ?>
<ul class="nav pull-right">
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
<li class="navbar-text"><?php echo $OUTPUT->user_menu() ?></li>
</ul>
</div>
</div>

2
theme/clean/layout/columns2.php
View file

@ -50,11 +50,11 @@ echo $OUTPUT->doctype() ?>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<?php echo $OUTPUT->user_menu(); ?>
<div class="nav-collapse collapse">
<?php echo $OUTPUT->custom_menu(); ?>
<ul class="nav pull-right">
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
<li class="navbar-text"><?php echo $OUTPUT->user_menu() ?></li>
</ul>
</div>
</div>

2
theme/clean/layout/columns3.php
View file

@ -61,11 +61,11 @@ echo $OUTPUT->doctype() ?>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<?php echo $OUTPUT->user_menu(); ?>
<div class="nav-collapse collapse">
<?php echo $OUTPUT->custom_menu(); ?>
<ul class="nav pull-right">
<li><?php echo $OUTPUT->page_heading_menu(); ?></li>
<li class="navbar-text"><?php echo $OUTPUT->user_menu() ?></li>
</ul>
</div>
</div>