From a2edc3cf4e8ae4c20b92e2834eabab69c3271216 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 24 Feb 2017 12:38:42 +0200 Subject: [PATCH] theme changes --- .../Resources/metadata/themes/Sakura.json | 4 +- .../metadata/themes/SakuraVertical.json | 4 +- .../Resources/metadata/themes/Violet.json | 4 +- .../metadata/themes/VioletVertical.json | 4 +- frontend/less/espo/mixins/side-modal.less | 49 ++++++++++++++++++ frontend/less/espo/variables.less | 2 + frontend/less/hazyblue-vertical/custom.less | 51 ------------------- frontend/less/hazyblue-vertical/main.less | 2 + frontend/less/hazyblue/main.less | 2 + frontend/less/sakura-vertical/main.less | 2 + frontend/less/sakura/main.less | 3 ++ frontend/less/violet-vertical/main.less | 2 + frontend/less/violet/main.less | 3 ++ 13 files changed, 77 insertions(+), 55 deletions(-) create mode 100644 frontend/less/espo/mixins/side-modal.less diff --git a/application/Espo/Resources/metadata/themes/Sakura.json b/application/Espo/Resources/metadata/themes/Sakura.json index a2d1175c76..7e3764885d 100644 --- a/application/Espo/Resources/metadata/themes/Sakura.json +++ b/application/Espo/Resources/metadata/themes/Sakura.json @@ -2,5 +2,7 @@ "stylesheet": "client/css/sakura.css", "dashboardCellHeight": 155, "dashboardCellMargin": 19, - "navbarHeight": 44 + "navbarHeight": 44, + "modalFooterAtTheTop": true, + "modalFullHeight": true } \ No newline at end of file diff --git a/application/Espo/Resources/metadata/themes/SakuraVertical.json b/application/Espo/Resources/metadata/themes/SakuraVertical.json index 9eace3a292..0b1d07d982 100644 --- a/application/Espo/Resources/metadata/themes/SakuraVertical.json +++ b/application/Espo/Resources/metadata/themes/SakuraVertical.json @@ -5,5 +5,7 @@ "recordTopButtonsStickTop": 61, "recordTopButtonsBlockHeight": 21, "dashboardCellHeight": 155, - "dashboardCellMargin": 19 + "dashboardCellMargin": 19, + "modalFooterAtTheTop": true, + "modalFullHeight": true } \ No newline at end of file diff --git a/application/Espo/Resources/metadata/themes/Violet.json b/application/Espo/Resources/metadata/themes/Violet.json index ef6c35d407..0977ab1e13 100644 --- a/application/Espo/Resources/metadata/themes/Violet.json +++ b/application/Espo/Resources/metadata/themes/Violet.json @@ -2,5 +2,7 @@ "stylesheet": "client/css/violet.css", "dashboardCellHeight": 155, "dashboardCellMargin": 19, - "navbarHeight": 44 + "navbarHeight": 44, + "modalFooterAtTheTop": true, + "modalFullHeight": true } \ No newline at end of file diff --git a/application/Espo/Resources/metadata/themes/VioletVertical.json b/application/Espo/Resources/metadata/themes/VioletVertical.json index e762bbc2f8..b0a36b7041 100644 --- a/application/Espo/Resources/metadata/themes/VioletVertical.json +++ b/application/Espo/Resources/metadata/themes/VioletVertical.json @@ -5,5 +5,7 @@ "recordTopButtonsStickTop": 61, "recordTopButtonsBlockHeight": 21, "dashboardCellHeight": 155, - "dashboardCellMargin": 19 + "dashboardCellMargin": 19, + "modalFooterAtTheTop": true, + "modalFullHeight": true } \ No newline at end of file diff --git a/frontend/less/espo/mixins/side-modal.less b/frontend/less/espo/mixins/side-modal.less new file mode 100644 index 0000000000..acc5730bd4 --- /dev/null +++ b/frontend/less/espo/mixins/side-modal.less @@ -0,0 +1,49 @@ +.modal-footer { + margin-top: 0; +} + +.modal-header { + background-color: @white-color; + padding-top: 8px; + padding-bottom: 8px; +} + +.modal-footer > .main-btn-group { + float: left; +} + +.modal-footer > .additional-btn-group { + float: right; +} + +.dialog-confirm .modal-footer > .main-btn-group { + float: right; +} + +.dialog-confirm .modal-footer > .additional-btn-group { + float: left; +} + +.modal-footer { + padding-top: @modal-title-padding; + padding-bottom: @modal-title-padding; +} + +@media (min-width: @screen-sm-min) { + .modal-dialog { + margin: 0 0 0 auto; + } + .modal-content .note-editor > .modal > .modal-dialog { + margin: 0 0 0 -@container-padding; + } + + .dialog-confirm > .modal-dialog { + margin: 0 auto; + } +} + +@media (max-width: @screen-sm-min) { + .modal-dialog { + margin: 0 0 0 0; + } +} \ No newline at end of file diff --git a/frontend/less/espo/variables.less b/frontend/less/espo/variables.less index d4b1f110f8..5496a6aab0 100644 --- a/frontend/less/espo/variables.less +++ b/frontend/less/espo/variables.less @@ -78,6 +78,8 @@ @navbar-inverse-link-disabled-bg: transparent; @navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%); +@white-color: #fafbfc; + @body-bg: #FEFEFE; @panel-bg: #FFF; diff --git a/frontend/less/hazyblue-vertical/custom.less b/frontend/less/hazyblue-vertical/custom.less index d662e27b72..a4c496be5a 100644 --- a/frontend/less/hazyblue-vertical/custom.less +++ b/frontend/less/hazyblue-vertical/custom.less @@ -33,10 +33,6 @@ background-color: @white-color; } -.modal-footer { - margin-top: 0; -} - .panel-heading > .btn-group { top: -5px; right: -10px; @@ -119,12 +115,6 @@ table.table { margin-bottom: 10px; } -.modal-header { - background-color: @white-color; - padding-top: 8px; - padding-bottom: 8px; -} - .calendar-container > .calendar, .calendar-container > .timeline { background-color: @white-color; @@ -151,44 +141,3 @@ table.table { background-color: @navbar-bg !important; padding-bottom: 0; } - -.modal-footer > .main-btn-group { - float: left; -} - -.modal-footer > .additional-btn-group { - float: right; -} - -.dialog-confirm .modal-footer > .main-btn-group { - float: right; -} - -.dialog-confirm .modal-footer > .additional-btn-group { - float: left; -} - -.modal-footer { - padding-top: @modal-title-padding; - padding-bottom: @modal-title-padding; -} - -@media (min-width: @screen-sm-min) { - .modal-dialog { - margin: 0 0 0 auto; - } - .modal-content .note-editor > .modal > .modal-dialog { - margin: 0 0 0 -@container-padding; - } - - .dialog-confirm > .modal-dialog { - margin: 0 auto; - } -} - -@media (max-width: @screen-sm-min) { - .modal-dialog { - margin: 0 0 0 0; - } -} - diff --git a/frontend/less/hazyblue-vertical/main.less b/frontend/less/hazyblue-vertical/main.less index d762432b54..94f8c8163a 100644 --- a/frontend/less/hazyblue-vertical/main.less +++ b/frontend/less/hazyblue-vertical/main.less @@ -14,4 +14,6 @@ @import "custom.less"; +@import "../espo/mixins/side-modal.less"; + @import "../espo/bootstrap/utilities.less"; diff --git a/frontend/less/hazyblue/main.less b/frontend/less/hazyblue/main.less index ed56b266fd..46a89989f7 100644 --- a/frontend/less/hazyblue/main.less +++ b/frontend/less/hazyblue/main.less @@ -12,4 +12,6 @@ @import "custom.less"; +@import "../espo/mixins/side-modal.less"; + @import "../espo/bootstrap/utilities.less"; diff --git a/frontend/less/sakura-vertical/main.less b/frontend/less/sakura-vertical/main.less index 09580dd432..ede5b751a4 100644 --- a/frontend/less/sakura-vertical/main.less +++ b/frontend/less/sakura-vertical/main.less @@ -11,4 +11,6 @@ @import "../espo/custom.less"; @import "../espo-vertical/custom.less"; +@import "../espo/mixins/side-modal.less"; + @import "../espo/bootstrap/utilities.less"; diff --git a/frontend/less/sakura/main.less b/frontend/less/sakura/main.less index 70b3475561..23f8305f55 100644 --- a/frontend/less/sakura/main.less +++ b/frontend/less/sakura/main.less @@ -6,4 +6,7 @@ @import "../espo/misc.less"; @import "../espo/layout.less"; @import "../espo/custom.less"; + +@import "../espo/mixins/side-modal.less"; + @import "../espo/bootstrap/utilities.less"; diff --git a/frontend/less/violet-vertical/main.less b/frontend/less/violet-vertical/main.less index c2c5f08a1a..b3dcb2f6bb 100644 --- a/frontend/less/violet-vertical/main.less +++ b/frontend/less/violet-vertical/main.less @@ -11,4 +11,6 @@ @import "../espo/custom.less"; @import "../espo-vertical/custom.less"; +@import "../espo/mixins/side-modal.less"; + @import "../espo/bootstrap/utilities.less"; diff --git a/frontend/less/violet/main.less b/frontend/less/violet/main.less index 70b3475561..23f8305f55 100644 --- a/frontend/less/violet/main.less +++ b/frontend/less/violet/main.less @@ -6,4 +6,7 @@ @import "../espo/misc.less"; @import "../espo/layout.less"; @import "../espo/custom.less"; + +@import "../espo/mixins/side-modal.less"; + @import "../espo/bootstrap/utilities.less";