diff --git a/frontend/less/espo-rtl/main.less b/frontend/less/espo-rtl/main.less index 1a749daf42..381719ca4b 100644 --- a/frontend/less/espo-rtl/main.less +++ b/frontend/less/espo-rtl/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "bootstrap-rtl/bootstrap-rtl.less"; diff --git a/frontend/less/espo-vertical/main.less b/frontend/less/espo-vertical/main.less index 4feeb2af0b..fd38742294 100644 --- a/frontend/less/espo-vertical/main.less +++ b/frontend/less/espo-vertical/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "../espo/variables.less"; @import "variables.less"; @@ -10,7 +10,7 @@ @import "../espo/custom.less"; @import "custom.less"; -@import "../espo/bootstrap/utilities.less"; +@import "../espo/utilities.less"; body { --theme-name: EspoVertical; diff --git a/frontend/less/espo/fonts.less b/frontend/less/espo/fonts.less index e22e326321..d45c9cd50b 100644 --- a/frontend/less/espo/fonts.less +++ b/frontend/less/espo/fonts.less @@ -3,76 +3,78 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 400; - src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot'); /* IE9 Compat Modes */ + src: url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot'); /* IE9 Compat Modes */ src: local('Open Sans Regular'), local('OpenSans-Regular'), - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.svg#OpenSans') format('svg'); /* Legacy iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff') format('woff'), /* Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-regular.svg#OpenSans') format('svg'); /* Legacy iOS */ } /* open-sans-italic - cyrillic_latin_cyrillic-ext_latin-ext */ @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 400; - src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot'); /* IE9 Compat Modes */ + src: url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot'); /* IE9 Compat Modes */ src: local('Open Sans Italic'), local('OpenSans-Italic'), - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.svg#OpenSans') format('svg'); /* Legacy iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.woff') format('woff'), /* Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-italic.svg#OpenSans') format('svg'); /* Legacy iOS */ } /* open-sans-600 - cyrillic_latin_cyrillic-ext_latin-ext */ @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 600; - src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot'); /* IE9 Compat Modes */ + src: url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot'); /* IE9 Compat Modes */ src: local('Open Sans SemiBold'), local('OpenSans-SemiBold'), - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.svg#OpenSans') format('svg'); /* Legacy iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff2') format('woff2'), /* Super Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.woff') format('woff'), /* Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.ttf') format('truetype'), /* Safari, Android, iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600.svg#OpenSans') format('svg'); /* Legacy iOS */ } /* open-sans-600italic - cyrillic_latin_cyrillic-ext_latin-ext */ @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 600; - src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot'); /* IE9 Compat Modes */ + src: url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot'); /* IE9 Compat Modes */ src: local('Open Sans SemiBold Italic'), local('OpenSans-SemiBoldItalic'), - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.svg#OpenSans') format('svg'); /* Legacy iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.woff') format('woff'), /* Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-600italic.svg#OpenSans') format('svg'); /* Legacy iOS */ } /* open-sans-700 - cyrillic_latin_cyrillic-ext_latin-ext */ @font-face { font-family: 'Open Sans'; font-style: normal; font-weight: 700; - src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot'); /* IE9 Compat Modes */ + src: url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot'); /* IE9 Compat Modes */ src: local('Open Sans Bold'), local('OpenSans-Bold'), - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.svg#OpenSans') format('svg'); /* Legacy iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2') format('woff2'), /* Super Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.woff') format('woff'), /* Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700.svg#OpenSans') format('svg'); /* Legacy iOS */ } /* open-sans-700italic - cyrillic_latin_cyrillic-ext_latin-ext */ @font-face { font-family: 'Open Sans'; font-style: italic; font-weight: 700; - src: url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot'); /* IE9 Compat Modes */ + src: url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot'); /* IE9 Compat Modes */ src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff2') format('woff2'), /* Super Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff') format('woff'), /* Modern Browsers */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../../fonts/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.svg#OpenSans') format('svg'); /* Legacy iOS */ -} \ No newline at end of file + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.woff') format('woff'), /* Modern Browsers */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('@{font-path}/open-sans/open-sans-v16-cyrillic_latin_cyrillic-ext_latin-ext-700italic.svg#OpenSans') format('svg'); /* Legacy iOS */ +} + +@font-path: "../../fonts"; diff --git a/frontend/less/espo/init.less b/frontend/less/espo/init.less new file mode 100644 index 0000000000..6fdb28ed36 --- /dev/null +++ b/frontend/less/espo/init.less @@ -0,0 +1 @@ +@import "bootstrap/bootstrap.less"; diff --git a/frontend/less/espo/main.less b/frontend/less/espo/main.less index dadf5ba432..d962afb9e8 100644 --- a/frontend/less/espo/main.less +++ b/frontend/less/espo/main.less @@ -1,4 +1,4 @@ -@import "bootstrap/bootstrap.less"; +@import "init.less"; @import "variables.less"; @import "mixins.less"; @@ -6,7 +6,7 @@ @import "layout.less"; @import "custom.less"; -@import "bootstrap/utilities.less"; +@import "utilities.less"; body { --theme-name: Espo; diff --git a/frontend/less/espo/utilities.less b/frontend/less/espo/utilities.less new file mode 100644 index 0000000000..06e750dcbc --- /dev/null +++ b/frontend/less/espo/utilities.less @@ -0,0 +1 @@ +@import "bootstrap/utilities.less"; diff --git a/frontend/less/hazyblue-vertical/main.less b/frontend/less/hazyblue-vertical/main.less index 14af213e41..48325fa059 100644 --- a/frontend/less/hazyblue-vertical/main.less +++ b/frontend/less/hazyblue-vertical/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "../espo/variables.less"; @import "../espo-vertical/variables.less"; @@ -14,7 +14,7 @@ @import "custom.less"; -@import "../espo/bootstrap/utilities.less"; +@import "../espo/utilities.less"; body { --theme-name: HazyblueVertical; diff --git a/frontend/less/hazyblue/main.less b/frontend/less/hazyblue/main.less index 5014ead9e1..f713ec1ea9 100644 --- a/frontend/less/hazyblue/main.less +++ b/frontend/less/hazyblue/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "../espo/variables.less"; @import "../hazyblue-vertical/variables.less"; @@ -12,7 +12,7 @@ @import "custom.less"; -@import "../espo/bootstrap/utilities.less"; +@import "../espo/utilities.less"; body { --theme-name: Hazyblue; diff --git a/frontend/less/sakura-vertical/main.less b/frontend/less/sakura-vertical/main.less index 8bc7905783..45dea53664 100644 --- a/frontend/less/sakura-vertical/main.less +++ b/frontend/less/sakura-vertical/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "../espo/variables.less"; @import "../sakura/variables.less"; @@ -11,7 +11,7 @@ @import "../espo/custom.less"; @import "../espo-vertical/custom.less"; -@import "../espo/bootstrap/utilities.less"; +@import "../espo/utilities.less"; body { --theme-name: SakuraVertical; diff --git a/frontend/less/sakura/main.less b/frontend/less/sakura/main.less index 76219626c0..0d6bdfbf5c 100644 --- a/frontend/less/sakura/main.less +++ b/frontend/less/sakura/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "../espo/variables.less"; @import "variables.less"; @import "../espo/mixins.less"; @@ -7,7 +7,7 @@ @import "../espo/layout.less"; @import "../espo/custom.less"; -@import "../espo/bootstrap/utilities.less"; +@import "../espo/utilities.less"; body { --theme-name: Sakura; diff --git a/frontend/less/violet-vertical/main.less b/frontend/less/violet-vertical/main.less index 05d8488873..82b74f939b 100644 --- a/frontend/less/violet-vertical/main.less +++ b/frontend/less/violet-vertical/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "../espo/variables.less"; @import "../violet/variables.less"; @@ -11,7 +11,7 @@ @import "../espo/custom.less"; @import "../espo-vertical/custom.less"; -@import "../espo/bootstrap/utilities.less"; +@import "../espo/utilities.less"; body { --theme-name: VioletVertical; diff --git a/frontend/less/violet/main.less b/frontend/less/violet/main.less index 5fbcc6887a..b49e1c81ca 100644 --- a/frontend/less/violet/main.less +++ b/frontend/less/violet/main.less @@ -1,4 +1,4 @@ -@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/init.less"; @import "../espo/variables.less"; @import "variables.less"; @import "../espo/mixins.less"; @@ -7,7 +7,7 @@ @import "../espo/layout.less"; @import "../espo/custom.less"; -@import "../espo/bootstrap/utilities.less"; +@import "../espo/utilities.less"; body { --theme-name: Violet;