From eb5fb5342e9f5ec9998ef0d4fd118ab2d02948bf Mon Sep 17 00:00:00 2001 From: djmaze Date: Tue, 1 Sep 2020 21:50:17 +0200 Subject: [PATCH] Cleanup bootstrap --- README.md | 22 +- dev/External/ko.js | 9 +- dev/Styles/_BootstrapFix.less | 50 +- .../templates/Views/Admin/PopupsDomain.html | 2 +- .../templates/Views/Admin/PopupsPlugin.html | 4 +- .../app/templates/Views/Common/PopupsAsk.html | 2 +- .../Common/PopupsKeyboardShortcutsHelp.html | 2 +- .../Views/Common/PopupsLanguages.html | 4 +- .../templates/Views/User/PopupsAccount.html | 2 +- .../Views/User/PopupsAddOpenPgpKey.html | 2 +- .../Views/User/PopupsAdvancedSearch.html | 4 +- .../templates/Views/User/PopupsCompose.html | 2 +- .../Views/User/PopupsComposeOpenPgp.html | 2 +- .../templates/Views/User/PopupsContacts.html | 2 +- .../templates/Views/User/PopupsFilter.html | 2 +- .../Views/User/PopupsFolderClear.html | 2 +- .../Views/User/PopupsFolderCreate.html | 2 +- .../Views/User/PopupsFolderSystem.html | 4 +- .../templates/Views/User/PopupsIdentity.html | 2 +- .../Views/User/PopupsMessageOpenPgp.html | 2 +- .../Views/User/PopupsNewOpenPgpKey.html | 2 +- .../templates/Views/User/PopupsTemplate.html | 2 +- .../User/PopupsTwoFactorConfiguration.html | 2 +- .../Views/User/PopupsTwoFactorTest.html | 2 +- .../Views/User/PopupsViewOpenPgpKey.html | 2 +- vendors/bootstrap/js/bootstrap.js | 452 ---- vendors/bootstrap/js/bootstrap.min.js | 6 - vendors/bootstrap/js/bootstrap.min.orig.js | 6 - vendors/bootstrap/js/bootstrap.native.js | 340 ++- vendors/bootstrap/js/bootstrap.native.min.js | 2 +- vendors/bootstrap/js/bootstrap.orig.js | 2280 ----------------- vendors/bootstrap/less/modals.less | 4 +- vendors/bootstrap/less/utilities.less | 3 - vendors/ckeditor/adapters/jquery.js | 10 - 34 files changed, 192 insertions(+), 3044 deletions(-) delete mode 100644 vendors/bootstrap/js/bootstrap.js delete mode 100644 vendors/bootstrap/js/bootstrap.min.js delete mode 100644 vendors/bootstrap/js/bootstrap.min.orig.js delete mode 100644 vendors/bootstrap/js/bootstrap.orig.js delete mode 100644 vendors/ckeditor/adapters/jquery.js diff --git a/README.md b/README.md index 9fc16828e..832c364e4 100644 --- a/README.md +++ b/README.md @@ -84,23 +84,23 @@ Things might work in Edge 18, Firefox 50-62 and Chrome 54-68 due to one polyfill |js/* |1.14.0 |native | |----------- |--------: |--------: | -|admin.js |2.130.942 | 963.702 | -|app.js |4.184.455 |2.626.733 | +|admin.js |2.130.942 | 963.418 | +|app.js |4.184.455 |2.626.441 | |boot.js | 671.522 | 43.824 | -|libs.js | 647.614 | 313.912 | +|libs.js | 647.614 | 313.017 | |polyfills.js | 325.834 | 0 | -|TOTAL |7.960.367 |3.948.171 | +|TOTAL |7.960.367 |3.946.700 | |js/min/* |1.14.0 |native |gzip 1.14 |gzip |brotli | |--------------- |--------: |--------: |--------: |--------: |--------: | -|admin.min.js | 252.147 | 130.802 | 73.657 | 37.916 | 32.474 | -|app.min.js | 511.202 | 354.471 |140.462 | 93.386 | 74.944 | +|admin.min.js | 252.147 | 130.790 | 73.657 | 37.900 | 32.527 | +|app.min.js | 511.202 | 354.459 |140.462 | 93.370 | 74.823 | |boot.min.js | 66.007 | 5.564 | 22.567 | 2.327 | 1.989 | -|libs.min.js | 572.545 | 297.403 |176.720 | 92.006 | 81.186 | +|libs.min.js | 572.545 | 296.508 |176.720 | 91.754 | 81.012 | |polyfills.min.js | 32.452 | 0 | 11.312 | 0 | 0 | -|TOTAL |1.434.353 | 788.240 |424.718 |225.635 |190.593 | +|TOTAL |1.434.353 | 788.018 |424.718 |225.351 |190.351 | -646.113 bytes (199.083 gzip) is not much, but it feels faster. +646.335 bytes (199.367 gzip) is not much, but it feels faster. ### CSS changes @@ -125,8 +125,8 @@ Things might work in Edge 18, Firefox 50-62 and Chrome 54-68 due to one polyfill |css/* |1.14.0 |native | |-------------- |--------: |--------: | -|app.css | 340.334 | 265.871 | -|app.min.css | 274.791 | 211.493 | +|app.css | 340.334 | 265.090 | +|app.min.css | 274.791 | 210.876 | ### PHP73 branch diff --git a/dev/External/ko.js b/dev/External/ko.js index 52c4a40b2..ff77be497 100644 --- a/dev/External/ko.js +++ b/dev/External/ko.js @@ -119,13 +119,8 @@ ko.bindingHandlers.dropdownCloser = { ko.bindingHandlers.popover = { init: (element, fValueAccessor) => { - console.log('TODO: $(element).popover removed', element, fValueAccessor); -/* - $(element).popover(ko.unwrap(fValueAccessor())); - ko.utils.domNodeDisposal.addDisposeCallback(element, () => { - $(element).popover('destroy'); - }); -*/ + const conf = ko.unwrap(fValueAccessor()); + element.title = conf.content; // conf.title } }; diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less index 2ee231532..1598b57b0 100644 --- a/dev/Styles/_BootstrapFix.less +++ b/dev/Styles/_BootstrapFix.less @@ -198,45 +198,6 @@ select { box-shadow: 0px 1px 2px rgba(0,0,0,0.2); } -.tooltip { - font-size: 14px; - z-index: 2000 !important; - overflow: hidden; - text-overflow: ellipsis; - - &.show { - opacity: 1; - } - - .tooltip-inner { - max-width: 380px; - text-shadow: 0px 0px 5px rgba(0, 0, 0, 0.2); - padding: 5px 10px; - border-radius: 2px; - overflow: hidden; - text-overflow: ellipsis; - } - - .tooltip-big { - font-size: 18px; - padding: 0 10px; - white-space: nowrap; - } -} - -.popover { - width: auto; - min-width: 250px; - max-width: 550px; - - .popover-content pre { - border: none; - background: rgba(0, 0, 0, 0); - padding: 0; - word-break: normal; - } -} - .btn-group > .btn { border-radius: 0 !important; } @@ -322,10 +283,6 @@ select { color: #555; } -.popover { - z-index: 2000; -} - html.no-rgba .modal { border-width: 0px !important; } @@ -364,12 +321,7 @@ html.no-rgba .modal { } .modal.fade { - .transition(none); - top: 0; -} - -.modal.fade.show { - top: 0; + transition: none; } .modal-backdrop { diff --git a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html index e091eaf4a..43c9343a2 100644 --- a/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html +++ b/rainloop/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html @@ -1,5 +1,5 @@
-