From 3ed7bb1fc6496c515b9ef49a56d3bb12e3287777 Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Mon, 9 Nov 2020 03:13:46 +0900 Subject: [PATCH 1/2] Migrate to bootstrap4 This tried to be similar with current look with bootstrap4. --- setup.py | 2 +- src/bepasty/static/app/css/style.css | 4 ++ src/bepasty/templates/_layout.html | 58 ++++++++++++++++------------ src/bepasty/templates/_utils.html | 14 +++---- src/bepasty/templates/display.html | 12 +++--- src/bepasty/templates/error.html | 6 +-- src/bepasty/templates/filelist.html | 2 +- src/bepasty/templates/index.html | 46 ++++++++++++---------- src/bepasty/templates/qr.html | 22 +++++------ 9 files changed, 92 insertions(+), 74 deletions(-) diff --git a/setup.py b/setup.py index f4f823ce..65def474 100755 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ 'xstatic', 'XStatic-asciinema-player', 'xstatic-bootbox', - 'xstatic-bootstrap<4.0.0.0', + 'xstatic-bootstrap>=4.0.0.0,<5.0.0.0', 'xstatic-font-awesome', 'xstatic-jquery', 'xstatic-jquery-ui', diff --git a/src/bepasty/static/app/css/style.css b/src/bepasty/static/app/css/style.css index 434c0f45..5443ff42 100644 --- a/src/bepasty/static/app/css/style.css +++ b/src/bepasty/static/app/css/style.css @@ -96,6 +96,8 @@ body { /* override pygments table highlighting style */ table.highlighttable { width: 100%; + border: 1px solid #ccc; + background-color: #f5f5f5; } .linenodiv pre, .highlight pre { @@ -103,6 +105,7 @@ table.highlighttable { -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + padding: 9.5px; } .highlight p { @@ -121,6 +124,7 @@ table.highlighttable { .highlight pre { padding-left: 0; padding-right: 0; + border-left: 1px solid #ccc; } /* Set minimal width and let the contents push the block width */ diff --git a/src/bepasty/templates/_layout.html b/src/bepasty/templates/_layout.html index b1781083..6bfdcef5 100644 --- a/src/bepasty/templates/_layout.html +++ b/src/bepasty/templates/_layout.html @@ -2,7 +2,7 @@ - + @@ -24,40 +24,48 @@
-