From 22195c4a8df091502e81580d2b9aaec24fda12fc Mon Sep 17 00:00:00 2001 From: blackmambaza Date: Tue, 10 Oct 2023 15:20:22 +0200 Subject: [PATCH] Modernized html and added generic font family to css --- src/static/css/timeslider.css | 2 +- src/static/empty.html | 2 +- src/static/skins/colibris/src/components/sidediv.css | 2 +- src/static/skins/colibris/src/components/toolbar.css | 1 - src/static/skins/colibris/src/plugins/tables2.css | 1 - src/templates/admin/index.html | 2 +- src/templates/admin/plugins-info.html | 2 +- src/templates/admin/plugins.html | 2 +- src/templates/admin/settings.html | 2 +- src/templates/index.html | 2 +- src/templates/javascript.html | 2 +- src/templates/pad.html | 2 +- src/templates/timeslider.html | 2 +- src/tests/backend/specs/api/emojis.html | 2 +- src/tests/frontend/index.html | 2 +- src/tests/frontend/runner.css | 4 ++-- 16 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css index 252248b33..550976203 100644 --- a/src/static/css/timeslider.css +++ b/src/static/css/timeslider.css @@ -77,7 +77,7 @@ top: -8px } #timeslider-slider .star:before{ - font-family: fontawesome-etherpad; + font-family: fontawesome-etherpad, sans-serif; color: #da9700; content: "\e856"; vertical-align:middle; diff --git a/src/static/empty.html b/src/static/empty.html index ef02d22ca..980373c56 100644 --- a/src/static/empty.html +++ b/src/static/empty.html @@ -1 +1 @@ -Empty +Empty diff --git a/src/static/skins/colibris/src/components/sidediv.css b/src/static/skins/colibris/src/components/sidediv.css index c48d38f6a..5e74c180d 100644 --- a/src/static/skins/colibris/src/components/sidediv.css +++ b/src/static/skins/colibris/src/components/sidediv.css @@ -13,7 +13,7 @@ #sidedivinner>div .line-number { line-height: inherit; - font-family: RobotoMono; + font-family: RobotoMono, sans-serif; display: inline-block; color: #576273; color: var(--text-soft-color); diff --git a/src/static/skins/colibris/src/components/toolbar.css b/src/static/skins/colibris/src/components/toolbar.css index 7f3e71403..1780dd677 100644 --- a/src/static/skins/colibris/src/components/toolbar.css +++ b/src/static/skins/colibris/src/components/toolbar.css @@ -5,7 +5,6 @@ background-color: var(--bg-color); color: #576273; color: var(--text-soft-color); - border-bottom: none; } #editbar.editor-scrolled { diff --git a/src/static/skins/colibris/src/plugins/tables2.css b/src/static/skins/colibris/src/plugins/tables2.css index d24056d4b..0f19b422c 100644 --- a/src/static/skins/colibris/src/plugins/tables2.css +++ b/src/static/skins/colibris/src/plugins/tables2.css @@ -95,7 +95,6 @@ .yui-skin-sam .yui-panel-container .yui-panel .hd { cursor: move; - padding: 0; border: 0; background: 0; margin: 0; diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index d4478153a..e30eb4a5d 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -1,5 +1,5 @@ - + Admin Dashboard - Etherpad diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 57e41f852..49195005c 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -1,5 +1,5 @@ - + Plugin information - Etherpad diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 278304faf..815fd541f 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,5 +1,5 @@ - + Plugin manager - Etherpad diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index ffa4172f7..fbdc2bd3c 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -1,5 +1,5 @@ - + Settings - Etherpad diff --git a/src/templates/index.html b/src/templates/index.html index 4d08312f9..8f93434be 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -2,7 +2,7 @@ var settings = require("ep_etherpad-lite/node/utils/Settings"); %> - + <%=settings.title%> diff --git a/src/templates/javascript.html b/src/templates/javascript.html index 42482f69d..9b5b673ff 100644 --- a/src/templates/javascript.html +++ b/src/templates/javascript.html @@ -1,5 +1,5 @@ - + JavaScript license information diff --git a/src/templates/pad.html b/src/templates/pad.html index 54e1897d9..c0c17608b 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -5,7 +5,7 @@ ; %> - + <% e.begin_block("htmlHead"); %> <% e.end_block(); %> diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index e26cd11e7..3ab4e402f 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -3,7 +3,7 @@ , langs = require("ep_etherpad-lite/node/hooks/i18n").availableLangs %> - + <%=settings.title%> Timeslider