Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
2532a5f
CSS tweaks for icons in the Navigation block
mattrice Feb 19, 2014
63411ec
Added required (Moodle) version point number
mattrice May 8, 2014
54d1f2d
Rollup of origin source changes
mattrice May 8, 2014
c63f774
V2.7.0.1
gjb2048 Jun 23, 2014
7df0af2
V2.7.0.1
gjb2048 Jun 23, 2014
c5f1c88
Update translations and start dutch translation
DBezemer Jul 2, 2014
85a9ef0
Commit various fixes and typos
DBezemer Jul 2, 2014
5097502
Code style and whitespace cleanup
DBezemer Jul 2, 2014
630b963
Merge branch 'master' of github.com:DBezemer/moodle-theme_essential
gjb2048 Jul 4, 2014
d32a624
Update gitignore
Jul 4, 2014
1543793
Bump version number and sanitize requirements
Jul 4, 2014
eb7e120
Align version.php with Julians scheme slightly
DBezemer Jul 4, 2014
006f06c
Update Readme and version requirement
DBezemer Jul 4, 2014
0245c38
Language cleanup, and WIP slideshow improvements
DBezemer Jul 5, 2014
7490342
Add Dutch Translation and cleanup English
DBezemer Jul 5, 2014
bc10de6
Remove default background image, place header bar at top, re-align sl…
DBezemer Jul 5, 2014
f98d37e
Updating Slideshow design to offer a more fluent experience.
DBezemer Jul 5, 2014
33a3ebd
Attempt to cleanup admin menu (failed due to MDL-46259)
DBezemer Jul 5, 2014
43fd961
Bump version to Moodle 2.7 and update README
DBezemer Jul 5, 2014
8bb2064
Merge branch 'MOODLE_26' of github.com:DBezemer/moodle-theme_essential
gjb2048 Jul 7, 2014
cafc4be
Put back Pirate!
gjb2048 Jul 7, 2014
8a59f55
Fix #4, place background in correct position
Jul 7, 2014
378af70
Fix #6, further slideshow improvements, release 2.7.2
DBezemer Jul 7, 2014
9c14578
Bump version number for release 2.7.2
DBezemer Jul 7, 2014
9f5a247
Small change in image stretching size.
DBezemer Jul 7, 2014
6d74f02
Beginning of LESS conversion and update to FontAwesome 4.1.0.
gjb2048 Jul 8, 2014
08023aa
Fix #8
DBezemer Jul 8, 2014
4501fd2
Merge pull request #10 from gjb2048/master_less_grunt
DBezemer Jul 8, 2014
6768daa
Merge small missing changes for less conversion
DBezemer Jul 8, 2014
e5185f2
re-add some minor css fixes and remove nojs from default less compila…
DBezemer Jul 8, 2014
98bdce5
Update missing colours from colourswitcher, resolve padding on mobile…
Jul 10, 2014
b43d154
Bump version number for master branch
Jul 10, 2014
5148a4a
Merge branch 'master' of github.com:DBezemer/moodle-theme_essential
gjb2048 Jul 10, 2014
5c6c586
Make sure base is a fully empty layout, fix #16
DBezemer Jul 11, 2014
e660e47
Large cleanup #1, not otherwise specified
DBezemer Jul 12, 2014
e2bf059
Merge branch 'master' of github.com:DBezemer/moodle-theme_essential
gjb2048 Jul 12, 2014
ece3453
Carousel replacement for slider. Issue #18.
gjb2048 Jul 12, 2014
4fc31d7
Merge pull request #21 from DBezemer/master_carousel
gjb2048 Jul 12, 2014
2fa89ea
Update README.txt for issue #18.
gjb2048 Jul 12, 2014
8997231
Massive rework and cleanup, see Readme, thanks to @gjb2048 for the aw…
DBezemer Jul 13, 2014
9932ae7
Fix #20
DBezemer Jul 13, 2014
1482f58
Slight fixes for the carousel.
gjb2048 Jul 13, 2014
c113d8e
Merge pull request #27 from DBezemer/master_carousel_fix
DBezemer Jul 13, 2014
6a1c36f
License info cleanup, some minor CSS fixes, new dock mod, all tabs to…
DBezemer Jul 13, 2014
842020d
Only use dock.js for Moodle 2.7 and up
DBezemer Jul 13, 2014
d4d4a10
Revert back to theme specific font loading for IE8 compatibility, see…
Jul 14, 2014
405d474
Remove map file, developers can generate this running grunt tasks.
Jul 14, 2014
6ff0b57
Resolve duplicate id, fix #30 and #31
Jul 14, 2014
95da1af
Also push CSS for previous fixes
Jul 14, 2014
02bddaa
Docking fixes and efficiency for slider.
gjb2048 Jul 14, 2014
6442dcf
Alert on frontpage only.
gjb2048 Jul 14, 2014
c86958b
Alternative theme colours for slider.
gjb2048 Jul 14, 2014
3ab64db
See README.txt, main changes: breadcrumb and fixes
DBezemer Jul 15, 2014
b9fcada
Fix #40, add a floating save button on admin save pages.
DBezemer Jul 16, 2014
3a9ec05
Resolve #40 in a more reliable way.
DBezemer Jul 16, 2014
a24b3fc
Fix header bug (spans did not match all possible cases). Also make su…
Jul 16, 2014
2c3888a
Prevent creation of empty menu link
Jul 16, 2014
70307a7
Correct indentation and close all div tags.
Jul 16, 2014
a1899c7
Set correct header height when no logo is present to prevent differen…
Jul 16, 2014
32e35ea
Fix check for breadcrumb style
Jul 16, 2014
c06d20a
Align logo so it fits better in the header
Jul 16, 2014
8f3594d
Whoops @ quotes
Jul 16, 2014
40d6378
Align logo
Jul 16, 2014
4b7bc63
Stick classic navbar to top on scroll as well, resolve font check if …
Jul 17, 2014
c64e24f
It is important not to forget the style!
Jul 17, 2014
2cd385a
Add popup file, hopefully fix #44, will test more later
Jul 17, 2014
e39c72b
Correctly disable custom icons
Jul 17, 2014
e3803ea
Fix for #47.
gjb2048 Jul 17, 2014
5a0087a
Merge branch 'master' of github.com:DBezemer/moodle-theme_essential
gjb2048 Jul 17, 2014
bd2f23a
Fix for #46, looks aligned for me, but please test on Moodle 2.6
DBezemer Jul 17, 2014
0d1400d
Fix #44
DBezemer Jul 17, 2014
0c84e22
Fix style for login block and small optimize for secure layout.
DBezemer Jul 17, 2014
9129616
Update loading icons and remove margin on header when viewing on mobile.
DBezemer Jul 17, 2014
4bead88
Bump version number for release
DBezemer Jul 17, 2014
e302105
Update README for release
DBezemer Jul 17, 2014
e7d8515
See #49
DBezemer Jul 17, 2014
9d1f83e
Remove language check for alerts, preventing warnings/errors
DBezemer Jul 17, 2014
4faa2a2
Fix for #68
gjb2048 Jul 23, 2014
b2d8634
Slider fixes.
gjb2048 Jul 24, 2014
e5e2f83
Merge pull request #75 from gjb2048/master_#68
gjb2048 Jul 26, 2014
c574eb5
Add text colour.
gjb2048 Jul 21, 2014
af74b47
Fix icon colour in line with SVG's.
gjb2048 Jul 21, 2014
36b59dd
Don't compress as Moodle does in the cache and makes it harder to deb…
gjb2048 Jul 21, 2014
9d34044
Recompile CSS after rebase.
gjb2048 Jul 26, 2014
41c0506
Merge pull request #62 from gjb2048/master_text_colour
gjb2048 Jul 26, 2014
87f5874
Add in svgmin and revert icons to gray.
gjb2048 Jul 26, 2014
9fe9b85
Fix colours work in progress.
gjb2048 Jul 26, 2014
894366d
Update theme_essential.php
DBezemer Jul 26, 2014
658b154
Fix alternative colour sets.
gjb2048 Jul 26, 2014
31d1129
Merge branch 'master' of github.com:DBezemer/moodle-theme_essential
gjb2048 Jul 26, 2014
4e98295
Moodle 2.6 does not support IE8 and remove duplicate page settings re…
gjb2048 Jul 26, 2014
136f568
Carousel slider caption below image option.
gjb2048 Jul 26, 2014
3c0538e
Bump to V2.7.3.1 - BETA test version.
gjb2048 Jul 26, 2014
76e3db3
V2.7.4a - Pre-release for testing.
gjb2048 Jul 26, 2014
f300238
2.7.4a
gjb2048 Jul 26, 2014
2f58390
Fix for #78. Migrated manual RTL CSS to own sheet. Fixed header RTL…
gjb2048 Jul 27, 2014
1aed65f
Add rtl.css.
gjb2048 Jul 27, 2014
d9726e5
Fix #85.
gjb2048 Jul 28, 2014
c38e673
Remove redundant plugin css exclusion that no longer exists. Thanks …
gjb2048 Jul 28, 2014
18396bd
Fix #88 and #90.
gjb2048 Jul 29, 2014
d9260dd
Fix issue #89 and navigation bar with custom menu items on a narrow w…
gjb2048 Jul 29, 2014
b68804f
2.7.4d - Issue #93.
gjb2048 Jul 30, 2014
e1c3b58
Improve slider description.
gjb2048 Jul 30, 2014
b81c897
2.7.4
gjb2048 Jul 31, 2014
d19f037
Merge branch 'master' of github.com:gjb2048/moodle-theme_essential
gjb2048 Jul 31, 2014
b2a2c2a
Lang en/iosicondesc - Change 'them' to 'theme'
sk-unikent Aug 1, 2014
4384dc4
Merge pull request #98 from sk-unikent/patch-1
gjb2048 Aug 1, 2014
2732af4
Start of 2.7.5.
gjb2048 Aug 1, 2014
e77674f
Fix #107. No fixed width to header on login page.
gjb2048 Aug 4, 2014
1c0ee86
Fix issue #101: Navbar not expanding properly on android mobile and t…
gjb2048 Aug 4, 2014
95ce526
Style fix for #107.
gjb2048 Aug 4, 2014
5de9a75
Fix issue #96. 2.7.4 breaks oldnavbar setting.
gjb2048 Aug 4, 2014
fc749c8
Update 2.7.5 readme.
gjb2048 Aug 4, 2014
0f9f786
Fix 'i' tag with no logo.
gjb2048 Aug 5, 2014
1e3aab2
- FIX: Issue #113: Remove FontAwesome from all links in section headi…
DBezemer Aug 5, 2014
856ef1a
Issue #114.
gjb2048 Aug 6, 2014
4cebfa4
Fix #92 and give main content a white bg
Aug 6, 2014
ca79b11
Merge branch 'master' of https://github.com/DBezemer/moodle-theme_ess…
Aug 6, 2014
3c276b2
Use optimized dot png and fully fix #92
Aug 6, 2014
a51bdbd
Remove IE8 message as it works fine in IE8
Aug 6, 2014
e1ab6bc
Sort out some less files to optimize for small releases
DBezemer Aug 6, 2014
2b93524
Correctly reflect merging of font-awesome css
DBezemer Aug 6, 2014
21cc149
Compress flipped css
DBezemer Aug 6, 2014
6120df9
Minor changes (jk)
DBezemer Aug 8, 2014
645e866
Small fixes cleanup
DBezemer Aug 8, 2014
7ac3922
Responsive changes to dock and cleanup of header.
DBezemer Aug 8, 2014
e90273e
fixing small issue when user has no courses assigned yet.
DBezemer Aug 8, 2014
5878b1e
Fix #81 and merge RTL changes
DBezemer Aug 8, 2014
efc020e
And stay gone!
DBezemer Aug 8, 2014
41ae16d
Fix a setting in categories.less and continuance of #1.
gjb2048 Aug 8, 2014
8661877
Issue #123.
gjb2048 Aug 8, 2014
65f2850
Fix #126.
gjb2048 Aug 8, 2014
67b51dd
Fix: https://moodle.org/mod/forum/discuss.php?d=264952#p1151378
gjb2048 Aug 9, 2014
dbb3978
Fix message dropdown menu stays open when '.open' applied to dropdown.
gjb2048 Aug 9, 2014
8649a04
Fix #127.
gjb2048 Aug 9, 2014
895916a
Progress on dropdown colours. Alternatives not finished yet.
gjb2048 Aug 9, 2014
f685c20
Fix #131 #130 #129 and cleanup renderer, language and settings
DBezemer Aug 10, 2014
9a818b8
Day of the boo-boo
DBezemer Aug 10, 2014
ff09b25
And again!
DBezemer Aug 10, 2014
7e3ace5
Third times a charm
DBezemer Aug 10, 2014
89373e9
Enhance breadcrumb settings, cleanup settings and correctly fix categ…
DBezemer Aug 11, 2014
4d39ef8
Update lib.php with changes and align code for performance output
DBezemer Aug 11, 2014
c74321d
Language support for Messages timing
Aug 11, 2014
99d41f9
Add capability support to the grades item.
Aug 11, 2014
eb0eef4
provide My Grades regardless of Moodle's crappy implementation
Aug 11, 2014
7eb9e2f
further optimize context loading
Aug 11, 2014
ff2dfef
Indentation fixes
Aug 11, 2014
c2f350f
Align naming of course renderer file.
Aug 11, 2014
1abcb60
Add thirdpartylibs.xml and fix #42
Aug 11, 2014
4afabf6
Fix #5 and include mixing in Essentials for further future optimizati…
Aug 11, 2014
984a021
Fix #52
DBezemer Aug 11, 2014
ab8c7fd
Improve navbar LESS and optimise, continuation of #1.
gjb2048 Aug 11, 2014
03d5d9c
Slight tweak to messages code for screen readers.
gjb2048 Aug 11, 2014
bf083bd
Add donation link to intro/header/install info
DBezemer Aug 11, 2014
a0e9a70
Uniform borders between course and blocks
DBezemer Aug 11, 2014
4e49435
Fix span in span without row-fluid.
gjb2048 Aug 12, 2014
2aefe33
Fix navbar colours.
gjb2048 Aug 12, 2014
db32db1
Fix #134.
gjb2048 Aug 12, 2014
82ec1cb
Fix #135.
gjb2048 Aug 12, 2014
7fa0f2b
Fix 136.
gjb2048 Aug 12, 2014
dbe268e
Merge branch 'master' of https://github.com/DBezemer/moodle-theme_ess…
mattrice Aug 12, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ ehthumbs.db
Thumbs.db
*.psd
*.bak
quickpush.sh
/node_modules
/style/*.map
279 changes: 279 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@
/**
* Gruntfile for compiling theme_essential .less files.
*
* This file configures tasks to be run by Grunt
* http://gruntjs.com/ for the current theme.
*
*
* Requirements:
* -------------
* nodejs, npm, grunt-cli.
*
* Installation:
* -------------
* node and npm: instructions at http://nodejs.org/
*
* grunt-cli: `[sudo] npm install -g grunt-cli`
*
* node dependencies: run `npm install` in the root directory.
*
*
* Usage:
* ------
* Call tasks from the theme root directory. Default behaviour
* (calling only `grunt`) is to run the watch task detailed below.
*
*
* Porcelain tasks:
* ----------------
* The nice user interface intended for everyday use. Provide a
* high level of automation and convenience for specific use-cases.
*
* grunt watch Watch the less directory (and all subdirectories)
* for changes to *.less files then on detection
* run 'grunt compile'
*
* Options:
*
* --dirroot=<path> Optional. Explicitly define the
* path to your Moodle root directory
* when your theme is not in the
* standard location.
* grunt compile Run the .less files through the compiler, create the
* RTL version of the output, then run decache so that
* the results can be seen on the next page load.
*
* Options:
*
* --dirroot=<path> Optional. Explicitly define the
* path to your Moodle root directory
* when your theme is not in the
* standard location.
*
* --urlprefix=<path> Optional. Explicitly define
* the path between the domain
* and the installation in the
* URL, i.e. /moodle27 being:
* --urlprefix=/moodle27
*
* Plumbing tasks & targets:
* -------------------------
* Lower level tasks encapsulating a specific piece of functionality
* but usually only useful when called in combination with another.
*
* grunt less Compile all less files.
*
* grunt less:essential Compile Essential less files.
*
* grunt decache Clears the Moodle theme cache.
*
* Options:
*
* --dirroot=<path> Optional. Explicitly define
* the path to your Moodle root
* directory when your theme is
* not in the standard location.
*
* grunt replace Run all text replace tasks.
*
* grunt svg Change the colour of the SVGs in pix_core by
* text replacing #999999 with a new hex colour.
* Note this requires the SVGs to be #999999 to
* start with or the replace will do nothing
* so should usually be preceded by copying
* a fresh set of the original SVGs.
*
* Options:
*
* --svgcolour=<hexcolour> Hex colour to use for SVGs
*
* grunt cssflip Create essential-rtl.css by flipping the direction styles
* in essential.css.
*
*
* @package theme
* @subpackage shoehorn
* @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}


* @author Based on code originally written by Joby Harding, Bas Brands, David Scotson and many other contributors. * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

module.exports = function(grunt) {

// Import modules.
var path = require('path');

// Theme Bootstrap constants.
var LESSDIR = 'less',
MOODLEURLPREFIX = grunt.option('urlprefix') || '',
THEMEDIR = path.basename(path.resolve('.'));

// PHP strings for exec task.
var moodleroot = path.dirname(path.dirname(__dirname)),
configfile = '',
decachephp = '',
dirrootopt = grunt.option('dirroot') || process.env.MOODLE_DIR || '';

// Allow user to explicitly define Moodle root dir.
if ('' !== dirrootopt) {
moodleroot = path.resolve(dirrootopt);
}

configfile = path.join(moodleroot, 'config.php');

decachephp += 'define(\'CLI_SCRIPT\', true);';
decachephp += 'require(\'' + configfile + '\');';
decachephp += 'theme_reset_all_caches();';

var svgcolour = grunt.option('svgcolour') || '#999999';

grunt.initConfig({
less: {
moodle: {
options: {
compress: false,
cleancss: true,
paths: "./less",
report: 'min',
},
src: 'less/moodle.less',
dest: 'style/moodle.css'
},
// Compile essential styles.
essential: {
options: {
cleancss: true,
compress: false,
paths: "./less",
report: 'min',
sourceMap: false,
sourceMapRootpath: MOODLEURLPREFIX + '/theme/' + THEMEDIR,
sourceMapFilename: 'style/essential.treasure.map'
},
src: 'less/essential.less',
dest: 'style/essential.css'
},
alternative: {
options: {
compress: true,
cleancss: true,
paths: "./less",
report: 'min',
sourceMap: false,
sourceMapRootpath: MOODLEURLPREFIX + '/theme/' + THEMEDIR,
sourceMapFilename: 'style/alternative.treasure.map'
},
src: 'less/alternative.less',
dest: 'style/alternative.css'
}
},
exec: {
decache: {
cmd: 'php -r "' + decachephp + '"',
callback: function(error, stdout, stderror) {
// exec will output error messages
// just add one to confirm success.
if (!error) {
grunt.log.writeln("Moodle theme cache reset.");
}
}
}
},
watch: {
// Watch for any changes to less files and compile.
files: ["less/**/*.less"],
tasks: ["compile"],
options: {
spawn: false
}
},
cssflip: {
options: {
compress: true
},
rtl: {
src: 'style/essential.css',
dest: 'style/essential-rtl.css'
}
},
copy: {
svg_core: {
expand: true,
cwd: 'pix_core_originals/',
src: '**',
dest: 'pix_core/',
},
svg_plugins: {
expand: true,
cwd: 'pix_plugins_originals/',
src: '**',
dest: 'pix_plugins/',
}
},
replace: {
svg_colours_core: {
src: 'pix_core/**/*.svg',
overwrite: true,
replacements: [{
from: '#999999',
to: svgcolour
}]
},
svg_colours_plugins: {
src: 'pix_plugins/**/*.svg',
overwrite: true,
replacements: [{
from: '#999999',
to: svgcolour
}]
}
},
svgmin: {
options: {
plugins: [{
removeViewBox: false
}, {
removeUselessStrokeAndFill: false
}, {
convertPathData: {
straightCurves: false
}
}]
},
dist: {
files: [{
expand: true,
cwd: 'pix_core',
src: ['**/*.svg'],
dest: 'pix_core/',
ext: '.svg'
}, {
expand: true,
cwd: 'pix_plugins',
src: ['**/*.svg'],
dest: 'pix_plugins/',
ext: '.svg'
}]
}
}
});

// Load contrib tasks.
grunt.loadNpmTasks("grunt-contrib-less");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-exec");
grunt.loadNpmTasks("grunt-text-replace");
grunt.loadNpmTasks("grunt-css-flip");
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-svgmin');

// Register tasks.
grunt.registerTask("default", ["watch"]);
grunt.registerTask("decache", ["exec:decache"]);

grunt.registerTask("compile", ["less", "cssflip", "decache"]);
grunt.registerTask("copy:svg", ["copy:svg_core", "copy:svg_plugins"]);
grunt.registerTask("replace:svg_colours", ["replace:svg_colours_core", "replace:svg_colours_plugins"]);
grunt.registerTask("svg", ["copy:svg", "replace:svg_colours", "svgmin"]);
};
Loading