diff --git a/.gitignore b/.gitignore index dfd148d387..aee91b995f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ /frontend/client/css/espo-vertical.css /frontend/client/css/sakura.css /frontend/client/css/sakura-vertical.css +/frontend/client/css/violet.css +/frontend/client/css/violet-vertical.css /tests/testData/cache/* composer.phar vendor/ diff --git a/Gruntfile.js b/Gruntfile.js index 8c3b0ee594..8f5422cf86 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -66,15 +66,7 @@ module.exports = function (grunt) { }, files: { 'frontend/client/css/espo.css': 'frontend/less/espo/main.less', - }, - }, - sakura: { - options: { - yuicompress: true, - }, - files: { - 'frontend/client/css/sakura.css': 'frontend/less/sakura/main.less', - }, + } }, espoVertical: { options: { @@ -82,7 +74,15 @@ module.exports = function (grunt) { }, files: { 'frontend/client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less', + } + }, + sakura: { + options: { + yuicompress: true, }, + files: { + 'frontend/client/css/sakura.css': 'frontend/less/sakura/main.less', + } }, sakuraVertical: { options: { @@ -90,7 +90,23 @@ module.exports = function (grunt) { }, files: { 'frontend/client/css/sakura-vertical.css': 'frontend/less/sakura-vertical/main.less', + } + }, + violet: { + options: { + yuicompress: true, }, + files: { + 'frontend/client/css/violet.css': 'frontend/less/violet/main.less', + } + }, + violetVertical: { + options: { + yuicompress: true, + }, + files: { + 'frontend/client/css/violet-vertical.css': 'frontend/less/violet-vertical/main.less', + } } }, cssmin: { diff --git a/application/Espo/Resources/i18n/en_US/Global.json b/application/Espo/Resources/i18n/en_US/Global.json index 1050d42f80..52bce54b5c 100644 --- a/application/Espo/Resources/i18n/en_US/Global.json +++ b/application/Espo/Resources/i18n/en_US/Global.json @@ -592,6 +592,8 @@ "Espo": "Espo", "Sakura": "Sakura", "EspoVertical": "Espo Vertical", - "SakuraVertical": "Sakura Vertical" + "SakuraVertical": "Sakura Vertical", + "Violet": "Violet", + "VioletVertical": "Violet Vertical" } } diff --git a/application/Espo/Resources/metadata/themes/Violet.json b/application/Espo/Resources/metadata/themes/Violet.json new file mode 100644 index 0000000000..74abd50e99 --- /dev/null +++ b/application/Espo/Resources/metadata/themes/Violet.json @@ -0,0 +1,5 @@ +{ + "stylesheet": "client/css/violet.css", + "dashboardCellHeight": 155, + "dashboardCellMargin": 19 +} \ No newline at end of file diff --git a/application/Espo/Resources/metadata/themes/VioletVertical.json b/application/Espo/Resources/metadata/themes/VioletVertical.json new file mode 100644 index 0000000000..e762bbc2f8 --- /dev/null +++ b/application/Espo/Resources/metadata/themes/VioletVertical.json @@ -0,0 +1,9 @@ +{ + "stylesheet": "client/css/violet-vertical.css", + "navbarIsVertical": true, + "navbarStaticItemsHeight": 65, + "recordTopButtonsStickTop": 61, + "recordTopButtonsBlockHeight": 21, + "dashboardCellHeight": 155, + "dashboardCellMargin": 19 +} \ No newline at end of file diff --git a/frontend/less/violet-vertical/main.less b/frontend/less/violet-vertical/main.less new file mode 100644 index 0000000000..c2c5f08a1a --- /dev/null +++ b/frontend/less/violet-vertical/main.less @@ -0,0 +1,14 @@ +@import "../espo/bootstrap/bootstrap.less"; + +@import "../espo/variables.less"; +@import "../violet/variables.less"; +@import "../espo-vertical/variables.less"; + +@import "../espo/mixins.less"; + +@import "../espo/misc.less"; +@import "../espo-vertical/layout.less"; +@import "../espo/custom.less"; +@import "../espo-vertical/custom.less"; + +@import "../espo/bootstrap/utilities.less"; diff --git a/frontend/less/violet/main.less b/frontend/less/violet/main.less new file mode 100644 index 0000000000..70b3475561 --- /dev/null +++ b/frontend/less/violet/main.less @@ -0,0 +1,9 @@ +@import "../espo/bootstrap/bootstrap.less"; +@import "../espo/variables.less"; +@import "variables.less"; +@import "../espo/mixins.less"; + +@import "../espo/misc.less"; +@import "../espo/layout.less"; +@import "../espo/custom.less"; +@import "../espo/bootstrap/utilities.less"; diff --git a/frontend/less/violet/variables.less b/frontend/less/violet/variables.less new file mode 100644 index 0000000000..a6294db342 --- /dev/null +++ b/frontend/less/violet/variables.less @@ -0,0 +1,19 @@ + +@gray-base: #1A1A1A; + +@main-gray: #E0E0F3; +@input-border: @main-gray; + +@body-bg: #FAFBFC; + +@brand-primary: #768ED2; +@brand-success: #7BC169; +@brand-danger: #D06473; + +@link-color: #6e86ca; + +@navbar-inverse-color: #FFF; +@navbar-inverse-bg: #8E5C9C; +@navbar-inverse-link-color: #F7F7F7; + +@login-panel-heading-bg: @brand-primary;