MDL-55805 theme_noname: Adjust margins, paddings and grid
Part of MDL-55071
This commit is contained in:
Frederic Massart
committed by
Dan Poltawski
Dan Poltawski
parent
7fcfc07344
commit
1ecc3daf09
@@ -0,0 +1,52 @@
|
||||
<?php
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
//
|
||||
// Moodle is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Moodle is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/**
|
||||
* Admin renderer.
|
||||
*
|
||||
* @package theme_noanme
|
||||
* @copyright 2016 Frédéric Massart - FMCorz.net
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
|
||||
namespace theme_noname\output\core;
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
use moodle_url;
|
||||
|
||||
require_once($CFG->dirroot . '/admin/renderer.php');
|
||||
|
||||
/**
|
||||
* Admin renderer class.
|
||||
*
|
||||
* @package theme_noanme
|
||||
* @copyright 2016 Frédéric Massart - FMCorz.net
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
|
||||
*/
|
||||
class admin_renderer extends \core_admin_renderer {
|
||||
|
||||
/**
|
||||
* Output a warning message.
|
||||
*
|
||||
* @param string $message the message to display.
|
||||
* @param string $type type class
|
||||
* @return string HTML to output.
|
||||
*/
|
||||
protected function warning($message, $type = 'warning') {
|
||||
return $this->box($message, 'generalbox m-b-1 admin' . $type);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -61,6 +61,25 @@ class core_renderer extends \core_renderer {
|
||||
return parent::box_start($classes . ' p-a-1', $id, $attributes);
|
||||
}
|
||||
|
||||
/**
|
||||
* Wrapper for header elements.
|
||||
*
|
||||
* @return string HTML to display the main header.
|
||||
*/
|
||||
public function full_header() {
|
||||
$html = html_writer::start_tag('header', array('id' => 'page-header', 'class' => 'row'));
|
||||
$html .= html_writer::start_div('col-xs-12 p-t-1 p-b-1');
|
||||
$html .= $this->context_header();
|
||||
$html .= html_writer::start_div('clearfix', array('id' => 'page-navbar'));
|
||||
$html .= html_writer::tag('div', $this->navbar(), array('class' => 'breadcrumb-nav'));
|
||||
$html .= html_writer::div($this->page_heading_button(), 'breadcrumb-button');
|
||||
$html .= html_writer::end_div();
|
||||
$html .= html_writer::tag('div', $this->course_header(), array('id' => 'course-header'));
|
||||
$html .= html_writer::end_div();
|
||||
$html .= html_writer::end_tag('header');
|
||||
return $html;
|
||||
}
|
||||
|
||||
/**
|
||||
* The standard tags that should be included in the <head> tag
|
||||
* including a meta description for the front page
|
||||
|
||||
@@ -1,18 +1,7 @@
|
||||
.singlebutton {
|
||||
div {
|
||||
display: inline-block;
|
||||
margin-right: 5px;
|
||||
margin-bottom: 5px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
// Two singlebuttons side by side for ok/cancel.
|
||||
#notice {
|
||||
.buttons {
|
||||
.singlebutton {
|
||||
display: inline-block;
|
||||
}
|
||||
display: inline-block;
|
||||
+ .singlebutton {
|
||||
margin-left: $spacer / 2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1608,7 +1608,6 @@ img#persona_signin {
|
||||
}
|
||||
.breadcrumb-nav {
|
||||
float: left;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.breadcrumb-button .singlebutton div {
|
||||
margin-right: 0;
|
||||
|
||||
@@ -44,12 +44,14 @@
|
||||
{{{ output.full_header }}}
|
||||
|
||||
<div id="page-content" class="row">
|
||||
<div id="region-main-box">
|
||||
<section id="region-main">
|
||||
{{{ output.course_content_header }}}
|
||||
{{{ output.main_content }}}
|
||||
{{{ output.course_content_footer }}}
|
||||
</section>
|
||||
<div id="region-main-box" class="col-xs-12">
|
||||
<div class="row">
|
||||
<section id="region-main" class="col-xs-12">
|
||||
{{{ output.course_content_header }}}
|
||||
{{{ output.main_content }}}
|
||||
{{{ output.course_content_footer }}}
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -45,11 +45,13 @@
|
||||
|
||||
<div id="page-content" class="row">
|
||||
<div id="region-main-box" class="col-md-9 push-md-3">
|
||||
<section id="region-main">
|
||||
{{{ output.course_content_header }}}
|
||||
{{{ output.main_content }}}
|
||||
{{{ output.course_content_footer }}}
|
||||
</section>
|
||||
<div class="row">
|
||||
<section id="region-main" class="col-xs-12">
|
||||
{{{ output.course_content_header }}}
|
||||
{{{ output.main_content }}}
|
||||
{{{ output.course_content_footer }}}
|
||||
</section>
|
||||
</div>
|
||||
</div>
|
||||
{{{ sidepreblocks }}}
|
||||
</div>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<div class="card-block">
|
||||
{{! Block header }}
|
||||
{{#title}}
|
||||
<h3 class="card-title"><small>{{{title}}}</small></h3>
|
||||
<h3 class="card-title">{{{title}}}</h3>
|
||||
{{/title}}
|
||||
<div class="card-text">
|
||||
{{{content}}}
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
</div>
|
||||
|
||||
{{#hasinstructions}}
|
||||
<div class="col-md-6 p-b-1 login-instructions">
|
||||
<div class="col-sm-6 p-b-1 login-instructions">
|
||||
<h2 class="m-t-1">{{#str}}firsttime{{/str}}</h2>
|
||||
<div>
|
||||
{{{instructions}}}
|
||||
|
||||
Reference in New Issue
Block a user