mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 13:33:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2014-02-24 15:20:49 +08:00
commit 28a03399b3
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/adminlib.php
View File

@ -8506,7 +8506,7 @@ class admin_setting_devicedetectregex extends admin_setting {
public function output_html($data, $query='') {
global $OUTPUT;
$out = html_writer::start_tag('table', array('border' => 1, 'class' => 'generaltable'));
$out = html_writer::start_tag('table', array('class' => 'generaltable'));
$out .= html_writer::start_tag('thead');
$out .= html_writer::start_tag('tr');
$out .= html_writer::tag('th', get_string('devicedetectregexexpression', 'admin'));

5
theme/bootstrapbase/less/moodle/admin.less
View File

@ -472,11 +472,6 @@ img.iconsmall {
margin-left: 0.5em;
}
#admin-devicedetectregex table {
border: none;
// Override a table border=1 in the HTML.
}
#admin-emoticons td input {
width: 8em;
}

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

File diff suppressed because one or more lines are too long