Merge "Naming convention using 'skin' as entrance point"
This commit is contained in:
commit
1bdfdac199
|
@ -76,7 +76,7 @@ class VectorTemplate extends BaseTemplate {
|
||||||
|
|
||||||
$this->templateParser = $templateParser;
|
$this->templateParser = $templateParser;
|
||||||
$this->isLegacy = $isLegacy;
|
$this->isLegacy = $isLegacy;
|
||||||
$this->templateRoot = $isLegacy ? 'legacy' : 'index';
|
$this->templateRoot = $isLegacy ? 'skin-legacy' : 'skin';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
@border-color-base: @wmui-color-base0;
|
@border-color-base: @wmui-color-base0;
|
||||||
@border-color-footer: #eee;
|
@border-color-footer: #eee;
|
||||||
|
|
||||||
/* These styles retain the existing typography in index.less
|
/* These styles retain the existing typography in skin.less
|
||||||
In future (when deploying these styles) we may want to refactor skins.vector.styles
|
In future (when deploying these styles) we may want to refactor skins.vector.styles
|
||||||
to apply certain styles in print as well as screen mode. */
|
to apply certain styles in print as well as screen mode. */
|
||||||
.toc,
|
.toc,
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
"desktop",
|
"desktop",
|
||||||
"mobile"
|
"mobile"
|
||||||
],
|
],
|
||||||
"styles": [ "resources/skins.vector.styles/legacy.less" ]
|
"styles": [ "resources/skins.vector.styles/skin-legacy.less" ]
|
||||||
},
|
},
|
||||||
"skins.vector.styles": {
|
"skins.vector.styles": {
|
||||||
"class": "ResourceLoaderSkinModule",
|
"class": "ResourceLoaderSkinModule",
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
"desktop",
|
"desktop",
|
||||||
"mobile"
|
"mobile"
|
||||||
],
|
],
|
||||||
"styles": [ "resources/skins.vector.styles/index.less" ]
|
"styles": [ "resources/skins.vector.styles/skin.less" ]
|
||||||
},
|
},
|
||||||
"skins.vector.icons": {
|
"skins.vector.icons": {
|
||||||
"class": "ResourceLoaderImageModule",
|
"class": "ResourceLoaderImageModule",
|
||||||
|
@ -76,7 +76,7 @@
|
||||||
},
|
},
|
||||||
"skins.vector.js": {
|
"skins.vector.js": {
|
||||||
"packageFiles": [
|
"packageFiles": [
|
||||||
"resources/skins.vector.js/index.js",
|
"resources/skins.vector.js/skin.js",
|
||||||
"resources/skins.vector.legacy.js/collapsibleTabs.js",
|
"resources/skins.vector.legacy.js/collapsibleTabs.js",
|
||||||
"resources/skins.vector.legacy.js/vector.js"
|
"resources/skins.vector.legacy.js/vector.js"
|
||||||
],
|
],
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
},
|
},
|
||||||
"skins.vector.legacy.js": {
|
"skins.vector.legacy.js": {
|
||||||
"packageFiles": [
|
"packageFiles": [
|
||||||
"resources/skins.vector.legacy.js/index.js",
|
"resources/skins.vector.legacy.js/skin-legacy.js",
|
||||||
"resources/skins.vector.legacy.js/collapsibleTabs.js",
|
"resources/skins.vector.legacy.js/collapsibleTabs.js",
|
||||||
"resources/skins.vector.legacy.js/vector.js"
|
"resources/skins.vector.legacy.js/vector.js"
|
||||||
],
|
],
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import mustache from 'mustache';
|
import mustache from 'mustache';
|
||||||
import '../resources/skins.vector.styles/legacy.less';
|
import '../resources/skins.vector.styles/skin-legacy.less';
|
||||||
import legacySkinTemplate from '!!raw-loader!../includes/templates/legacy.mustache';
|
import legacySkinTemplate from '!!raw-loader!../includes/templates/skin-legacy.mustache';
|
||||||
import {
|
import {
|
||||||
LEGACY_TEMPLATE_DATA,
|
LEGACY_TEMPLATE_DATA,
|
||||||
NAVIGATION_TEMPLATE_DATA,
|
NAVIGATION_TEMPLATE_DATA,
|
||||||
|
|
Loading…
Reference in New Issue