Commit graph

564 commits

Author SHA1 Message Date
Marina Glancy
d175d25adc Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-08 16:55:49 +08:00
Jason Fowler
0d5bfb9c65 MDL-44881 Filepicker: Fix alignment and padding on file-select dialog 2014-04-08 14:44:50 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
2014-04-08 13:30:41 +08:00
Dan Poltawski
3a047312b6 Merge branch '42317-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-08 09:22:38 +08:00
Marina Glancy
0f4fc5a878 Merge branch 'MDL-42195-master' of git://github.com/damyon/moodle 2014-04-08 08:53:35 +08:00
sam marshall
46d70f0535 MDL-44070 Conditional availability enhancements (10): autogenerated
Includes all the autogenerated files (to make it easier/less worrying
when reviewing and rebasing).
2014-04-07 20:12:03 +01:00
Dan Poltawski
5e8be14cb9 Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-07 16:01:56 +08:00
Sam Hemelryk
af23b60598 MDL-44944 theme_bootstrapbase: fixed content spacing issue with docked region
Thanks Mary Evans for the peer-review and better solution
2014-04-07 08:12:35 +12:00
Sam Hemelryk
20015af513 MDL-42317 theme_bootstrapbase: more responsive styling for forms with blocks pre && post 2014-04-06 15:40:09 +12:00
Damyon Wiese
9d5859925e MDL-42195 Bootstrap: Make bootstrap responsive images "opt-in".
This responsive image behaviour prevents setting of image sizes in text editors,
as well as a string of pix icon bugs / profile image bugs across Moodle.

We are switching to Bootstrap 3 syntax where you need img-responsive class to images
that want this behaviour.
2014-04-03 09:21:50 +08:00
Sam Hemelryk
0ea11b7cee Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-02 09:27:23 +13:00
Sam Hemelryk
b9c16d401a Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-02 09:27:03 +13:00
Jason Fowler
7105ac89bd MDL-43284 Theme: Clean theme errors with padding in Question Bank fixed 2014-03-27 10:33:45 +08:00
Matt Switlik
0a4fe80bff MDL-44507 filemanager: indicator for clicking Download All in filemanager 2014-03-26 14:34:36 -04:00
Damyon Wiese
961c7b1912 MDL-44032: Atto - move bootstrap changes into overrides file. 2014-03-26 10:01:42 +08:00
Rossiani Wijaya
39e2a67a53 MDL-44032 Atto editor: add subscript and superscript plugins 2014-03-26 10:00:04 +08:00
Damyon Wiese
51e73837b6 MDL-41569: CSS Allow flexible table headers to wrap. 2014-03-25 13:51:26 +08:00
Andrew Nicols
6d402310a4 MDL-34353 Javascript: Allow chooser dialogues to fall back to non-JS version
In order for a chooser dialogue to be able to fall back to it's non-JS
equivalent, we need to use a different set of styles.

This change makes the chooser dialogue preparation function add a new class
to the body which is utilised in the CSS to accomplish this. When the class
is not present, the dialogue content is displayed inline.
2014-03-25 00:51:09 +08:00
Frederic Massart
53bbd369c0 MDL-44364 theme_bootstrapbase: Clean up calendar variables
There are a few reasons why I am cleaning up the calendar.less file.

1/ The variables were too specific, and unlikely to be overridden. If
   you are going to change the colour of the background, surely you will
   change the border to match the background. And if you want to do
   more advanced things, you will override the selectors anyway.

2/ If you wanted to re-use the color of the event, but not as a
   background or border, you would have to use a variable that
   was specific to the background or the border, a generic
   variable for the event colour seems required.

3/ The colour @redDarker should not be defined there, and its purpose
   is so limited that I do not think we need it at all. Also,
   this variable is unlikely to be re-used ever, better not
   introducing it.

4/ I removed the calendarHeadingsColor because those headings should
   really match the rest of the headings throughout the site. I
   removed it from the overlay, but used the standard Bootstrap
   one for the one in the page.

There are still a few things that would need improvement, like the
usage of @white for the background of the event, which will not really
look good on a dark background.
2014-03-24 15:16:11 +08:00
Adam Olley
19213efb98 MDL-31679 gradereport_grader: Add a horizontal scroll bar to the top of the grader report 2014-03-19 16:27:21 +10:30
Eloy Lafuente (stronk7)
a4627988fd Merge branch 'MDL-44328-M27' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-03-19 01:02:51 +01:00
Mary Evans
75716794ec MDL-44356 theme_bootstrapbase: Centralize the drag and drop arrow in filemanager. 2014-03-15 21:22:11 +00:00
M Kassaei
7756e2bc85 MDL-33653 questions, a way to save changes and continue editing 2014-03-07 12:42:51 +00:00
Mary Evans
afd87a0b5f MDL-44328 theme_bootstrapbase: Improved clean theme calendar styling. 2014-03-03 01:36:29 +00:00
Gareth J Barnard
d8037b26a0 MDL-44074 theme_bootstrapbase: No 768px-979px & 1200px+ empty blk span calcs. 2014-03-01 09:37:59 +00:00
Damyon Wiese
ed24890b68 Merge branch 'MDL-38903-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-25 09:21:30 +08:00
Jason Fowler
88d366e595 MDL-38903 File picker: making upload form with more semantic HTML 2014-02-25 07:51:53 +08:00
Damyon Wiese
ccc2966709 Merge branch 'wip-MDL-44139-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-24 15:28:51 +08:00
Damyon Wiese
28a03399b3 Merge branch 'wip-MDL-44168-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-24 15:20:49 +08:00
Sam Hemelryk
24c7fd007a MDL-44217 theme_bootstrapbase: darkend link colour by 5% for accessibility 2014-02-24 16:07:02 +13:00
David Scotson
a0b767e741 MDL-44168 html: border=1 on regexdetect table 2014-02-17 11:45:51 +00:00
Sam Hemelryk
496e46b1ee MDL-43822 theme_bootstrapbase: blocks less tidied and reorganised 2014-02-16 14:25:56 +13:00
David Scotson
7f52dbd8d5 MDL-44139 admin: standardise warning renderer use
Take three handcoded warnings and convert them to calling
the 'warning' renderer like rest of the file.

Then remove redundant CSS and/or move specific CSS to generic
places so it's shared.
2014-02-14 11:39:04 +00:00
Marina Glancy
396548fad4 Merge branch '43977-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-10 18:15:57 +08:00
Sam Hemelryk
1c8c3a6db1 Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-10 14:16:12 +13:00
Sam Hemelryk
642ad27297 Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-10 09:06:31 +13:00
Sam Hemelryk
179ddd105b Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-10 08:50:23 +13:00
Sam Hemelryk
2ea3e43342 MDL-43977 theme_bootstrapbase: small fix to make custom menu work with JS disabled 2014-02-10 08:37:06 +13:00
Mary Evans
97080d53ee MDL-40938 theme_bootstrapbase: Fix for text fields in login block. 2014-02-09 00:45:46 +00:00
Andrew Nicols
e14e17029c MDL-43994 Blocks: Hide the move icon when blocks are docked 2014-02-07 17:39:36 +08:00
Sam Hemelryk
ee729af1e4 MDL-38923 theme_bootstrapbase: pre-integration fixups
* Fixed the way we added the block class to the dock panel in dock.js
* Added a class to the h2 that is used to test dock title width
* Fixed RTL alignment issues as best I could at present
* Fixed overlap of dock + navbar on small screens
* Fixed the docked block width to be constrained to the available space
* Fixed hidden actions on docked blocks
2014-02-05 15:07:44 +13:00
Sam Hemelryk
2a203eee8d MDL-38923 theme_bootstrapbase: tidied up dock implementation
Also:
* Changed to a CSS based compacting solution
* Converted dock colours to variables
* RTL fixes for the dock
2014-02-05 11:21:09 +13:00
Bas Brands
a799631bb1 MDL-38923 theme bootstrapbase: theme clean: enable docking 2014-02-05 11:20:32 +13:00
Ankit Agarwal
6b21643236 MDL-43804 themes: Update css not to use r0 and r1 identifiers for table rows 2014-02-03 14:29:39 +08:00
Eloy Lafuente (stronk7)
51cba7809c Merge branch 'MDL-42928-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-28 12:22:23 +01:00
Andrew Nicols
5ab39a0e97 MDL-42928 JavaScript: Create a module to handle page scroll locking 2014-01-28 09:49:32 +08:00
Eloy Lafuente (stronk7)
bc6a79aee6 Merge branch '43688-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-27 23:58:18 +01:00
Jason Fowler
2eab90fa7f MDL-40786 User profile: Fixing narrow screen RTL collapse 2014-01-24 08:36:02 +08:00
Nadav Kavalerchik
293a18945c MDL-40786 User Profile: Right align profile fields in RTL mode (theme/bootstrapbase, theme/clean) 2014-01-24 08:35:46 +08:00
Sam Hemelryk
5a3e5fa078 MDL-43688 dndupload: fixed positioning across themes 2014-01-24 09:52:47 +13:00