From d0ea99c8f2606c8ca7d171f1a54c9724804fead2 Mon Sep 17 00:00:00 2001 From: Riccardo Graziosi Date: Tue, 10 May 2022 20:16:03 +0200 Subject: [PATCH] Remove dark mode (for now ;) --- app/javascript/components/Board/NewPost.tsx | 2 +- .../stylesheets/components/Board.scss | 6 -- .../stylesheets/components/Comments.scss | 6 -- .../stylesheets/components/LikeButton.scss | 20 ------ .../stylesheets/components/Post.scss | 19 ----- .../stylesheets/general/_components.scss | 17 ----- app/javascript/stylesheets/general/_form.scss | 19 ----- .../stylesheets/general/_header.scss | 72 +------------------ .../stylesheets/general/_index.scss | 20 ------ app/views/devise/confirmations/new.html.erb | 2 +- app/views/devise/passwords/edit.html.erb | 2 +- app/views/devise/passwords/new.html.erb | 2 +- app/views/devise/registrations/edit.html.erb | 2 +- app/views/devise/registrations/new.html.erb | 2 +- app/views/devise/sessions/new.html.erb | 2 +- app/views/devise/unlocks/new.html.erb | 2 +- 16 files changed, 9 insertions(+), 186 deletions(-) diff --git a/app/javascript/components/Board/NewPost.tsx b/app/javascript/components/Board/NewPost.tsx index 6a7170b2..4b8ccc87 100644 --- a/app/javascript/components/Board/NewPost.tsx +++ b/app/javascript/components/Board/NewPost.tsx @@ -154,7 +154,7 @@ class NewPost extends React.Component { { showForm ? 'Cancel' : 'Submit feedback' } : - + Log in / Sign up } diff --git a/app/javascript/stylesheets/components/Board.scss b/app/javascript/stylesheets/components/Board.scss index 5b0680d0..10659509 100644 --- a/app/javascript/stylesheets/components/Board.scss +++ b/app/javascript/stylesheets/components/Board.scss @@ -118,10 +118,4 @@ @extend .mr-2; } } -} - -@media (prefers-color-scheme: dark) { - .postTitle { - color: white; - } } \ No newline at end of file diff --git a/app/javascript/stylesheets/components/Comments.scss b/app/javascript/stylesheets/components/Comments.scss index 46110a7b..dbab1f8a 100644 --- a/app/javascript/stylesheets/components/Comments.scss +++ b/app/javascript/stylesheets/components/Comments.scss @@ -86,10 +86,4 @@ } } } -} - -@media (prefers-color-scheme: dark) { - .commentList .comment .commentFooter .commentLink { - color: white; - } } \ No newline at end of file diff --git a/app/javascript/stylesheets/components/LikeButton.scss b/app/javascript/stylesheets/components/LikeButton.scss index c7b4b46c..c60b271d 100644 --- a/app/javascript/stylesheets/components/LikeButton.scss +++ b/app/javascript/stylesheets/components/LikeButton.scss @@ -28,24 +28,4 @@ text-align: center; font-size: 17px; } -} - -@media (prefers-color-scheme: dark) { - .likeButtonContainer { - .likeButton { - border-bottom-color: white; - - &:hover { - border-bottom-color: black; - } - } - - .likeButton.liked { - border-bottom-color: black; - } - - .likesCountLabel { - color: white; - } - } } \ No newline at end of file diff --git a/app/javascript/stylesheets/components/Post.scss b/app/javascript/stylesheets/components/Post.scss index 0a93cac7..fd09f565 100644 --- a/app/javascript/stylesheets/components/Post.scss +++ b/app/javascript/stylesheets/components/Post.scss @@ -118,23 +118,4 @@ color: $astuto-black; } } -} - -@media (prefers-color-scheme: dark) { - .postDescription { - color: white !important; - } - - .badgeLight { - color: white; - } - - .postAndCommentsContainer .postSettings .selectPicker { - background-color: #282828 !important; - color: white !important; - } - - .postAndCommentsContainer .postHeader a { - color: white; - } } \ No newline at end of file diff --git a/app/javascript/stylesheets/general/_components.scss b/app/javascript/stylesheets/general/_components.scss index bbd553a6..db881bf9 100644 --- a/app/javascript/stylesheets/general/_components.scss +++ b/app/javascript/stylesheets/general/_components.scss @@ -133,21 +133,4 @@ a { @extend .badge-light; background-color: $astuto-grey; -} - -@media (prefers-color-scheme: dark) { - .card { - color: white; - background-color: $astuto-black; - } - - .alert-primary { - background-color: #00bc8c; - border-color: #fff; - } - - .alert-danger { - background-color: #E74C3C; - border-color: #fff; - } } \ No newline at end of file diff --git a/app/javascript/stylesheets/general/_form.scss b/app/javascript/stylesheets/general/_form.scss index a7892bc2..a65a0dc4 100644 --- a/app/javascript/stylesheets/general/_form.scss +++ b/app/javascript/stylesheets/general/_form.scss @@ -39,23 +39,4 @@ .switch { @extend .custom-control-input; -} - -@media (prefers-color-scheme: dark) { - .deviseLinks { - a { color: white; } - } - - .form-control, .form-control:focus { - color: white; - background-color: $astuto-grey; - } - - .form-control { - border-color: grey; - } - - .form-control:focus { - border-color: white; - } } \ No newline at end of file diff --git a/app/javascript/stylesheets/general/_header.scss b/app/javascript/stylesheets/general/_header.scss index fb864230..cb5d56cc 100644 --- a/app/javascript/stylesheets/general/_header.scss +++ b/app/javascript/stylesheets/general/_header.scss @@ -63,74 +63,4 @@ .dropdown-item:active { background-color: $astuto-black; } -} - -@media (prefers-color-scheme: dark) { - .navbar { - background-color: $astuto-black; - - .fullname { - color: $navbar-dark-brand-color; - } - - .navbar-brand { - color: $navbar-dark-brand-color; - - @include hover-focus { - color: $navbar-dark-brand-hover-color; - } - } - - .dropdown-menu { - background-color: #363636; - } - - .dropdown-item { - color: white; - &:hover { - background-color: black; - } - } - - .navbar-nav { - .nav-link { - color: $navbar-dark-color; - - @include hover-focus { - color: $navbar-dark-hover-color; - } - - &.disabled { - color: $navbar-dark-disabled-color; - } - } - - .show > .nav-link, - .active > .nav-link, - .nav-link.show, - .nav-link.active { - color: $navbar-dark-active-color; - } - } - - .navbar-toggler { - color: $navbar-dark-color; - border-color: $navbar-dark-toggler-border-color; - } - - .navbar-toggler-icon { - background-image: $navbar-dark-toggler-icon-bg; - } - - .navbar-text { - color: $navbar-dark-color; - a { - color: $navbar-dark-active-color; - - @include hover-focus { - color: $navbar-dark-active-color; - } - } - } - } -} +} \ No newline at end of file diff --git a/app/javascript/stylesheets/general/_index.scss b/app/javascript/stylesheets/general/_index.scss index 421ce607..29705062 100644 --- a/app/javascript/stylesheets/general/_index.scss +++ b/app/javascript/stylesheets/general/_index.scss @@ -34,24 +34,4 @@ color: #fff; background-color: #343a40; border-color: #343a40; -} - -@media (prefers-color-scheme: dark) { - html, body { - background-color: #242424; - } - - .container, h2 { - color: white; - } - - .loginInfo { - color: white; - } - - .btn { - color: #212529; - background-color: #f8f9fa; - border-color: #f8f9fa; - } } \ No newline at end of file diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 8678fd23..0a209990 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -9,7 +9,7 @@
- <%= f.submit "Resend confirmation instructions", class: "btn btn-block" %> + <%= f.submit "Resend confirmation instructions", class: "btn btn-dark btn-block" %>
<% end %> diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index c584820c..8e713d2f 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -20,7 +20,7 @@
- <%= f.submit "Change my password", class: "btn btn-primary" %> + <%= f.submit "Change my password", class: "btn btn-dark btn-primary" %>
<% end %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index c4793312..2b8e8ba6 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -9,7 +9,7 @@
- <%= f.submit "Send me reset password instructions", class: "btn btn-block" %> + <%= f.submit "Send me reset password instructions", class: "btn btn-dark btn-block" %>
<% end %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 3090dbfd..f89ab022 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -55,7 +55,7 @@
- <%= f.submit "Update profile", class: "btn btn-block" %> + <%= f.submit "Update profile", class: "btn btn-dark btn-block" %>
<% end %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 5fab4059..8e4f4a94 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -24,7 +24,7 @@
- <%= f.submit "Sign up", class: "btn btn-block" %> + <%= f.submit "Sign up", class: "btn btn-dark btn-block" %>
<% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 08a26bf1..ed241070 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -19,7 +19,7 @@ <% end %>
- <%= f.submit "Log in", class: "btn btn-block" %> + <%= f.submit "Log in", class: "btn btn-dark btn-block" %>
<% end %> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index ffc34de8..a4940868 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -9,7 +9,7 @@
- <%= f.submit "Resend unlock instructions" %> + <%= f.submit "Resend unlock instructions", class: "btn btn-dark btn-block" %>
<% end %>