Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ module.exports = function(grunt) {
'optimize': 'uglify',
'preserveLicenseComments': false,
'optimizeCss': 'standard',
'cssImportIgnore': null,
'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
2 changes: 1 addition & 1 deletion shared/oae/css/oae.core.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/* 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 url('//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.

Can you add a comment here that any change to this extensible-looking URL should be accompanied by a change to the cssImportIgnore in Gruntfile.js? I think we'd only need it until we have a more robust regexp matching mechanism as per your PR to r.js.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

excellent suggestion


/* 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.