From e6a0080c0eb679a897addc6d7a125c615893b13c Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 3 Aug 2015 17:06:12 +0300 Subject: [PATCH] vertical theme --- .gitignore | 1 + Gruntfile.js | 8 + .../metadata/themes/EspoVertical.json | 4 + frontend/client/res/templates/site/navbar.tpl | 2 +- frontend/client/src/views/site/navbar.js | 148 ++++++++++-------- frontend/less/espo-vertical/custom.less | 1 + frontend/less/espo-vertical/main.less | 11 ++ frontend/less/espo-vertical/navbar.less | 57 +++++++ frontend/less/espo-vertical/variables.less | 1 + frontend/less/espo/custom.less | 13 -- frontend/less/espo/main.less | 1 + frontend/less/espo/navbar.less | 45 ++++++ frontend/less/sacura/main.less | 1 + 13 files changed, 210 insertions(+), 83 deletions(-) create mode 100644 application/Espo/Resources/metadata/themes/EspoVertical.json create mode 100644 frontend/less/espo-vertical/custom.less create mode 100644 frontend/less/espo-vertical/main.less create mode 100644 frontend/less/espo-vertical/navbar.less create mode 100644 frontend/less/espo-vertical/variables.less create mode 100644 frontend/less/espo/navbar.less diff --git a/.gitignore b/.gitignore index b790bc680f..3f8b006fac 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ /main.html /frontend/client/css/bootstrap.css /frontend/client/css/espo.css +/frontend/client/css/espo-vertical.css /frontend/client/css/sacura.css /tests/testData/cache/* composer.phar diff --git a/Gruntfile.js b/Gruntfile.js index 8421704491..ba523f227c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -75,6 +75,14 @@ module.exports = function (grunt) { 'frontend/client/css/sacura.css': 'frontend/less/sacura/main.less', }, }, + espoVertical: { + options: { + yuicompress: true, + }, + files: { + 'frontend/client/css/espo-vertical.css': 'frontend/less/espo-vertical/main.less', + }, + }, }, cssmin: { minify: { diff --git a/application/Espo/Resources/metadata/themes/EspoVertical.json b/application/Espo/Resources/metadata/themes/EspoVertical.json new file mode 100644 index 0000000000..c9919fb565 --- /dev/null +++ b/application/Espo/Resources/metadata/themes/EspoVertical.json @@ -0,0 +1,4 @@ +{ + "stylesheet": "client/css/espo-vertical.css", + "navbarHorizontalAdjustDisabled": true +} \ No newline at end of file diff --git a/frontend/client/res/templates/site/navbar.tpl b/frontend/client/res/templates/site/navbar.tpl index f60cfff024..8a4e84cd53 100644 --- a/frontend/client/res/templates/site/navbar.tpl +++ b/frontend/client/res/templates/site/navbar.tpl @@ -1,4 +1,4 @@ -