[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/webpack] 5 commits: CHANNELMGR-863 restructure scss vendor code

[Joeri de Gooijer]

Joeri de Gooijer pushed to branch feature/webpack at cms-community / 
hippo-addon-channel-manager


Commits:
94d589a4 by Joeri de Gooijer at 2016-09-16T11:38:48+02:00
CHANNELMGR-863 restructure scss vendor code

Setup vender.scss such that it imports our variables
and then includes the vendor specific scss.

- - - - -
4181c0c7 by Joeri de Gooijer at 2016-09-16T11:42:36+02:00
CHANNELMGR-863 Remove css from styles loader test

- - - - -
4bf9acd5 by Joeri de Gooijer at 2016-09-16T11:43:36+02:00
CHANNELMGR-863 Change requires to imports

- - - - -
d48fbb7d by Joeri de Gooijer at 2016-09-16T14:15:10+02:00
CHANNELMGR-863 Set path to i18n files relative to current app

- - - - -
77b1d8e6 by Joeri de Gooijer at 2016-09-16T14:15:54+02:00
CHANNELMGR-863 Import angular material variables

- - - - -


5 changed files:

- frontend-ng/conf/webpack.conf.js
- frontend-ng/src/angularjs/hippo-cm.config.js
- frontend-ng/src/index.js
- frontend-ng/src/styles/_variables.scss
- frontend-ng/src/vendor.scss


Changes:

=====================================
frontend-ng/conf/webpack.conf.js
=====================================
--- a/frontend-ng/conf/webpack.conf.js
+++ b/frontend-ng/conf/webpack.conf.js
@@ -25,7 +25,7 @@ module.exports = {
         ],
       },
       {
-        test: /\.(css|scss)$/,
+        test: /\.scss$/,
         loaders: [
           'style',
           'css?sourceMap',


=====================================
frontend-ng/src/angularjs/hippo-cm.config.js
=====================================
--- a/frontend-ng/src/angularjs/hippo-cm.config.js
+++ b/frontend-ng/src/angularjs/hippo-cm.config.js
@@ -27,7 +27,7 @@ export function config($mdThemingProvider, $stateProvider, 
$urlRouterProvider, $
     resolve: {
       translations: ($translate, ConfigService) => {
         $translateProvider.useStaticFilesLoader({
-          prefix: '/cms/angular/public/i18n/',
+          prefix: '/cms/angular/hippo-cm/i18n/',
           suffix: `.json?antiCache=${ConfigService.antiCache}`,
         });
         return $translate.use(ConfigService.locale)


=====================================
frontend-ng/src/index.js
=====================================
--- a/frontend-ng/src/index.js
+++ b/frontend-ng/src/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-require('./vendor.scss');
-require('./index.scss');
+import './vendor.scss';
+import './index.scss';
 
 export { hippoCmng } from './angularjs/hippo-cm.js';


=====================================
frontend-ng/src/styles/_variables.scss
=====================================
--- a/frontend-ng/src/styles/_variables.scss
+++ b/frontend-ng/src/styles/_variables.scss
@@ -79,7 +79,7 @@ $text-light: rgba(255, 255, 255, .87);
 
 // Typography
 $font-family: 'Open Sans', Roboto, 'Helvetica Neue', sans-serif;
-$OpenSansPath: '../fonts';
+$OpenSansPath: '~open-sans-fontface/fonts';
 
 //TODO Clean these variables, replace with color palette
 $white: #fff;


=====================================
frontend-ng/src/vendor.scss
=====================================
--- a/frontend-ng/src/vendor.scss
+++ b/frontend-ng/src/vendor.scss
@@ -1,7 +1,7 @@
 // Open Sans font
-@import '~open-sans-fontface/sass/variables';
-$OpenSansPath: '~open-sans-fontface/fonts'; 
+@import 'styles/variables';
 
+@import '~open-sans-fontface/sass/variables';
 @import '~open-sans-fontface/sass/mixins';
 @import '~open-sans-fontface/sass/Regular';
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/d6f2deabf6cf18f46bad74d926e4828128b81f04...77b1d8e6925319710aed5702d33815bb0e00ca4e

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn