Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add web theme (light/dark) configuration in sidekiq.yml #4453

Closed
wants to merge 2 commits into from
Closed

Add web theme (light/dark) configuration in sidekiq.yml #4453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e29cc7
Add web theme (light/dark) configiration
kihaya Feb 7, 2020
be8efdb
Test to accept web theme configuration
kihaya Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions test/config.yml
View file
Open in desktop
Expand Up @@ -5,3 +5,4 @@
:queues:
- [<%="very_"%>often, 2]
- [seldom, 1]
:web_theme: dark
1 change: 1 addition & 0 deletions test/config_environment.yml
View file
Open in desktop
Expand Up @@ -8,3 +8,4 @@ staging:
:queues:
- [<%="very_"%>often, 2]
- [seldom, 1]
:web_theme: "dark"
1 change: 1 addition & 0 deletions test/config_string.yml
View file
Open in desktop
Expand Up @@ -5,4 +5,5 @@ concurrency: 50
queues:
- [<%="very_"%>often, 2]
- [seldom, 1]
web_theme: dark

4 changes: 4 additions & 0 deletions test/test_cli.rb
View file
Open in desktop
Expand Up @@ -152,6 +152,7 @@ def logdev
assert_equal 50, Sidekiq.options[:concurrency]
assert_equal 2, Sidekiq.options[:queues].count { |q| q == 'very_often' }
assert_equal 1, Sidekiq.options[:queues].count { |q| q == 'seldom' }
assert_equal "dark", Sidekiq.options[:web_theme]
end

it 'accepts stringy keys' do
Expand All @@ -164,6 +165,7 @@ def logdev
assert_equal 50, Sidekiq.options[:concurrency]
assert_equal 2, Sidekiq.options[:queues].count { |q| q == 'very_often' }
assert_equal 1, Sidekiq.options[:queues].count { |q| q == 'seldom' }
assert_equal "dark", Sidekiq.options[:web_theme]
end

it 'accepts environment specific config' do
Expand All @@ -176,6 +178,7 @@ def logdev
assert_equal 50, Sidekiq.options[:concurrency]
assert_equal 2, Sidekiq.options[:queues].count { |q| q == 'very_often' }
assert_equal 1, Sidekiq.options[:queues].count { |q| q == 'seldom' }
assert_equal "dark", Sidekiq.options[:web_theme]
end
end

Expand Down Expand Up @@ -227,6 +230,7 @@ def logdev
assert_equal 100, Sidekiq.options[:concurrency]
assert_equal 7, Sidekiq.options[:queues].count { |q| q == 'often' }
assert_equal 3, Sidekiq.options[:queues].count { |q| q == 'seldom' }
assert_equal "dark", Sidekiq.options[:web_theme]
end
end

Expand Down
126 changes: 1 addition & 125 deletions web/assets/stylesheets/application-dark.css
View file
Open in desktop
@@ -1,125 +1 @@
@media (prefers-color-scheme: dark) {

body {
background-color: #000;
color: #ccc;
}

a,
.title,
.summary_bar ul .count,
.navbar .navbar-brand {
color: #af0014;
}

.navbar .navbar-brand:hover {
color: #ccc;
}

.navbar .navbar-brand .status {
color: #ccc;
}

.navbar-inverse {
background-color: #000;
border-color: #333;
}

table.table-white {
background-color: #111;
}

.table-striped > tbody > tr:nth-of-type(odd) {
background-color: #222;
}

.table-bordered,
.table-bordered > tbody > tr > td,
.table-bordered > tbody > tr > th,
.table-bordered > tfoot > tr > td,
.table-bordered > tfoot > tr > th,
.table-bordered > thead > tr > td,
.table-bordered > thead > tr > th {
border: 1px solid #333;
}

.table-hover > tbody > tr:hover {
background-color: #333;
}

.alert {
border: none;
color: #ccc;
}

.alert-success {
background-color: #000;
}

a:link,
a:active,
a:hover,
a:visited {
color: #63798c;
}

a.btn {
color: #000;
}

.summary_bar .summary {
background-color: #000;
border: 1px solid #333;
}

.navbar-default {
background-color: #000;
border-color: #3d3d3d;
}

.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:focus,
.navbar-default .navbar-nav > .active > a:hover {
color: #ccc;
background-color: #282828;
}

.navbar-default .navbar-nav > li > a:hover {
color: #ccc;
}

.pagination > li > a,
.pagination > li > a:hover,
.pagination > li > span {
color: #ccc;
background-color: #282828;
border-color: #353535;
}
.pagination > .disabled > a,
.pagination > .disabled > a:focus,
.pagination > .disabled > a:hover,
.pagination > .disabled > span,
.pagination > .disabled > span:focus,
.pagination > .disabled > span:hover {
color: #a5a5a5;
background-color: #282828;
border-color: #353535;
}

.stat {
border: 1px solid rgba(255, 255, 255, 0.1);
}

#live-poll {
color: #ccc;
}

.btn-warn {
color: #333;
}

.rickshaw_graph .y_ticks.glow text {
fill: #ccc;
color: #ccc;
}
}
@import "application-dark_base.css" (prefers-color-scheme: dark);
123 changes: 123 additions & 0 deletions web/assets/stylesheets/application-dark_base.css
View file
Open in desktop
@@ -0,0 +1,123 @@
body {
background-color: #000;
color: #ccc;
}

a,
.title,
.summary_bar ul .count,
.navbar .navbar-brand {
color: #af0014;
}

.navbar .navbar-brand:hover {
color: #ccc;
}

.navbar .navbar-brand .status {
color: #ccc;
}

.navbar-inverse {
background-color: #000;
border-color: #333;
}

table.table-white {
background-color: #111;
}

.table-striped > tbody > tr:nth-of-type(odd) {
background-color: #222;
}

.table-bordered,
.table-bordered > tbody > tr > td,
.table-bordered > tbody > tr > th,
.table-bordered > tfoot > tr > td,
.table-bordered > tfoot > tr > th,
.table-bordered > thead > tr > td,
.table-bordered > thead > tr > th {
border: 1px solid #333;
}

.table-hover > tbody > tr:hover {
background-color: #333;
}

.alert {
border: none;
color: #ccc;
}

.alert-success {
background-color: #000;
}

a:link,
a:active,
a:hover,
a:visited {
color: #63798c;
}

a.btn {
color: #000;
}

.summary_bar .summary {
background-color: #000;
border: 1px solid #333;
}

.navbar-default {
background-color: #000;
border-color: #3d3d3d;
}

.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:focus,
.navbar-default .navbar-nav > .active > a:hover {
color: #ccc;
background-color: #282828;
}

.navbar-default .navbar-nav > li > a:hover {
color: #ccc;
}

.pagination > li > a,
.pagination > li > a:hover,
.pagination > li > span {
color: #ccc;
background-color: #282828;
border-color: #353535;
}

.pagination > .disabled > a,
.pagination > .disabled > a:focus,
.pagination > .disabled > a:hover,
.pagination > .disabled > span,
.pagination > .disabled > span:focus,
.pagination > .disabled > span:hover {
color: #a5a5a5;
background-color: #282828;
border-color: #353535;
}

.stat {
border: 1px solid rgba(255, 255, 255, 0.1);
}

#live-poll {
color: #ccc;
}

.btn-warn {
color: #333;
}

.rickshaw_graph .y_ticks.glow text {
fill: #ccc;
color: #ccc;
}
12 changes: 10 additions & 2 deletions web/views/layout.erb
View file
Open in desktop
Expand Up @@ -10,8 +10,16 @@
<link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css"/>
<% end %>

<link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
<link href="<%= root_path %>stylesheets/application-dark.css" media="screen" rel="stylesheet" type="text/css" />
<% if Sidekiq.options[:web_theme] %>>
<link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
<% if Sidekiq.options[:web_theme] == 'dark' %>>
<link href="<%= root_path %>stylesheets/application-dark_base.css" media="screen" rel="stylesheet" type="text/css" />
<% end %>>
<% else %>>
<link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
<link href="<%= root_path %>stylesheets/application-dark.css" media="screen" rel="stylesheet" type="text/css" />
<% end %>>

<% if rtl? %>
<link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
<% end %>
Expand Down