From 6de5cc726446e4fabdca59f344ac272eb2ee8fa1 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 23 Apr 2022 00:07:58 +0200 Subject: [PATCH] fds --- files/assets/css/reddit.css | 513 ++---------------------- files/assets/css/reddit_dark.css | 206 ---------- files/routes/settings.py | 2 +- files/templates/authforms.html | 4 +- files/templates/chat.html | 2 +- files/templates/default.html | 4 +- files/templates/log.html | 4 +- files/templates/login.html | 2 +- files/templates/login_2fa.html | 2 +- files/templates/settings.html | 2 +- files/templates/settings2.html | 4 +- files/templates/settings_profile.html | 2 +- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- 14 files changed, 43 insertions(+), 708 deletions(-) delete mode 100644 files/assets/css/reddit_dark.css diff --git a/files/assets/css/reddit.css b/files/assets/css/reddit.css index e6d92fb63..fbad89dda 100644 --- a/files/assets/css/reddit.css +++ b/files/assets/css/reddit.css @@ -1,532 +1,73 @@ +@import 'midnight.css'; + :root { - --white: white !important; - --black1: #888 !important; - --black2: #222222 !important; - --black3: #4f4f4f !important; - --grey : #ccc !important; - --red: #4f86b5 !important; - --blue: #0000ff !important; - --upvote: #ff8b60 !important; - --downvote: #9393ff !important; - --sticky: #228822 !important; - - --primary: #0099FF !important; - /*--bg1: url('../images/classic1.webp') !important; - --bg2: url('../images/classic2.webp') !important;*/ -} - -/*navbar*/ -.navbar-light, .navbar .container-fluid, #mobile-bottom-navigation-bar { - background-color: var(--white) !important; -} - -.form-inline.search input { - background-color: white !important; -} - -.nav.settings-nav { - background-color: var(--red); -} - -.nav-link.active { - color: var(--white) !important; - box-shadow: inset 0 -2px 0 var(--white) !important; -} - -.nav-link { - color: var(--grey) !important; -} - -/*common*/ -body, .card, #main-content-row { - background-color: var(--white) !important; - background-image: var(--bg2) !important; - color: var(--black1); -} - -.posts .card { - border-color: var(--grey) !important; -} - -.btn-primary, .btn-secondary { - background-color: var(--red) !important; - color: white !important; - border-color: transparent; + --upvote: #ff8b60; + --downvote: #9393ff; + --sticky: #50bb50; + --primary: #53baff !important; } +/*voting*/ .score-up, .active.arrow-up::before, .arrow-up::after, .arrow-up:hover::before { - color: var(--upvote) !important; + color: var(--upvote) !important; } .score-down, .active.arrow-down::before, .arrow-down::after, .arrow-down:hover::before { - color: var(--downvote) !important; + color: var(--downvote) !important; } .arrow-up::before, .arrow-down::before, .score { - color: var(--black1); + color: var(--muted); } -.controversial { - color: var(--red) !important; +.btn.caction .score-up { + color: var(--upvote) !important; } -a { - color: var(--blue); -} - -.post-title a { - color: var(--blue) !important; -} - -.fa-thumbtack.text-admin, .card.stickied .post-title a, #frontpage .card.stickied .post-title a:visited { - color: var(--sticky) !important; -} - -.flaggers, .flaggers a { - background-color: white !important; - color: var(--black3) !important; - border-color: var(--grey); -} - -.dropdown-menu, .dropdown-menu a { - color: var(--black3); - background-color: white; -} - -.popover, .pop-username, .pop-bio, .popover-user-profile, .popover-user-profile * { - background-color: var(--white); - color: var(--black3); - border-color: var(--black1) !important; -} - -.text-muted { - color: var(--grey) !important; +.btn.caction .score-down { + color: var(--downvote) !important; } /*frontpage*/ #frontpage .container { - max-width: 2160px; - padding-left: 20px; - padding-right: 20px; + max-width: 1800px; + padding-left: 20px; + padding-right: 20px; background-color:transparent !important; - margin-top:-40px !important; } #frontpage .d-lg-flex, #frontpage .font-weight-bold.py-3 { - display: none !important; -} - -#frontpage .sidebar { - background-color: white !important; - color: black; + display: none !important; } #frontpage .col.h-100.custom-gutters .row .col { - background-image: none !important; + background-image: none !important; background-color: transparent; } #frontpage .dropdown .btn { - background-color:#000066 !important; - color:#0099FF; - text-shadow: none !important; - border-color: var(--primary); - font-size: revert; + text-shadow: none !important; border-radius:0; } -#frontpage .dropdown-toggle, #frontpage i.fas.mr-1 { - color:#0099FF !important; -} - #frontpage .post-img { border-radius:0; } -/*post*/ -.post-meta, .post-actions a, .post-actions button, .nav-link .fas, label, small, .comment-actions * { - color: var(--black1) !important; -} - -.comment, .comment-text, .comment-section, .comment-body, .post-body { - background-color: white; - color: var(--black2) !important; -} - -#post-text { - margin: 15px; -} - -.anchor.comment { - border-left: 2px dotted var(--black1) !important; -} - -.comment-collapse-desktop { - border-left: none !important; -} - -blockquote { - border-left: 2px solid #c5c1ad !important; - background-color: white !important; - color: #4f4f4f !important; -} - -.form-control, .comment-box.form-control.rounded { - background-color: white !important; - color: var(--black2) !important; -} - -.comment-box, .form-control{ - border-color: var(--black1) !important; -} - -.text-info.new-comments { - color: #ff4500 !important; -} - -#thread #dropdownMenuButton { - background-color: var(--red) !important; - color: white !important; - border-color: transparent; -} - -.btn.format { - background-color: transparent !important; - color: var(--black1) !important; - border-color: transparent !important; -} - -/*userpage*/ -#userpage .nav.settings-nav { - background-color: transparent; -} - -#userpage .nav-link { - color: var(--red) !important; -} - -#userpage .nav-link.active { - box-shadow: inset 0 -2px 0 var(--red) !important; -} - -/*leaderboard*/ -#settings2 .container, #settings2 .container-fluid { - background-color: transparent !important; -} - -#settings2 .bg-white { - background-color: var(--white) !important; -} - -#settings2 .text-muted { - color: var(--black1) !important; -} - -#settings2 .nav.settings-nav { - margin: auto !important; -} - -#settings2 .table { - color: var(--black1); -} - -/*shop*/ -#message .container { - background-color: transparent !important; -} - -#message .table { - color: var(--black1); -} - -/*submit*/ -#submit .container { - background-color: transparent !important -} - -#submit .text-muted { - color: var(--black1) !important; -} - -#submit #create_button { - background-color: var(--red) !important; - color: white !important; - border-color: transparent; -} - -#submit .btn.format { - background-color: transparent !important; - color: var(--black1) !important; - border-color: transparent !important; -} - -#submit .row.fixed-bottom { - background-color: var(--white) !important -} - -/*settings*/ -#settings .text-small, #settings .text-small-extra { - color: var(--black1) !important; -} - -#settings .custom-control-label::before { - background-color: var(--grey) !important; -} - -#settings .custom-control-input:checked ~ .custom-control-label::before { - opacity: 1; - background-color: var(--black1) !important; - border: var(--blue) solid 0.1px; -} - -/*assorted patches I don't feel like categorizing*/ -#followers-table td { - color: var(--black3); -} - -.btn-danger { - border-color: #E53E3E !important; - color: red !important; -} - -.btn.caction .score-up { - color: var(--upvote) !important; -} - -.btn.caction .score-down { - color: var(--downvote) !important; -} - -.user-info .text-muted { - color: var(--black1) !important; -} - -.shop .btn { - background-color: var(--black1) !important; -} - -#mobile-bottom-navigation-bar .text-primary { - color: var(--red) !important; -} - -#mobile-bottom-navigation-bar .text-muted { - color: var(--black1) !important; -} - -#settings2 .nav-link.active .fas { - color: var(--white) !important; -} - -#navbarResponsive .nav-link { - color: var(--black1) !important; -} - -.mobile-nav-icon { - color: var(--black1); -} - -/*patch*/ -#frontpage .container { - margin-top: -5px -} - -.table { - color: var(--black3) -} - -:root { - --gold: #f59e0b !important; - --pink: #ec72de !important; - --purple: #9333ea !important; - --bluecheck: #1DA1F2 !important; - --red-hover: #4270a2 !important -} - -#settings2 .text-muted { - color: var(--black3)!important; -} - -.fa-robot { - color: var(--purple) !important; +.d-flex.justify-content-between.align-items-center.pt-3.pb-2.sorting { + float: left !important; } +/*janny*/ .fa-broom { - color: var(--sticky) !important; + color: var(--sticky) !important; } -.post-title span.patron { - background-color: var(--purple) -} - -.btn-primary:hover, .btn-secondary:hover { - background-color: var(--red-hover) !important; - color: white!important; - border-color: var(--red-hover) -} - -.dropdown-menu a:hover { - color: var(--red); - background-color: #fff; - font-weight: bold; -} - -#frontpage .card-header div { - z-index: 2 !important; -} - -#navbarResponsive .nav-link:hover i { - color: var(--red) !important; -} - -.btn-secondary:focus, .btn-secondary.focus { - box-shadow: none; - background-color: white!important; - color: var(--red)!important; - border-color: var(--red); -} - -.shop .btn { - border-color: var(--grey) !important; - background-color: var(--red) !important; -} - -.nav-link.active { - font-weight: bold; -} - -a.text-danger, button.text-danger { - color: #dc3545 !important +.fa-thumbtack.text-admin, .card.stickied .post-title a, #frontpage .card.stickied .post-title a:visited { + color: var(--sticky) !important; } a.text-info, button.text-info { - color: var(--sticky) !important + color: var(--sticky) !important } - -label.custom-control-label::after, label.custom-control-label::before { - background-color: var(--black1) !important -} - -.custom-control-input:checked ~ .custom-control-label::after { - background-color: var(--grey) !important; -} - -#settings .sticky { - top: 70px; -} - -.border-bottom { - border-bottom: 1px solid var(--grey) !important; -} - -a.nav-link:hover { - color: white !important -} - -.nav.settings-nav { - border: 1px solid var(--red-hover) -} - -#thread .anchor.comment { - border-left: 2px solid var(--grey)!important; -} - -.anchor.comment.mt-0 { - border-left: none !important; -} - -.notifs .anchor.comment { - border-left: none !important; -} - -.notifs .comment-collapse-desktop { - border-left: 2px solid var(--grey)!important; -} - -#userpage .nav.settings-nav { - border:none; -} - -#userpage .btn-danger { - background-color:red !important; - color: white !important; - border-color: var(--gold) !important -} - -#userpage .btn-success { - background-color: var(--sticky) !important; - color: white !important; - border-color: var(--gold) !important -} - -#userpage .container-fluid.pb-0.text-center.bg-white.d-md-none { - margin-top: -32px !important; -} - -#userpage .profile-pic-65 { - border-radius: 0; - border-color: transparent !important; -} - -#settings2 .nav.settings-nav .fas { - color: var(--grey) !important -} - -#settings2 .nav-link.active .fas { - color: white !important -} - -#settings2 .btn .fas { - color: white !important -} - -#frontpage .settings .d-lg-flex { - display: block !important; -} - -#frontpage .container .col-lg-8 { - background-image: none !important; -} - -#post-text a, #post-text img { - margin-left: 0px; - margin-right: 0px; - margin-top: 0px; -} - -.tooltip { - color:black !important; -} - -#frontpage .btn.btn-secondary.text-small-m { - color: #ff0 !important; - text-shadow: -1px -1px 0 #000,1px -1px 0 #000,-1px 1px 0 #000,1px 1px 0 #000 !important; - background: transparent !important; -} - - -.d-flex.justify-content-between.align-items-center.pt-3.pb-2.sorting { - float: left !important; - padding-top: 0 !important; -} - -.sorting { - padding-bottom: 0 !important; -} - -.comment-anchor:target, .unread { - background: #88888833 !important; - padding: 12px; -} - -#chat-window { - background-color: white !important; -} - -.chat-message { - color: var(--black2) !important; -} - -#frontpage .post-title a:visited, .visited { - color: #551a8b !important; -} \ No newline at end of file diff --git a/files/assets/css/reddit_dark.css b/files/assets/css/reddit_dark.css deleted file mode 100644 index 1d33715e5..000000000 --- a/files/assets/css/reddit_dark.css +++ /dev/null @@ -1,206 +0,0 @@ -@import 'reddit.css?v=55'; - -/*navbar*/ -.navbar-light, .navbar .container-fluid, #mobile-bottom-navigation-bar { - background-color: var(--black2) !important; -} - -.form-inline.search input { - background-color: var(--black1) !important; -} - -.nav-link.active { - color: var(--white) !important; - box-shadow: inset 0 -2px 0 var(--white) !important; -} - -.nav-link { - color: var(--grey) !important; -} - -/*common*/ -body, .card, #main-content-row { - background-color: var(--black2) !important; - /*background-image: var(--bg2);*/ - color: var(--white); -} - -.posts .card { - border-color: var(--black3) !important; -} - -.arrow-up::before, .arrow-down::before, .score { - color: var(--black1); -} - -.post-title a { - color: var(--grey) !important; -} - -.flaggers, .flaggers a { - background-color: var(--black2) !important; - color: var(--black1) !important; - border-color: var(--grey); -} - -.dropdown-menu, .dropdown-menu a { - color: var(--grey); - background-color: var(--black2); -} - -.popover, .pop-username, .pop-bio, .popover-user-profile, .popover-user-profile * { - background-color: var(--black2); - color: var(--grey); - border-color: var(--black1) !important; -} - -.text-muted { - color: var(--grey) !important; -} - -/*frontpage*/ -#frontpage .sidebar { - background-color: var(--black2) !important; - color: var(--grey); -} - -#frontpage .dropdown .btn { - background-color:transparent !important; - color:yellow; - text-shadow: -1px -1px 0 black, 1px -1px 0 black, -1px 1px 0 black, 1px 1px 0 black !important; - border-color: transparent; - font-size: 1.3rem; -} - -#frontpage .dropdown-toggle, #frontpage i.fas.mr-1 { - color:yellow !important; -} - -/*post*/ -.post-meta, .post-actions a, .post-actions button, .nav-link .fas, label, small, .comment-actions * { - color: var(--grey) !important; -} - -.comment, .comment-text, .comment-section, .comment-body, .post-body { - background-color: var(--black2); - color: var(--grey) !important; -} - -blockquote { - border-left: 2px solid #c5c1ad !important; - background-color: var(--black3) !important; - color: var(--grey) !important; -} - -.form-control, .comment-box.form-control.rounded { - background-color: var(--black2) !important; - color: var(--black1) !important; -} - -#thread #dropdownMenuButton { - background-color: var(--red) !important; - color: white !important; - border-color: transparent; -} - -.btn.format { - background-color: transparent !important; - color: var(--black1) !important; - border-color: transparent !important; -} - -/*leaderboard*/ -#settings2 .bg-white { - background-color: var(--black2) !important; -} - -/*submit*/ -#submit .row.fixed-bottom { - background-color: var(--black2) !important -} - -/*assorted patches I don't feel like categorizing*/ -#followers-table td { - color: var(--black1); -} - -#mobile-bottom-navigation-bar .text-primary { - color: var(--red) !important; -} - -#mobile-bottom-navigation-bar .text-muted { - color: var(--black1) !important; -} - -#settings2 .nav-link.active .fas { - color: var(--grey) !important; -} - -#navbarResponsive .nav-link { - color: var(--black1) !important; -} - -.mobile-nav-icon { - color: var(--black1); -} - -/*patch*/ -#settings2 .text-muted { - color: var(--black3)!important; -} - -.btn-primary:hover, .btn-secondary:hover { - background-color: var(--red-hover) !important; - color: white!important; - border-color: var(--red-hover) -} - -.dropdown-menu a:hover { - color: var(--red); - background-color: #fff; - font-weight: bold; -} - -#navbarResponsive .nav-link:hover i { - color: var(--red) !important; -} - -.btn-secondary:focus, .btn-secondary.focus { - box-shadow: none; - background-color: white!important; - color: var(--red)!important; - border-color: var(--red); -} - -a.nav-link:hover { - color: white !important -} - -.nav.settings-nav { - border: 1px solid var(--red-hover) -} - -#thread .anchor.comment { - border-left: 2px solid var(--black1)!important; -} - -.notifs .comment-collapse-desktop { - border-left: 2px solid var(--black1)!important; -} - -.srd { - background-color: var(--black3) !important -} - -#navbar .form-control.w-100 { - color: var(--white) !important; -} - -/*chat*/ -.chat-message { - color: var(--white) !important; -} - -#frontpage .post-title a:visited, .visited { - color: #6e6e6e !important; -} \ No newline at end of file diff --git a/files/routes/settings.py b/files/routes/settings.py index d955fe446..ef9d5733e 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -289,7 +289,7 @@ def settings_profile_post(v): theme = request.values.get("theme") if theme: - if theme in {"dramblr", "reddit", "reddit_dark", "classic", "classic_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"}: + if theme in {"dramblr", "reddit", "classic", "classic_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"}: if theme == "transparent" and not v.background: return {"error": "You need to set a background to use the transparent theme!"} v.theme = theme diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 3c90c79b1..0d4e00117 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/chat.html b/files/templates/chat.html index fbd7dad99..d8ced9108 100644 --- a/files/templates/chat.html +++ b/files/templates/chat.html @@ -15,7 +15,7 @@ - + {% if v.css %} {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index c0b280ccc..92380fa48 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -8,7 +8,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% if sub and sub.css and not request.path.endswith('settings') %} diff --git a/files/templates/log.html b/files/templates/log.html index 14248c617..eceb6f397 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index 465ed0a8b..f82cf1aec 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -19,7 +19,7 @@ - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index e063ee501..cdb610ece 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 311931e00..a8b08b7d4 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/settings_profile.html b/files/templates/settings_profile.html index a9719b1d7..927c75440 100644 --- a/files/templates/settings_profile.html +++ b/files/templates/settings_profile.html @@ -132,7 +132,7 @@ {% if SITE_NAME == 'rDrama' %} {% set themes = ["dramblr", "classic", "classic_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %} {% else %} - {% set themes = ["dramblr", "reddit", "reddit_dark", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %} + {% set themes = ["dramblr", "reddit", "transparent", "win98", "dark", "light", "coffee", "tron", "4chan", "midnight"] %} {% endif %} {% for entry in themes %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index efa160da6..5eac5d154 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 30de25543..d7dac7d51 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - +