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
002a736eee
MDL-43994 theme_bootstrapbase: consistent commenting between themes
2014-02-10 09:10:20 +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
Damyon Wiese
ce3b8b0e71
Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-22 09:52:38 +08:00
Michael Aherne
41dcfbf1af
MDL-26680 my page My Moodle "reset to default" button
2014-01-21 22:36:24 +00:00
Dan Poltawski
73cb5874b6
Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-21 23:29:20 +08:00
Eloy Lafuente (stronk7)
b0512f418b
Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-21 00:20:28 +01:00
Eloy Lafuente (stronk7)
1816a46d11
Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle
2014-01-21 00:17:31 +01:00
Eloy Lafuente (stronk7)
221e6adaa5
Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 23:59:27 +01:00
Dan Poltawski
8e57617654
Merge branch '42682-27' of git://github.com/samhemelryk/moodle
2014-01-20 15:25:46 +08:00
Dan Poltawski
3ab0a93347
Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 12:56:17 +08:00
Damyon Wiese
6d7d401711
Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 11:27:07 +08:00
Dan Poltawski
34e91c304c
Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-20 09:24:53 +08:00
rwijaya
f3f180863f
MDL-42980 clean theme: fixed add/cancel buttons position for safari on iPhone with ios7.
2014-01-17 16:12:26 +08:00
Sam Hemelryk
35620f63f0
MDL-42682 theme_bootstrapbase: fixed styling of discussion selector
2014-01-17 10:25:36 +13:00
Sam Hemelryk
bfaee803af
MDL-42682 theme_bootstrapbase: fixed forum search alignment
2014-01-17 10:25:33 +13:00
Frederic Massart
f15aff3802
MDL-40533 block_html: Remove styles specific to the block
2014-01-14 19:00:31 +01:00
Frederic Massart
810a3da133
MDL-41506 theme_bootstrapbase: Implement highlight class
2014-01-14 11:19:43 +01:00
Nadav Kavalerchik
0954819fc7
MDL-40752 Login RTL: Swapping the panels on two-panel login pages for RTL
...
Additions to the patch by Jason Fowler <phalacee@gmail.com>
2014-01-14 09:19:42 +08:00
Frederic Massart
70a0ae96aa
MDL-41362 theme_bootstrapbase: Alignment of User Selector controls
2014-01-13 18:35:59 +01:00
Frederic Massart
fdbb039713
MDL-39684 theme: RTL align of restrictions label in file manager
2014-01-13 16:15:12 +01:00
Nadav Kavalerchik
cb0f81c210
MDL-39683 Messages, Themes: Fix "my" and "other person" message alignment in RTL mode (theme/clean)
2014-01-13 15:22:57 +01:00
Dan Poltawski
dbfdd1a4f9
Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 12:34:53 +08:00
Dan Poltawski
f9276172a2
Merge branch '41226-27' of git://github.com/samhemelryk/moodle
2014-01-13 11:11:10 +08:00
Dan Poltawski
58c8f0290f
Merge branch '40821-27' of git://github.com/samhemelryk/moodle
2014-01-13 11:02:18 +08:00
Dan Poltawski
e41761a5e9
Merge branch '40693-27' of git://github.com/samhemelryk/moodle
2014-01-13 10:07:53 +08:00
Dan Poltawski
fb9360db3a
Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 10:03:51 +08:00
Sam Hemelryk
ee749e50be
MDL-40205 theme: fixed overflow of block headers
2014-01-13 09:40:38 +08:00
Dan Poltawski
b5c8e7cbc3
Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 09:35:50 +08:00
Sam Hemelryk
3fa787ae4e
MDL-40821 theme_bootstrapbase: fixed positioning of profile controls
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-01-13 08:17:24 +13:00
Sam Hemelryk
73d7e6eba9
MDL-40821 theme_bootstrapbase: show the current lang in the menu
2014-01-13 08:16:11 +13:00
Sam Hemelryk
73fc183d3a
MDL-40693 theme_bootstrapbase: changed navbar separator to official separator
2014-01-13 08:15:46 +13:00
Frederic Massart
138eb08746
MDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view
2014-01-09 10:25:53 +01:00
Frederic Massart
86048e8136
MDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page
2014-01-08 10:37:41 +01:00
Eloy Lafuente (stronk7)
430740f65a
Merge branch 'MDL-42392-master' of git://github.com/andrewnicols/moodle
2014-01-08 00:23:40 +01:00