Commit graph

942 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
db438e0c14 Merge branch 'm28_MDL-46716' of https://github.com/totara/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-08-26 02:16:50 +02:00
Brian Barnes
4a222f026a MDL-46716 core_calendar: Replaced iCal image with stylised text 2014-08-22 09:44:58 +12:00
Mary Evans
8c97393ce5 MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824
Squashed commit of the following:

commit 5881cccc95c135e1440ce0c5441a84b462941758
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 02:15:05 2014 +0100

    MDL-46812 grade/report/grader: Reset previous commit for left scroller.

commit 5abeb60470f02ab4c79c27b2a6f6187e75891e0b
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 01:29:41 2014 +0100

    MDL-46812 grade/report/grader: Added jsenabled css body class to rtl style.

commit a95d23d8b753a590d980e5427e8c74ba597c2b91
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 00:59:06 2014 +0100

    MDL-46812 theme_base; Removed more redundent CSS.

commit 3fb326e5b39738343e0b7c0d9c8da17adf5a09bb
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Wed Aug 20 13:24:59 2014 +0100

    MDL-46812 theme_base: Removed redundent grade/report/grader CSS in style/grade.css

commit c602e7e277f9ce1fed6d0eccf72c547432e130b6
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 14 12:50:14 2014 +0100

    MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824

        1. fixed gradebook layout when JS is disabled
        2. added height and background color to scroller when JS is enabled
        3. removed redundent top margin in user-grades table
2014-08-21 11:13:56 +01:00
Marina Glancy
e913caab92 Merge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-08-19 16:51:46 +08:00
Mary Evans
fcd90243b6 MDL-46829 theme_base: Fixed regression in Base caused by MDL-54031.
So much for Peer Reviews.
2014-08-14 13:35:26 +01:00
Eloy Lafuente (stronk7)
3376dae082 MDL-45031 theme: fix tabs base line alignment by 1px.
Credit goes to Damyon Wiese, thanks!
2014-08-13 21:31:11 +02:00
Eloy Lafuente (stronk7)
9ab115bbee Merge branch 'MDL-45031_M28' of git://github.com/lazydaisy/moodle 2014-08-13 00:34:03 +02:00
Marina Glancy
ff195da1e3 Merge branch 'm28_MDL-46643' of git://github.com/totara/moodle 2014-08-12 13:31:25 +08:00
Mary Evans
0b181e9a4d MDL-45031 theme_base: Added style/tabs.css and updated config.php
also removed tabtree css from style/core.css to style/tabs.css.
2014-08-12 00:59:16 +01:00
Andrew Nicols
b6c56044f6 MDL-32917 calendar: Fix centering of calendar heading on IE10 2014-08-07 09:38:06 +08:00
Brian Barnes
712e5f222f MDL-46643 calendar: improved tab order of calendar detail pages 2014-08-01 11:53:02 +12:00
Mary Evans
e8e1592972 MDL-46538 theme_base/theme_bootstrapbase: Removed incorrect RTL CSS mark-up. 2014-07-26 16:27:43 +01:00
Sam Hemelryk
ce3d7d5da9 Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-07-21 11:14:30 +12:00
Brian Barnes
22f8a34998 MDL-46406 core_auth: Placed remember username before submit login form 2014-07-17 14:03:50 +12:00
Brian Barnes
ef56323c7f MDL-46250 core_filepicker: Changed headings to be heading tags instead of spans 2014-07-07 10:24:39 +12:00
Brian Barnes
9130250b0e fixed download button 2014-06-27 12:51:41 +12:00
Yuliya
cd243d94cd MDL-45379 badges: removed unnecessary tables from renderers
Signed-off-by: Yuliya <yuliya.bozhko@gmail.com>
Signed-off-by: Brian Barnes <brian.barnes@totaralms.com>
2014-06-27 12:51:41 +12:00
Damyon Wiese
d9640a99ba Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
2014-06-24 14:10:51 +08:00
Damyon Wiese
0faba5386c Merge branch 'MDL-38693-master' of git://github.com/jethac/moodle 2014-06-23 14:11:30 +08:00
Jetha Chan
328ef3df0e MDL-46022 custom_menu: add support for dividers 2014-06-20 15:53:11 +08:00
Eloy Lafuente (stronk7)
2975f1a0cc Merge branch 'MDL-42782-master' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-06-10 01:08:45 +02:00
Jetha Chan
717158700f MDL-38693 themes: amended z-indexes
Amended #dock z-index level from 11000 to 5000 across all themes; amended z-index style of #page-header in Overlay theme such that elements no longer occlude TinyMCE.
2014-06-09 14:32:28 +08:00
Sam Hemelryk
0591c2056d Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-06-04 09:51:37 +12:00
Jason Fowler
2270803ed2 MDL-42953 Themes: Fixing CSS for headers of central blocks 2014-06-03 12:13:00 +02:00
Jetha Chan
bd77886b41 MDL-42782 usability: fix for extreme course page indenting 2014-06-03 11:15:59 +08:00
Sam Hemelryk
da4887a2d9 Merge branch 'MDL-45561-master' of git://github.com/jethac/moodle 2014-05-19 13:37:12 +12:00
Jetha Chan
1e0b920cba MDL-45561 themes: horizontal scroll in RTL base 2014-05-15 15:50:26 +08:00
Damyon Wiese
2ffff04be7 MDL-41383 Filepicker: whitespace fix 2014-05-15 13:32:13 +08:00
Jetha Chan
05bb4d1320 MDL-41383: RTL fix for base when zoomed out 2014-05-15 13:28:26 +08:00
Jetha Chan
92061d3890 MDL-41383 theme: filepicker zoom resiliency (base)
Fixed an issue that broke the file picker on base when initial zoom level is less than 100%.
2014-05-14 14:46:20 +08:00
Andrew Nicols
72704adf03 MDL-44486 core: Rewrite JavaScript progressbar 2014-05-12 15:29:47 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Frederic Massart
a36f8b36dd MDL-45443 theme_base: Missing closing bracket ruining the CSS 2014-05-08 17:37:37 +08:00
Jetha Chan
13e118ca65 MDL-36836 filepicker: alfresco select box fix
Adjusted position of alfresco select box; amended border/background application in base.
2014-05-01 16:08:02 +08:00
Dan Poltawski
8d863216d8 Merge branch 'MDL-44815-master' of git://github.com/andrewnicols/moodle 2014-05-01 12:06:32 +08:00
Andrew Nicols
5b932559ce MDL-44815 theme: Make chooser icons the standard 16px
The only exception to this rule is the activity chooser which is allowed
24px.
2014-05-01 11:54:26 +08:00
Jetha Chan
899fa34a8e MDL-45292 filepicker: fixed border style
Fixed base style issues on RTL.
2014-04-28 17:04:55 +08:00
Dan Poltawski
d2907f5cb9 Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle 2014-04-18 14:07:53 +08:00
Frederic Massart
970c44196c MDL-39607 theme: Update Moodle logo 2014-04-17 14:33:39 +08:00
Andrew Davis
1615cc45e9 MDL-44778 core_theme: added the well and well-small class to Base 2014-04-17 08:48:21 +08:00
Dan Poltawski
a935cccb2b Merge branch 'MDL-31679' of git://github.com/aolley/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 12:49:35 +08:00
Dan Poltawski
9eeacad9b8 Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-09 11:52:33 +08:00
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
Sam Hemelryk
87f2c808f7 Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
2014-04-08 08:59:54 +12:00
sam marshall
00c832d7a1 MDL-44070 Conditional availability enhancements (8): display
Includes theme and renderer changes required for the new feature.
There are two parts: style required for the display as part of the
course page (when showing the list of conditions for an activity),
and style required for the settings form.

This change supports both the bootstrapbase theme (which was the
main theme used during development) and the old base theme.
2014-04-07 20:11:56 +01:00
Andrew Nicols
ee616cff45 MDL-44760 editor_atto: Make menus consistent with Clean theme 2014-04-07 20:43:57 +08: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
04f1a90d05 MDL-41551 theme_base: improved custom block region handling for base 2014-04-06 15:17:48 +12:00