diff --git a/.gitignore b/.gitignore index 1aa21199e4..a1eb1c7670 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ /client/css/violet.css /client/css/violet-vertical.css /client/css/espo-rtl.css +/client/css/hazyblue.css /client/css/hazyblue-vertical.css /tests/unit/testData/cache/* diff --git a/Gruntfile.js b/Gruntfile.js index 0dcc342832..b90ba201ad 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -92,6 +92,14 @@ module.exports = function (grunt) { 'client/css/hazyblue-vertical.css': 'frontend/less/hazyblue-vertical/main.less', } }, + hazyblue: { + options: { + yuicompress: true, + }, + files: { + 'client/css/hazyblue.css': 'frontend/less/hazyblue/main.less', + } + }, sakura: { options: { yuicompress: true, diff --git a/application/Espo/Resources/i18n/en_US/Global.json b/application/Espo/Resources/i18n/en_US/Global.json index cc6e476506..7ba43063b9 100644 --- a/application/Espo/Resources/i18n/en_US/Global.json +++ b/application/Espo/Resources/i18n/en_US/Global.json @@ -651,10 +651,11 @@ "Espo": "Espo", "EspoRtl": "RTL Espo", "Sakura": "Sakura", - "EspoVertical": "Espo (sidebar)", - "SakuraVertical": "Sakura (sidebar)", + "EspoVertical": "Espo w/ sidebar", + "SakuraVertical": "Sakura w/ sidebar", "Violet": "Violet", - "VioletVertical": "Violet (sidebar)", - "HazyblueVertical": "Hazyblue" + "VioletVertical": "Violet w/ sidebar", + "Hazyblue": "Hazyblue", + "HazyblueVertical": "Hazyblue w/ sidebar" } } diff --git a/application/Espo/Resources/metadata/themes/Hazyblue.json b/application/Espo/Resources/metadata/themes/Hazyblue.json new file mode 100644 index 0000000000..b4fbf79257 --- /dev/null +++ b/application/Espo/Resources/metadata/themes/Hazyblue.json @@ -0,0 +1,6 @@ +{ + "stylesheet": "client/css/hazyblue.css", + "dashboardCellHeight": 155, + "dashboardCellMargin": 19, + "navbarHeight": 44 +} \ No newline at end of file diff --git a/diff.js b/diff.js index 5b8e278018..a4da472490 100644 --- a/diff.js +++ b/diff.js @@ -82,6 +82,7 @@ execute('git diff --name-only ' + versionFrom, function (stdout) { fileList.push('client/css/sakura-vertical.css'); fileList.push('client/css/violet.css'); fileList.push('client/css/violet-vertical.css'); + fileList.push('client/css/hazyblue.css'); fileList.push('client/css/hazyblue-vertical.css'); fileList.push('client/css/espo-rtl.css'); diff --git a/frontend/less/hazyblue/custom.less b/frontend/less/hazyblue/custom.less new file mode 100644 index 0000000000..8f5deb4124 --- /dev/null +++ b/frontend/less/hazyblue/custom.less @@ -0,0 +1,5 @@ +@media screen and (min-width: @screen-sm-min) { + #navbar .nav.navbar-nav.navbar-right { + background-color: @navbar-inverse-bg; + } +} diff --git a/frontend/less/hazyblue/main.less b/frontend/less/hazyblue/main.less new file mode 100644 index 0000000000..ed56b266fd --- /dev/null +++ b/frontend/less/hazyblue/main.less @@ -0,0 +1,15 @@ +@import "../espo/bootstrap/bootstrap.less"; + +@import "../espo/variables.less"; +@import "../hazyblue-vertical/variables.less"; + +@import "../espo/mixins.less"; + +@import "../espo/misc.less"; +@import "../espo/layout.less"; +@import "../espo/custom.less"; +@import "../hazyblue-vertical/custom.less"; + +@import "custom.less"; + +@import "../espo/bootstrap/utilities.less";