Consolidate CSS theming values in a single file

SimoHyHa414 · Jun 25, 2020 · 687f18d · 687f18d
1 parent 339f9b9
commit 687f18d
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 33 deletions.
diff --git a/war/src/main/js/widgets/add/addform.less b/war/src/main/js/widgets/add/addform.less
@@ -1,4 +1,4 @@
-@import '../../../less/abstracts/font.less';
+@import '../../../less/abstracts/theme.less';
 
 #add-item-panel {
 

diff --git a/war/src/main/js/widgets/config/tabbar.less b/war/src/main/js/widgets/config/tabbar.less
@@ -2,7 +2,7 @@
  * Tab bar specific rules.
  */
 
-@import '../../../less/abstracts/font.less';
+@import '../../../less/abstracts/theme.less';
 
 .jenkins-config-widgets {
   position: relative;

diff --git a/war/src/main/less/abstracts/font.less b/war/src/main/less/abstracts/font.less
diff --git a/war/src/main/less/abstracts/colors.less → war/src/main/less/abstracts/theme.less b/war/src/main/less/abstracts/colors.less → war/src/main/less/abstracts/theme.less
@@ -1,4 +1,16 @@
 :root {
+  // 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";
+  --font-size-base: 1rem; // 16px
+  --font-size-sm: 0.875rem; // 14px
+  --font-size-xs: 0.75rem; // 12px
+  --font-size-monospace: 0.95em;
+
+  // Line height
+  --line-height-base: 1.5;
+  --line-height-heading: 1.2;
+
+  // Color palette
   --white: #fff;
   --very-light-grey: #f0f0f0;
   --black: #333;

diff --git a/war/src/main/less/base/layout-commons.less b/war/src/main/less/base/layout-commons.less
@@ -1,4 +1,4 @@
-@import '../abstracts/font.less';
+@import '../abstracts/theme.less';
 
 html {
   position: relative;

diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
@@ -22,9 +22,7 @@
  * THE SOFTWARE.
  */
 
-@import '../abstracts/font.less';
-@import '../abstracts/colors.less';
-
+@import '../abstracts/theme.less';
 
 
 /* Panel */

diff --git a/war/src/main/less/base/typography.less b/war/src/main/less/base/typography.less
@@ -1,5 +1,4 @@
-@import '../abstracts/font.less';
-@import '../abstracts/colors.less';
+@import '../abstracts/theme.less';
 
 body,
 p {

diff --git a/war/src/main/less/modules/buttons.less b/war/src/main/less/modules/buttons.less
@@ -1,5 +1,4 @@
-@import '../abstracts/colors.less';
-@import '../abstracts/font.less';
+@import '../abstracts/theme.less';
 
 // Button: variant mixins
 

diff --git a/war/src/main/less/modules/icons.less b/war/src/main/less/modules/icons.less
@@ -1,4 +1,4 @@
-@import '../abstracts/colors.less';
+@import '../abstracts/theme.less';
 
 .icon-help {
   color: var(--primary);

diff --git a/war/src/main/less/modules/page-footer.less b/war/src/main/less/modules/page-footer.less
@@ -1,5 +1,4 @@
-@import '../abstracts/font.less';
-@import '../abstracts/colors.less';
+@import '../abstracts/theme.less';
 
 .page-footer {
   background-color: var(--breadcrumbs-bg);

diff --git a/war/src/main/less/modules/page-header.less b/war/src/main/less/modules/page-header.less
@@ -1,5 +1,4 @@
-@import "../abstracts/font.less";
-@import "../abstracts/colors.less";
+@import "../abstracts/theme.less";
 
 .page-header {
     display: block;

diff --git a/war/src/main/less/modules/side-panel-tasks.less b/war/src/main/less/modules/side-panel-tasks.less
@@ -1,5 +1,4 @@
-@import '../abstracts/colors.less';
-@import '../abstracts/font.less';
+@import '../abstracts/theme.less';
 
 #tasks {
   margin-bottom: 20px;

diff --git a/war/src/main/less/modules/side-panel-widgets.less b/war/src/main/less/modules/side-panel-widgets.less
@@ -1,5 +1,4 @@
-@import '../abstracts/colors.less';
-@import '../abstracts/font.less';
+@import '../abstracts/theme.less';
 
 #side-panel .pane-frame {
   border-radius: 0;

diff --git a/war/src/main/less/ui-refresh-overrides.less b/war/src/main/less/ui-refresh-overrides.less
@@ -1,5 +1,4 @@
-@import "./abstracts/colors.less";
-@import "./abstracts/font.less";
+@import  "./abstracts/theme.less";
 
 .ui-refresh {
     .page-header {