mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-12 09:56:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39812_bootstrapbase' of git://github.com/rwijaya/moodle

Browse Source
This commit is contained in:
Marina Glancy
2013-07-16 14:29:24 +10:00
parent 792e6059be ab5bd37926
commit e2abbde44e
9 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
theme/bootstrapbase/layout/columns1.php
View File

@ -50,9 +50,9 @@ echo $OUTPUT->doctype() ?>
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
<header id="page-header" class="clearfix"> <header id="page-header" class="clearfix">
<div id="page-navbar"> <div id="page-navbar" class="clearfix">
<div class="breadcrumb-nav"><?php echo $OUTPUT->navbar(); ?></div>
<nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav> <nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav>
<?php echo $OUTPUT->navbar(); ?>
</div> </div>
<?php echo $OUTPUT->page_heading(); ?> <?php echo $OUTPUT->page_heading(); ?>
<div id="course-header"> <div id="course-header">

4
theme/bootstrapbase/layout/columns2.php
View File

@ -51,9 +51,9 @@ echo $OUTPUT->doctype() ?>
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
<header id="page-header" class="clearfix"> <header id="page-header" class="clearfix">
<div id="page-navbar"> <div id="page-navbar" class="clearfix">
<div class="breadcrumb-nav"><?php echo $OUTPUT->navbar(); ?></div>
<nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav> <nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav>
<?php echo $OUTPUT->navbar(); ?>
</div> </div>
<?php echo $OUTPUT->page_heading(); ?> <?php echo $OUTPUT->page_heading(); ?>
<div id="course-header"> <div id="course-header">

4
theme/bootstrapbase/layout/columns3.php
View File

@ -56,9 +56,9 @@ echo $OUTPUT->doctype() ?>
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
<header id="page-header" class="clearfix"> <header id="page-header" class="clearfix">
<div id="page-navbar"> <div id="page-navbar" class="clearfix">
<div class="breadcrumb-nav"><?php echo $OUTPUT->navbar(); ?></div>
<nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav> <nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav>
<?php echo $OUTPUT->navbar(); ?>
</div> </div>
<?php echo $OUTPUT->page_heading(); ?> <?php echo $OUTPUT->page_heading(); ?>
<div id="course-header"> <div id="course-header">

10
theme/bootstrapbase/less/moodle/core.less
View File

@ -1897,3 +1897,13 @@ div.badge .expireimage {
padding: 0; padding: 0;
border-width: 0; border-width: 0;
} }
.breadcrumb-nav {
float: left;
margin-bottom: 10px;
}
.breadcrumb-button .singlebutton div {
margin-right: 0;
}
.breadcrumb-nav .breadcrumb {
margin: 0;
}

3
theme/bootstrapbase/less/moodle/responsive.less
View File

@ -231,6 +231,9 @@
.row-fluid .desktop-first-column { .row-fluid .desktop-first-column {
margin-left: 0; margin-left: 0;
} }
#page-navbar .breadcrumb-button {
display: inline;
}
} }
@media (max-width : 767px) { @media (max-width : 767px) {
.row-fluid .desktop-first-column { .row-fluid .desktop-first-column {

5
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long

4
theme/clean/layout/columns1.php
View File

@ -53,9 +53,9 @@ echo $OUTPUT->doctype() ?>
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
<header id="page-header" class="clearfix"> <header id="page-header" class="clearfix">
<div id="page-navbar"> <div id="page-navbar" class="clearfix">
<div class="breadcrumb-nav"><?php echo $OUTPUT->navbar(); ?></div>
<nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav> <nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav>
<?php echo $OUTPUT->navbar(); ?>
</div> </div>
<?php echo $html->heading; ?> <?php echo $html->heading; ?>
<div id="course-header"> <div id="course-header">

4
theme/clean/layout/columns2.php
View File

@ -54,9 +54,9 @@ echo $OUTPUT->doctype() ?>
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
<header id="page-header" class="clearfix"> <header id="page-header" class="clearfix">
<div id="page-navbar"> <div id="page-navbar" class="clearfix">
<div class="breadcrumb-nav"><?php echo $OUTPUT->navbar(); ?></div>
<nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav> <nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav>
<?php echo $OUTPUT->navbar(); ?>
</div> </div>
<?php echo $html->heading; ?> <?php echo $html->heading; ?>
<div id="course-header"> <div id="course-header">

4
theme/clean/layout/columns3.php
View File

@ -73,9 +73,9 @@ echo $OUTPUT->doctype() ?>
<div id="page" class="container-fluid"> <div id="page" class="container-fluid">
<header id="page-header" class="clearfix"> <header id="page-header" class="clearfix">
<div id="page-navbar"> <div id="page-navbar" class="clearfix">
<div class="breadcrumb-nav"><?php echo $OUTPUT->navbar(); ?></div>
<nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav> <nav class="breadcrumb-button"><?php echo $OUTPUT->page_heading_button(); ?></nav>
<?php echo $OUTPUT->navbar(); ?>
</div> </div>
<?php echo $html->heading; ?> <?php echo $html->heading; ?>
<div id="course-header"> <div id="course-header">