mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk 2013-06-12 08:48:00 +12:00
commit 754fa10916
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
theme/bootstrapbase/less/moodle/buttons.less
View File

@ -12,13 +12,16 @@
text-align: center; text-align: center;
} }
.btn-lineup {
margin: 0 0 10px 5px;
}
input[name="searchwikicontent"] + input[type="submit"], input[name="searchwikicontent"] + input[type="submit"],
select + input[type="submit"], select + input[type="submit"],
input[type="text"] + input[type="button"], input[type="text"] + input[type="button"],
input[type="password"] + input[type="submit"], input[type="password"] + input[type="submit"],
input[type="text"] + button, input[type="text"] + button,
input[type="text"] + input[type="submit"] { input[type="text"] + input[type="submit"] {
margin: 0 0 10px 5px; .btn-lineup
} }
p.arrow_button { p.arrow_button {
margin-top: 5em; margin-top: 5em;
@ -44,10 +47,18 @@ button,
input.form-submit, input.form-submit,
input[type="button"], input[type="button"],
input[type="submit"], input[type="submit"],
input[type="reset"], input[type="reset"]
{ {
.btn .btn
} }
button,
input.form-submit,
input[type="button"],
input[type="submit"],
input[type="reset"]
{
.btn-lineup
}
button.yui3-button.closebutton, button.yui3-button.closebutton,
button.yui3-button.closebutton:hover { button.yui3-button.closebutton:hover {
background-position: 0 0; background-position: 0 0;

6
theme/bootstrapbase/less/moodle/expendable.less
View File

@ -68,7 +68,11 @@ td.submit input {
// override .btn-primary // override .btn-primary
#notice .singlebutton + .singlebutton input, #notice .singlebutton + .singlebutton input,
.submit.buttons input[name="cancel"] { .submit.buttons input[name="cancel"] {
.btn; .btn
}
#notice .singlebutton + .singlebutton input,
.submit.buttons input[name="cancel"] {
.btn-lineup
} }
input[id$="_clearbutton"], input[id$="_clearbutton"],
input[type="reset"] { input[type="reset"] {

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

File diff suppressed because one or more lines are too long