Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ module.exports = function(grunt) {
'optimize': 'uglify',
'preserveLicenseComments': false,
'optimizeCss': 'standard',
'cssImportIgnore': null,
// TODO: Replace the following with a saner value if/when `r.js` merges PR https://github.com/jrburke/r.js/pull/653
'cssImportIgnore': '//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700&subset=latin,cyrillic-ext,latin-ext,greek-ext',
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to make a TODO here referencing your open PR r.js to change to a more robust regexp match.

'inlineText': true,
'useStrict': false,
'pragmas': {},
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

Documentation on how to install and configure OAE can be found in the [back-end repository](https://github.com/oaeproject/Hilary).

## Local Development

By default 3akai-ux uses the Open Sans font family available from Google's Web Font CDN. When developing locally without a live Internet connection, that CDN will be inaccessible. To ensure maximum visual fidelity, those fonts can be installed as system fonts in the local machine. Download the entire collection from [Google](http://www.google.com/fonts#UsePlace:use/Collection:Open+Sans).

## Widget development

Documentation on how to create custom OAE widgets and an overview of the available widgets can be found at the [Widget Library](http://oae-widgets.sakaiproject.org/)
Expand Down
10 changes: 8 additions & 2 deletions shared/oae/css/oae.core.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,21 @@
* permissions and limitations under the License.
*/

/**
* Import the Open Sans font. Any changes to the URL below must be reflected
* in `requirejs.optimize.options.cssImportIgnore` in `Gruntfile.js`. Because
* this `@import` will not be replaced with inlined includes, it must precede
* all other rules in the file.
*/
@import url('//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700&subset=latin,cyrillic-ext,latin-ext,greek-ext');

/* Import the Bootstrap CSS file */
@import url('../../vendor/css/bootstrap.css');
/* Import the JQuery Bootstrap Notify plugin CSS */
@import url('../../vendor/css/jquery.bootstrap.notify.css');

/* Import the Font Awesome Icon Set */
@import url('../../vendor/css/font-awesome/css/font-awesome.css');
/* Import the Open Sans font */
@import url('../../vendor/css/opensans/css/opensans.css');

/* Import the JQuery AutoSuggest plugin CSS */
@import url('../../vendor/css/jquery.autoSuggest.css');
Expand Down
60 changes: 0 additions & 60 deletions shared/vendor/css/opensans/css/opensans.css

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.