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 live theme switching support #47

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add live theme switching support #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aca5b7b
Add live theme switching support
timja Feb 16, 2022
283ff05
Explicitly set header color so preview works
timja Feb 23, 2022
3dc8017
Apply suggestions from code review
timja Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.10</version>
<version>4.37</version>
<relativePath />
</parent>
<groupId>io.jenkins.plugins</groupId>
Expand All @@ -14,7 +14,7 @@
<properties>
<revision>0.2</revision>
<changelist>-SNAPSHOT</changelist>
<jenkins.version>2.248</jenkins.version>
<jenkins.version>2.336</jenkins.version>
<java.level>8</java.level>
<useBeta>true</useBeta>
</properties>
Expand All @@ -24,8 +24,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.235.x</artifactId>
<version>13</version>
<artifactId>bom-2.332.x</artifactId>
<version>1155.v77b_fd92a_26fc</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand All @@ -43,7 +43,7 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>theme-manager</artifactId>
<version>0.5</version>
<version>1.0</version>
</dependency>
</dependencies>

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/io/jenkins/plugins/solarizedtheme/AbstractSolarizedThemeDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,9 @@ public abstract class AbstractSolarizedThemeDescriptor extends ThemeManagerFacto
public String getThemeId() {
return ID;
}

@Override
public boolean isNamespaced() {
return true;
}
}
8 changes: 7 additions & 1 deletion src/main/java/io/jenkins/plugins/solarizedtheme/SolarizedDarkTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,15 @@ public SolarizedDarkTheme() {
@Extension
@Symbol("solarizedDark")
public static class DescriptorImpl extends AbstractSolarizedThemeDescriptor {

@Override
public String getThemeKey() {
return "solarized-dark";
}

@Override
public ThemeManagerFactory getInstance() {
return new SolarizedLightTheme();
return new SolarizedDarkTheme();
}

@Override
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/io/jenkins/plugins/solarizedtheme/SolarizedLightTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public SolarizedLightTheme() {
@Extension
@Symbol("solarizedLight")
public static class DescriptorImpl extends AbstractSolarizedThemeDescriptor {

@Override
public String getThemeKey() {
return "solarized";
}

@Override
public ThemeManagerFactory getInstance() {
return new SolarizedLightTheme();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/jenkins/plugins/solarizedtheme/SolarizedRootAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void doDynamic(StaplerRequest req, StaplerResponse rsp) throws IOExceptio
if (cssFile.startsWith("/")) {
cssFile = cssFile.substring(1);
}
if (!Arrays.asList(AbstractSolarizedTheme.BASE_CSS, AbstractSolarizedTheme.DEFINITIONS_CSS, SolarizedSystemTheme.CSS, SolarizedLightTheme.CSS, SolarizedDarkTheme.CSS).contains(cssFile)) {
if (!Arrays.asList(AbstractSolarizedTheme.BASE_CSS, AbstractSolarizedTheme.DEFINITIONS_CSS, SolarizedLightTheme.CSS, SolarizedDarkTheme.CSS).contains(cssFile)) {
rsp.sendError(404);
return;
}
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/io/jenkins/plugins/solarizedtheme/SolarizedSystemTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,35 @@

import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import io.jenkins.plugins.thememanager.Theme;
import io.jenkins.plugins.thememanager.ThemeManagerFactory;
import org.jenkinsci.Symbol;
import org.kohsuke.stapler.DataBoundConstructor;

public class SolarizedSystemTheme extends AbstractSolarizedTheme {

public static final String CSS = "solarized-system.css";

@DataBoundConstructor
public SolarizedSystemTheme() {
// Stapler
}

@Override
public Theme getTheme() {
return Theme.builder().build();
}

@Extension
@Symbol("solarizedSystem")
public static class DescriptorImpl extends AbstractSolarizedThemeDescriptor {

@Override
public ThemeManagerFactory getInstance() {
return new SolarizedSystemTheme();
public String getThemeKey() {
return "solarized-system";
}

@Override
public String getThemeCssSuffix() {
return CSS;
public ThemeManagerFactory getInstance() {
return new SolarizedSystemTheme();
}

@NonNull
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/solarized-base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ cyan #2aa198 6/6 cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63
green #859900 2/2 green 64 #5f8700 60 -20 65 133 153 0 68 100 60
*/

:root {
[data-theme=solarized], .app-theme-picker__picker[data-theme=solarized], [data-theme=solarized-dark], .app-theme-picker__picker[data-theme=solarized-dark], [data-theme=solarized-system], .app-theme-picker__picker[data-theme=solarized-system] {
--solarized-base03: #002b36;
--solarized-base02: #073642;
--solarized-base01: #586e75;
Expand Down
12 changes: 11 additions & 1 deletion src/main/webapp/solarized-dark.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
:root {
[data-theme=solarized-dark], .app-theme-picker__picker[data-theme=solarized-dark] {
--solarized-emphasized: var(--solarized-base1);
--solarized-primary: var(--solarized-base0);
--solarized-secondary: var(--solarized-base01);
--solarized-bg-highlights: var(--solarized-base02);
--solarized-bg: var(--solarized-base03);
}

@media (prefers-color-scheme: dark) {
[data-theme=solarized-system], .app-theme-picker__picker[data-theme=solarized-system] {
--solarized-emphasized: var(--solarized-base1);
--solarized-primary: var(--solarized-base0);
--solarized-secondary: var(--solarized-base01);
--solarized-bg-highlights: var(--solarized-base02);
--solarized-bg: var(--solarized-base03);
}
}
4 changes: 2 additions & 2 deletions src/main/webapp/solarized-definitions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:root {
[data-theme=solarized], .app-theme-picker__picker[data-theme=solarized], [data-theme=solarized-dark], .app-theme-picker__picker[data-theme=solarized-dark], [data-theme=solarized-system], .app-theme-picker__picker[data-theme=solarized-system] {
--add-item-btn-decorator-bg-color: var(--solarized-bg-highlights); /* background color of the area around the "OK" button on "New Item" dialog */
--add-item-btn-decorator-border-color: var(--solarized-bg-highlights); /* border color of the area around the "OK" button on "New Item" dialog */
--alert-danger-bg-color: var(--solarized-red);
Expand Down Expand Up @@ -71,7 +71,7 @@
/* --font-size-monospace */ /* not a color */
/* --font-size-sm */ /* not a color */
/* --font-size-xs */ /* not a color */
/* --header-bg-classic */
--header-bg-classic: #000;
--header-bg-v2: var(--solarized-secondary);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this wasn't set before and was relying on what was set in core.

It's one of the colours used in preview so needs to be set otherwise the active theme will show it's colour there:
https://github.com/jenkinsci/theme-manager-plugin/blob/master/src/main/resources/lib/theme-manager/selector.jelly#L31-L37

/* --header-item-border-radius */
/* --header-link-bg-active-v2 */
Expand Down
12 changes: 11 additions & 1 deletion src/main/webapp/solarized-light.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
:root {
[data-theme=solarized], .app-theme-picker__picker[data-theme=solarized] {
--solarized-emphasized: var(--solarized-base01);
--solarized-primary: var(--solarized-base00);
--solarized-secondary: var(--solarized-base1);
--solarized-bg-highlights: var(--solarized-base2);
--solarized-bg: var(--solarized-base3);
}

@media (prefers-color-scheme: light) {
[data-theme=solarized-system], .app-theme-picker__picker[data-theme=solarized-system] {
--solarized-emphasized: var(--solarized-base01);
--solarized-primary: var(--solarized-base00);
--solarized-secondary: var(--solarized-base1);
--solarized-bg-highlights: var(--solarized-base2);
--solarized-bg: var(--solarized-base3);
}
}
2 changes: 0 additions & 2 deletions src/main/webapp/solarized-system.css
View file
Open in desktop

This file was deleted.

Loading