Add CSS variables - prerequisite for Dark mode by timja · Pull Request #4752 · jenkinsci/jenkins

timja · 2020-05-27T09:34:24Z

This is being used to deliver dark mode, see https://github.com/jenkinsci/dark-theme

Testing

It would be great if someone can check this in IE 11, CSS variables aren't supported there but I've added a postcss plugin that has resolved the variables at build time, I've checked the properties are present in the CSS.

docker run --rm -ti -p 8080:8080 -e ID=4752 jenkins/core-pr-tester

Proposed changelog entries

Entry 1: Major RFE: Alpha dark theme released, see https://github.com/jenkinsci/dark-theme
Entry 2: Developer: Add incubating support for CSS variables, useful in themes
...

Proposed upgrade guidelines

N/A

Submitter checklist

(If applicable) Jira issue is well described
Changelog entries and upgrade guidelines are appropriate for the audience affected by the change (users or developer, depending on the change). Examples
- Fill-in the Proposed changelog entries section only if there are breaking changes or other changes which may require extra steps from users during the upgrade
Appropriate autotests or explanation to why this change has no tests
For dependency updates: links to external changelogs and, if possible, full diffs

Desired reviewers

@mention

Maintainer checklist

Before the changes are marked as ready-for-merge:

There are at least 2 approvals for the pull request and no outstanding requests for change
Conversations in the pull request are over OR it is explicit that a reviewer does not block the change
Changelog entries in the PR title and/or Proposed changelog entries are correct
Proper changelog labels are set so that the changelog can be generated automatically
If the change needs additional upgrade steps from users, upgrade-guide-needed label is set and there is a Proposed upgrade guidelines section in the PR title. (example)
If it would make sense to backport the change to LTS, a Jira issue must exist, be a Bug or Improvement, and be labeled as lts-candidate to be considered (see query).

res0nance · 2020-05-27T15:00:51Z

I was going to test this on windows but with the current tip, it doesnt work on windows

[INFO] $ webpack --config webpack.config.js --mode=production
[ERROR] Browserslist: caniuse-lite is outdated. Please run next command `yarn upgrade`
[ERROR] webpack-fix-style-only-entries: removing js from style only module: base-styles-v2.js
[ERROR] webpack-fix-style-only-entries: removing js from style only module: ui-refresh-overrides.js
[INFO] Hash: 2b2ca561afb45798718d
[INFO] Version: webpack 4.41.2
[INFO] Time: 19069ms
[INFO] Built at: 05/27/2020 10:58:08 PM
[INFO]  51 assets
[INFO] Entrypoint page-init = vendors.js page-init.js
[INFO] Entrypoint pluginSetupWizard = vendors.js pluginSetupWizard.css pluginSetupWizard.js
[INFO] Entrypoint upgradeWizard = vendors.js upgradeWizard.js
[INFO] Entrypoint add-item = vendors.js add-item.css add-item.js
[INFO] Entrypoint config-scrollspy = vendors.js config-scrollspy.css config-scrollspy.js
[INFO] Entrypoint config-tabbar = vendors.js config-tabbar.css config-tabbar.js
[INFO] Entrypoint base-styles-v2 = vendors.js base-styles-v2.css
[INFO] Entrypoint ui-refresh-overrides = vendors.js
[INFO] [31] multi ./src/main/js/page-init.js 28 bytes {5} [built]
[INFO] [32] ./src/main/js/page-init.js 910 bytes {5} [built]
[INFO] [35] multi ./src/main/js/pluginSetupWizard.js ./src/main/less/pluginSetupWizard.less 40 bytes {6} [built]
[INFO] [41] ./src/main/less/pluginSetupWizard.less 711 bytes {6} [built]
[INFO] [43] multi ./src/main/js/upgradeWizard.js 28 bytes {8} [built]
[INFO] [44] ./src/main/js/upgradeWizard.js 1.4 KiB {8} [built]
[INFO] [45] multi ./src/main/js/add-item.js ./src/main/js/add-item.less 40 bytes {1} [built]
[INFO] [46] ./src/main/js/add-item.js 9.96 KiB {1} [built]
[INFO] [47] ./src/main/js/add-item.less 702 bytes {1} [built]
[INFO] [49] multi ./src/main/js/config-scrollspy.js ./src/main/js/config-scrollspy.less 40 bytes {3} [built]
[INFO] [50] ./src/main/js/config-scrollspy.js 4.54 KiB {3} [built]
[INFO] [51] ./src/main/js/config-scrollspy.less 710 bytes {3} [built]
[INFO] [53] multi ./src/main/js/config-tabbar.js ./src/main/js/config-tabbar.less 40 bytes {4} [built]
[INFO] [57] multi ./src/main/less/base-styles-v2.less 28 bytes {2} [built]
[INFO] [60] multi ./src/main/less/ui-refresh-overrides.less 28 bytes {7} [built]
[ERROR] error Command failed with exit code 2.
[INFO]     + 57 hidden modules
[INFO]
[INFO] ERROR in ./src/main/less/ui-refresh-overrides.less (./node_modules/mini-css-extract-plugin/dist/loader.js!./node_modules/css-loader/dist/cjs.js??ref--4-2!./node_modules/postcss-loader/src!./node_modules/less-loader/dist/cjs.js!./src/main/less/ui-refresh-overrides.less)
[INFO] Module build failed (from ./node_modules/mini-css-extract-plugin/dist/loader.js):
[INFO] ModuleNotFoundError: Module not found: Error: Can't resolve './abstracts/menu_down_arrow.png' in 'D:\github\jenkins\war\src\main\less'
[ERROR] error Command failed with exit code 2.

timja · 2020-05-27T15:24:50Z

core/src/main/resources/lib/layout/breadcrumbs.css

 #menuSelector {/* used for showing 'v' on the right of the anchor */
    background-color:transparent;
-    background-image: url(menu_down_arrow.png);
+    background-image: var(--menu-selector-down-background-image);


anyone able to check if this works on IE 11?

I suspect that it needs a manual fallback, looks like the postcss processor isn't adding the fallback for it

Seems to work on i.e but the entire dark theme doesn't

Here is a side by side with ie11 on the left and edge on the right

Seems to work on i.e but the entire dark theme doesn't

It's not expected to work on IE 11 at all for the theme

Here is a side by side with ie11 on the left and edge on the right

That's not working, at least for fonts, the preprocessor isn't picking them up 😢,

Two options I guess,

this work doesn't really require the fonts to be changeable at runtime, so it could go back to less variables

try out the other postcss plugin and see if that handles fonts, this one only seems to handle colours

cc @fqueiruga

Some more observations I made:

The administrative monitor (The bell thing in the top right) still shows white background on the dark theme

CLI page has black text with dark theme.

Thanks I’d forgotten about the admin monitor issue, and I hadn’t checked the CLI page

BTW I would not bother converting the arrow to a CSS variables. It should be either an icon or a CSS triangle, not an image anyway.

https://issues.jenkins-ci.org/browse/JENKINS-62496

This reverts commit a9b9310.

fqueiruga · 2020-05-27T16:38:05Z

I don't think we should go all in CSS variables. For example, I would keep font-family and font-size in less variables for now.

In the first iteration I'd keep it simple: colors, backgrounds, borders and maybe font weights.

fqueiruga · 2020-05-27T16:45:17Z

war/src/main/less/abstracts/font.less

-@line-height-heading: 1.2;
+body {
+  // Font related properties
+  --font-family-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";


Maybe the fact that the variables are declared here and not in :root is causing the fallback issues. Just some brainstorming.

Yes you’re right

Maybe we should just go ahead and create a big & comprehensive variables.less file and be done with it :D

core/src/main/resources/lib/form/password/password.css

core/src/main/resources/lib/layout/breadcrumbs.css

fqueiruga · 2020-05-27T17:26:11Z

war/src/main/less/ui-refresh-overrides.less

 .ui-refresh {
    .page-header {
-        background-color: @header-bg-v2;
+        background-color: var(--header-bg-v2);


I don't know if we should just override the :root variable here

hmm? not quite sure what you mean

war/src/main/less/pluginSetupWizard.less

war/src/main/less/modules/side-panel-tasks.less

fqueiruga · 2020-05-27T17:31:27Z

war/src/main/less/abstracts/font.less

-@line-height-heading: 1.2;
+body {
+  // Font related properties
+  --font-family-sans: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Noto Sans", Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";


Maybe we should just go ahead and create a big & comprehensive variables.less file and be done with it :D

war/src/main/less/abstracts/colors.less

war/postcss.config.js

fqueiruga · 2020-05-27T17:36:01Z

war/src/main/less/base/style.less

+    box-shadow: var(--menu-box-shadow);
+}
+
+#jenkins.yui-skin-sam {


Why did you need to create this? Does this fix something?

it allows overriding the yui-skin in themes, I've matched the css below to what the yui skin provides and extended it with variables

fqueiruga · 2020-05-27T17:36:58Z

core/src/main/resources/lib/layout/breadcrumbs.css

 #menuSelector {/* used for showing 'v' on the right of the anchor */
    background-color:transparent;
-    background-image: url(menu_down_arrow.png);
+    background-image: var(--menu-selector-down-background-image);


BTW I would not bother converting the arrow to a CSS variables. It should be either an icon or a CSS triangle, not an image anyway.

oleg-nenashev · 2020-05-27T18:21:58Z

Deployed the current commit to https://repo.jenkins-ci.org/snapshots/org/jenkins-ci/main/jenkins-war/2.239-SNAPSHOT/jenkins-war-2.239-20200527.181313-1.war , for testing in jenkinsci/dark-theme-plugin#8

fqueiruga · 2020-05-28T14:52:26Z

There are some variables that use -background- and some that use -bg-. I think we should standardize on one. I'm partial towards -bg- but I'm not really invested on it.

timja · 2020-05-28T14:56:07Z

There are some variables that use -background- and some that use -bg-. I think we should standardize on one. I'm partial towards -bg- but I'm not really invested on it.

Agreed, most of the bg ones came from the existing sass variables and I didn't touch them in the find / replace,

When I created new ones I added them with background, happy to shorten though

fqueiruga · 2020-05-28T14:58:56Z

Created a PR against this branch timja#3

fqueiruga · 2020-05-28T15:08:52Z

Another PR created against this branch timja#4

…into dark-mode

fqueiruga · 2020-05-28T15:24:20Z

Created another PR, forgot one variable timja#6 😓

fqueiruga · 2020-05-28T15:24:38Z

I'll start working on the dark mode variables for these changes

timja · 2020-05-29T12:34:43Z

I've updated the changelog PTAL

res0nance

Retested up to c12b42c
With IE11 things look ok there

timja · 2020-05-29T14:14:19Z

Some shuffling done in 49e501f mostly moves yui customisation code to one place, as there was some in styles.less as well

I removed a bit of duplication between the search bar and other autocompletes, and pulled in some of the enhancements that were added to search but not others.

I've tested it on the add job, copy items from widget

oleg-nenashev · 2020-05-29T19:50:52Z

We may merge it in 24 hours if no negative feedback or requests to extend the review time. Please see the merge process documentation for more information

Thanks to @timja @95jonpet @fqueiruga @res0nance @EstherAF @nimishbongale who contributed to the Dark Theme implementation and evaluation, and to compatibility testing of this pull request! It is great to see such a major improvement to Jenkins UX and CSS extensibility delivered in a few days. 🥇 🙇 🚀

oleg-nenashev · 2020-05-29T23:20:46Z

jenkinsci/dark-theme-plugin#60 updates the demo for testing to the recent version

war/postcss.config.js

war/src/main/js/widgets/add/addform.less

halkeye · 2020-05-30T04:09:13Z

so not a blocker but a few concerns:

Sometimes the fallback values before the variables are kept like
https://github.com/jenkinsci/jenkins/pull/4752/files#diff-21e1a8d53a5c4282d7a7c221551cf7f9L22-R24
But other times they are not
Since the postcss plugin should replace the variables at compile time, i don't think the fallbacks are necessary and will get out of sync/confusion quickly
I haven't checked but does the plugin keep the variables in the final output? I would assume so because they would make themeing so much easier. If not, can it be configured to do the replacements and keep them?

timja · 2020-05-30T06:11:28Z

The manual fallbacks are kept in the adjuncts which aren’t passed through webpack / postcss
Replied to this in a different comment but the fallbacks are added above the variables in the final output, and are only used if a browser doesn’t support variables (Internet explorer)

daniel-beck · 2020-08-08T19:44:01Z

war/src/main/less/abstracts/colors.less

+  // Side panel
+  --panel-border-color: #eaeff2;
+  --panel-border-color--hover: #cecece;
+  --side-panel-hover-color: var(--panel-border-color);


Defined but never used, also naming inconsistent with other variables.

Should be removed IMO

daniel-beck · 2020-08-16T12:11:46Z

war/src/main/less/modules/buttons.less

-  border-color: @btn-primary-bg;
+  color: var(--btn-text-color);
+  background-color: var(--btn-primary-bg);
+  border-color: var(--btn-primary-bg);


Is it deliberate that here and further below, we're not using a separate variable for the primary button border? Secondary buttons have a separate variable.

historical most likely, not intentional as far as I know

Button variable API should be expanded IMO

95jonpet and others added 3 commits May 27, 2020 10:32

JENKINS-60924 Add PostCSS pre-processor

7606a10

Add alpha support for CSS variables

611f6ad

Yui theming and side panel fixes

a7934a7

oleg-nenashev mentioned this pull request May 27, 2020

Create a Jenkins image and guidelines for testing jenkinsci/dark-theme-plugin#6

Closed

More overrides

a9b9310

timja commented May 27, 2020

View reviewed changes

timja added 3 commits May 27, 2020 16:39

Revert "More overrides"

7b04563

This reverts commit a9b9310.

Add manage styles

94b9311

Tweak buttons

cb37c39

timja added the needs-comments-resolved Comments in the PR need to be addressed before it can be considered for merging label May 27, 2020

res0nance mentioned this pull request May 27, 2020

Tested the CSS Variables PR and Dark Theme on Windows browsers jenkinsci/ui-ux-hackfest-2020#117

Closed

fqueiruga reviewed May 27, 2020

View reviewed changes

timja added 2 commits May 27, 2020 20:24

Fix IE 11

f824f3a

Review comments

670b907

Standardize dark link variables

78928fa

fqueiruga added 2 commits May 28, 2020 17:04

Rename variables to BEM-like status

19f931d

Renames background variables to bg

48610d5

timja and others added 2 commits May 28, 2020 16:10

Merge remote-tracking branch 'fqueiruga/rename-background-variables' …

330b6f3

…into dark-mode

Rename last bg variable

d0fbb44

oleg-nenashev requested review from a team May 29, 2020 12:36

timja added 4 commits May 29, 2020 13:56

Plugin manager fixes

f9df961

Typo fix

07abb84

Fix secretTextarea

2faf971

Fix admin monitor pop out

c12b42c

res0nance approved these changes May 29, 2020

View reviewed changes

Fix autocomplete on addJob

49e501f

timja added 2 commits May 29, 2020 15:23

Fix CLI dark mode

cbfc042

Plugin manager categories themeable

fbdd4d7

oleg-nenashev added the ready-for-merge The PR is ready to go, and it will be merged soon if there is no negative feedback label May 29, 2020

This was referenced May 30, 2020

Add support for local them development in the demo + Allow developing the dark login theme in the demo repo jenkinsci/dark-theme-plugin#62

Merged

[JENKINS-62496] Convert arrow pngs to CSS #4757

Merged

halkeye reviewed May 30, 2020

View reviewed changes

war/postcss.config.js Show resolved Hide resolved

halkeye reviewed May 30, 2020

View reviewed changes

war/src/main/js/widgets/add/addform.less Show resolved Hide resolved

timja merged commit dcde10b into jenkinsci:master May 31, 2020

oleg-nenashev mentioned this pull request May 31, 2020

[JENKINS-62515] - Introduce CSS variables in the Login screen CSS #4763

Merged

10 tasks

EstherAF mentioned this pull request Jun 1, 2020

Review of the PR #4752 (Add CSS variables - prerequisite for Dark mode) jenkinsci/ui-ux-hackfest-2020#233

Closed

This was referenced Jun 6, 2020

Restores colors that were changed by accident #4771

Merged

Restore colors on the Job configuration page (regression in 2.239) #4781

Merged

daniel-beck reviewed Aug 8, 2020

View reviewed changes

daniel-beck reviewed Aug 16, 2020

View reviewed changes

timja deleted the dark-mode branch August 26, 2020 09:09

janisz mentioned this pull request Mar 16, 2023

Bug Plugin incompatible with darkmode stackrox/jenkins-plugin#230

Open

Uh oh!

Conversation

timja commented May 27, 2020 • edited by MarkEWaite Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing

Proposed changelog entries

Proposed upgrade guidelines

Submitter checklist

Desired reviewers

Maintainer checklist

Uh oh!

res0nance commented May 27, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fqueiruga commented May 27, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

oleg-nenashev commented May 27, 2020

Uh oh!

fqueiruga commented May 28, 2020

Uh oh!

timja commented May 28, 2020

Uh oh!

fqueiruga commented May 28, 2020

Uh oh!

fqueiruga commented May 28, 2020

Uh oh!

fqueiruga commented May 28, 2020

Uh oh!

fqueiruga commented May 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

timja commented May 29, 2020

Uh oh!

res0nance left a comment

Choose a reason for hiding this comment

Uh oh!

timja commented May 29, 2020

Uh oh!

oleg-nenashev commented May 29, 2020

Uh oh!

oleg-nenashev commented May 29, 2020

Uh oh!

Uh oh!

timja commented May 27, 2020 •

edited by MarkEWaite

Loading

fqueiruga commented May 28, 2020 •

edited

Loading