From 2b0e1aae74bf95b5b8c1c018e7bc339866195973 Mon Sep 17 00:00:00 2001 From: Holger Graef Date: Thu, 20 Apr 2023 19:27:41 +0200 Subject: [PATCH] [WIP] upgrade to Bootstrap 5 --- Makefile | 5 +- app/static/.gitignore | 3 +- app/static/css/sidebars.css | 91 +++++++++++ app/templates/base.html | 71 +++++++-- app/templates/main/main.html | 4 +- app/templates/racine.html | 33 ++-- app/templates/skeleton.html | 8 +- js/package.json | 5 +- js/src/index.js | 279 +++++++++++++++++----------------- js/src/views/main/dragdrop.js | 2 +- 10 files changed, 322 insertions(+), 179 deletions(-) create mode 100644 app/static/css/sidebars.css diff --git a/Makefile b/Makefile index 5e63e3177..e1d837146 100644 --- a/Makefile +++ b/Makefile @@ -265,7 +265,7 @@ install-mathjax: install-js-dependencies: install-mathjax api-client mkdir -p app/static/css - mkdir -p app/static/fonts + mkdir -p app/static/css/fonts # install typeahead.js wget -O js/src/typeahead/typeahead.bundle.js \ @@ -288,7 +288,8 @@ install-js-dependencies: install-mathjax api-client cd js && npm install && npx rollup -c cp js/node_modules/bootstrap/dist/css/bootstrap.min.css app/static/css/bootstrap.min.css - cp js/node_modules/bootstrap/dist/fonts/* app/static/fonts/ + cp js/node_modules/bootstrap-icons/font/bootstrap-icons.css app/static/css/bootstrap-icons.css + cp js/node_modules/bootstrap-icons/font/fonts/* app/static/css/fonts/ cp js/node_modules/bootstrap-toc/dist/bootstrap-toc.min.css app/static/css/bootstrap-toc.min.css diff --git a/app/static/.gitignore b/app/static/.gitignore index 34d99c29c..bbfa72ed8 100644 --- a/app/static/.gitignore +++ b/app/static/.gitignore @@ -1,11 +1,12 @@ mathjax/ css/bootstrap.min.css +css/bootstrap-icons.css css/bootstrap-toc.min.css css/lightbox.css css/typeahead.css -fonts/ +css/fonts/ images/close.png images/loading.gif diff --git a/app/static/css/sidebars.css b/app/static/css/sidebars.css new file mode 100644 index 000000000..0fdae06b8 --- /dev/null +++ b/app/static/css/sidebars.css @@ -0,0 +1,91 @@ +/* from https://getbootstrap.com/docs/5.0/examples/sidebars/sidebars.css */ + +body { + min-height: 100vh; + min-height: -webkit-fill-available; +} + +html { + height: -webkit-fill-available; +} + +main { + display: flex; + flex-wrap: nowrap; + height: 100vh; + height: -webkit-fill-available; + max-height: 100vh; + overflow-x: auto; + overflow-y: hidden; +} + +.b-example-divider { + flex-shrink: 0; + width: 1.5rem; + height: 100vh; + background-color: rgba(0, 0, 0, .1); + border: solid rgba(0, 0, 0, .15); + border-width: 1px 0; + box-shadow: inset 0 .5em 1.5em rgba(0, 0, 0, .1), inset 0 .125em .5em rgba(0, 0, 0, .15); +} + +.bi { + vertical-align: -.125em; + pointer-events: none; + fill: currentColor; +} + +.dropdown-toggle { outline: 0; } + +.nav-flush .nav-link { + border-radius: 0; +} + +.btn-toggle { + display: inline-flex; + align-items: center; + padding: .25rem .5rem; + font-weight: 600; + color: rgba(0, 0, 0, .65); + background-color: transparent; + border: 0; +} +.btn-toggle:hover, +.btn-toggle:focus { + color: rgba(0, 0, 0, .85); + background-color: #d2f4ea; +} + +.btn-toggle::before { + width: 1.25em; + line-height: 0; + content: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='rgba%280,0,0,.5%29' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M5 14l6-6-6-6'/%3e%3c/svg%3e"); + transition: transform .35s ease; + transform-origin: .5em 50%; +} + +.btn-toggle[aria-expanded="true"] { + color: rgba(0, 0, 0, .85); +} +.btn-toggle[aria-expanded="true"]::before { + transform: rotate(90deg); +} + +.btn-toggle-nav a { + display: inline-flex; + padding: .1875rem .5rem; + margin-top: .125rem; + margin-left: 1.25rem; + text-decoration: none; +} +.btn-toggle-nav a:hover, +.btn-toggle-nav a:focus { + background-color: #d2f4ea; +} + +.scrollarea { + overflow-y: auto; +} + +.fw-semibold { font-weight: 600; } +.lh-tight { line-height: 1.25; } diff --git a/app/templates/base.html b/app/templates/base.html index f80a52e5c..383861b43 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -2,6 +2,7 @@ {% block styles %} {{ super() }} +