Browse Source

Merge pull request #5635 from Semantic-Org/revert-5543-next

Revert "[Build Tools] Default theme folder can be configured"
pull/5637/merge
Jack Lukic 7 years ago
committed by GitHub
parent
commit
ef89b56617
2 changed files with 2 additions and 6 deletions
  1. 3
      src/theme.config.example
  2. 5
      src/theme.less

3
src/theme.config.example

@ -76,9 +76,6 @@
Folders Folders
*******************************/ *******************************/
/* Path to default theme folder */
@defaultThemeFolder : 'default';
/* Path to theme packages */ /* Path to theme packages */
@themesFolder : 'themes'; @themesFolder : 'themes';

5
src/theme.less

@ -13,7 +13,7 @@
---------------------*/ ---------------------*/
/* Default site.variables */ /* Default site.variables */
@import "@{themesFolder}/@{defaultThemeFolder}/globals/site.variables";
@import "@{themesFolder}/default/globals/site.variables";
/* Packaged site.variables */ /* Packaged site.variables */
@import "@{themesFolder}/@{site}/globals/site.variables"; @import "@{themesFolder}/@{site}/globals/site.variables";
@ -30,7 +30,7 @@
---------------------*/ ---------------------*/
/* Default */ /* Default */
@import "@{themesFolder}/@{defaultThemeFolder}/@{type}s/@{element}.variables";
@import "@{themesFolder}/default/@{type}s/@{element}.variables";
/* Packaged Theme */ /* Packaged Theme */
@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.variables"; @import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.variables";
@ -56,7 +56,6 @@
-------------------*/ -------------------*/
.loadUIOverrides() { .loadUIOverrides() {
@import (optional) "@{themesFolder}/@{defaultThemeFolder}/@{type}s/@{element}.overrides";
@import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.overrides"; @import (optional) "@{themesFolder}/@{theme}/@{type}s/@{element}.overrides";
@import (optional) "@{siteFolder}/@{type}s/@{element}.overrides"; @import (optional) "@{siteFolder}/@{type}s/@{element}.overrides";
} }
Loading…
Cancel
Save