File tree Expand file tree Collapse file tree 3 files changed +66
-47
lines changed Expand file tree Collapse file tree 3 files changed +66
-47
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ atlassian*
11
11
/app /config_sandbox
12
12
/app /etc /config.php
13
13
/app /etc /env.php
14
+ /app /etc /themes.js
14
15
/app /code /Magento /TestModule *
15
16
/lib /internal /flex /uploader /.actionScriptProperties
16
17
/lib /internal /flex /uploader /.flexProperties
Original file line number Diff line number Diff line change
1
+ /**
2
+ * Copyright © 2015 Magento. All rights reserved.
3
+ * See COPYING.txt for license details.
4
+ */
5
+
6
+ 'use strict' ;
7
+
8
+ /**
9
+ * Define Themes
10
+ *
11
+ * If you are working with grunt for frontend development,
12
+ * copy this file to themes.js and configure your custom themes.
13
+ *
14
+ * If grunt is not used, you can ignore this file.
15
+ *
16
+ * area: area, one of (frontend|adminhtml|doc),
17
+ * name: theme name in format Vendor/theme-name,
18
+ * locale: locale,
19
+ * files: [
20
+ * 'css/styles-m',
21
+ * 'css/styles-l'
22
+ * ],
23
+ * dsl: dynamic stylesheet language (less|sass)
24
+ *
25
+ */
26
+ module . exports = {
27
+ blank : {
28
+ area : 'frontend' ,
29
+ name : 'Magento/blank' ,
30
+ locale : 'en_US' ,
31
+ files : [
32
+ 'css/styles-m' ,
33
+ 'css/styles-l' ,
34
+ 'css/email' ,
35
+ 'css/email-inline'
36
+ ] ,
37
+ dsl : 'less'
38
+ } ,
39
+ luma : {
40
+ area : 'frontend' ,
41
+ name : 'Magento/luma' ,
42
+ locale : 'en_US' ,
43
+ files : [
44
+ 'css/styles-m' ,
45
+ 'css/styles-l'
46
+ ] ,
47
+ dsl : 'less'
48
+ } ,
49
+ backend : {
50
+ area : 'adminhtml' ,
51
+ name : 'Magento/backend' ,
52
+ locale : 'en_US' ,
53
+ files : [
54
+ 'css/styles-old' ,
55
+ 'css/styles'
56
+ ] ,
57
+ dsl : 'less'
58
+ }
59
+ } ;
Original file line number Diff line number Diff line change 5
5
6
6
'use strict' ;
7
7
8
- /**
9
- * Define Themes
10
- *
11
- * area: area, one of (frontend|adminhtml|doc),
12
- * name: theme name in format Vendor/theme-name,
13
- * locale: locale,
14
- * files: [
15
- * 'css/styles-m',
16
- * 'css/styles-l'
17
- * ],
18
- * dsl: dynamic stylesheet language (less|sass)
19
- *
20
- */
21
- module . exports = {
22
- blank : {
23
- area : 'frontend' ,
24
- name : 'Magento/blank' ,
25
- locale : 'en_US' ,
26
- files : [
27
- 'css/styles-m' ,
28
- 'css/styles-l' ,
29
- 'css/email' ,
30
- 'css/email-inline'
31
- ] ,
32
- dsl : 'less'
33
- } ,
34
- luma : {
35
- area : 'frontend' ,
36
- name : 'Magento/luma' ,
37
- locale : 'en_US' ,
38
- files : [
39
- 'css/styles-m' ,
40
- 'css/styles-l'
41
- ] ,
42
- dsl : 'less'
43
- } ,
44
- backend : {
45
- area : 'adminhtml' ,
46
- name : 'Magento/backend' ,
47
- locale : 'en_US' ,
48
- files : [
49
- 'css/styles-old' ,
50
- 'css/styles'
51
- ] ,
52
- dsl : 'less'
53
- }
54
- } ;
8
+ try {
9
+ module . exports = require ( '../../../../app/etc/themes' ) ;
10
+ } catch ( err ) {
11
+ var e = new Error ( "Please configure your themes in app/etc/themes.js - start with copying themes.template.js" ) ;
12
+ throw e ;
13
+ }
You can’t perform that action at this time.
0 commit comments