@operato/styles 2.0.0-alpha.99 → 2.0.0-beta.4

package/src/button-container-styles.ts

@@ -4,36 +4,32 @@ export const ButtonContainerStyles = css`
   .button-container {
     display: flex;
     margin-left: auto;
-    gap: var(--padding-narrow);
-    padding: 6px 10px;
+    padding: var(--spacing-small);
+    gap: var(--spacing-small);
   }
 
   button {
     display: flex;
     align-items: center;
-    background-color: var(--button-background-color, #fafbfc);
-    border: 1px solid rgba(var(--primary-color-rgb), 0.5);
+    background-color: var(--button-background-color, var(--md-sys-color-secondary-container));
+    border: 1px solid var(--md-sys-color-secondary-container);
     border-radius: var(--button-border-radius);
 
     font-size: var(--fontsize-default);
-    color: var(--secondary-color);
+    color: var(--button-color, var(--md-sys-color-on-secondary-container));
     text-wrap: nowrap;
 
     md-icon {
       margin: 4px 1px;
 
-      --md-icon-size: 18px;
-      color: var(--primary-color);
+      --md-icon-size: var(--icon-size-small);
     }
 
     &:hover {
-      background-color: var(--primary-color);
+      background-color: var(--md-sys-color-secondary);
+      color: var(--md-sys-color-on-secondary);
 
-      color: var(--theme-white-color);
-
-      md-icon {
-        color: var(--white-theme-color);
-      }
+      border: 1px solid var(--md-sys-color-secondary);
     }
   }
 
@@ -42,27 +38,33 @@ export const ButtonContainerStyles = css`
   }
 
   [danger] {
-    color: var(--status-danger-color);
-    border-color: var(--status-danger-color);
+    --md-assist-chip-elevated-container-color: var(--md-sys-color-error);
+    --md-assist-chip-label-text-color: var(--md-sys-color-on-error);
+    --md-assist-chip-leading-icon-color: var(--md-sys-color-on-error);
 
-    md-icon {
-      color: var(--status-danger-color);
-    }
+    color: var(--md-sys-color-on-error);
+    background-color: var(--md-sys-color-error);
+    border-color: var(--md-sys-color-error);
 
     &:hover {
-      background-color: var(--status-danger-color);
+      --md-assist-chip-elevated-container-color: var(--md-sys-color-on-error);
+      --md-assist-chip-label-text-color: var(--md-sys-color-error);
+      --md-assist-chip-leading-iccolor: var(--md-sys-color-error);
+
+      color: var(--md-sys-color-error);
+      background-color: var(--md-sys-color-on-error);
     }
   }
 
   select,
   input[type='text'] {
-    background-color: var(--button-background-color, #fafbfc);
-    border: 1px solid rgba(var(--primary-color-rgb), 0.5);
+    background-color: var(--button-background-color, var(--md-sys-color-secondary-container));
+    border: 1px solid var(--md-sys-color-outline);
     border-radius: var(--button-border-radius);
-    padding: 0 var(--padding-narrow);
+    padding: 0 var(--spacing-tiny);
 
     font-size: var(--fontsize-default);
-    color: var(--secondary-color);
+    color: var(--button-color, var(--md-sys-color-on-secondary-container));
   }
 
   [filler] {

package/src/common-grist-styles.ts

@@ -17,9 +17,9 @@ export const CommonGristStyles = css`
     flex-direction: row;
     gap: 0 10px;
     align-items: center;
-    padding: var(--padding-default) var(--padding-wide);
+    padding: var(--spacing-small) var(--spacing-medium);
 
-    --md-icon-size: 24px;
+    --md-icon-size: var(--icon-size-medium);
   }
 
   [slot='headroom']:empty {
@@ -28,11 +28,12 @@ export const CommonGristStyles = css`
 
   #sorters md-icon,
   #modes md-icon {
-    --md-icon-size: 18px;
+    --md-icon-size: var(--icon-size-small);
   }
 
   [slot='setting'] {
     position: absolute;
+    top: -2px;
     right: 0;
   }
 
@@ -41,38 +42,38 @@ export const CommonGristStyles = css`
     flex-wrap: nowrap;
     align-items: center;
     margin-left: auto;
-    margin-right: var(--margin-default);
-    padding-left: var(--padding-narrow);
-    border-bottom: var(--border-dark-color);
+    margin-right: var(--spacing-small);
+    padding-left: var(--spacing-tiny);
+    border-bottom: var(--md-sys-color-outline);
     position: relative;
-    color: var(--secondary-color);
+    color: var(--md-sys-color-on-secondary-container);
     font-size: var(--fontsize-default);
     user-select: none;
   }
 
   #sorters > * {
-    padding: var(--padding-narrow);
+    padding: var(--spacing-tiny);
     vertical-align: middle;
   }
 
   #modes > * {
-    padding: var(--padding-narrow);
+    padding: var(--spacing-tiny);
     opacity: 0.5;
-    color: var(--primary-text-color);
+    color: var(--md-sys-color-on-primary-container);
     cursor: pointer;
   }
 
   #modes > md-icon[active] {
     border-radius: 9px;
-    background-color: rgba(var(--primary-color-rgb), 0.05);
+    background-color: var(--md-sys-color-secondary-container);
     opacity: 1;
-    color: var(--secondary-text-color);
+    color: var(--md-sys-color-on-secondary-container);
     cursor: default;
   }
 
   #modes > md-icon:hover {
     opacity: 1;
-    color: var(--secondary-text-color);
+    color: var(--md-sys-color-on-secondary-container);
   }
 
   #add {
@@ -85,7 +86,8 @@ export const CommonGristStyles = css`
     justify-content: center;
     gap: 0px 10px;
 
-    background-color: var(--primary-color);
+    background-color: var(--md-sys-color-primary-container);
+    color: var(--md-sys-color-on-primary-container);
     border: 0;
     border-radius: 50%;
     padding: 5px;
@@ -95,13 +97,13 @@ export const CommonGristStyles = css`
   }
 
   #add button:hover {
-    background-color: var(--focus-background-color);
+    background-color: var(--md-sys-color-on-primary-container);
+    color: var(--md-sys-color-primary-container);
     box-shadow: var(--box-shadow);
   }
 
   #add button md-icon {
     font-size: 1.5em;
-    color: var(--theme-white-color);
   }
 
   #filters {
@@ -112,7 +114,7 @@ export const CommonGristStyles = css`
   }
 
   #filters > * {
-    margin-right: var(--margin-default);
+    margin-right: var(--spacing-small);
   }
 
   @media only screen and (max-width: 460px) {

package/src/common-header-styles.ts

@@ -6,8 +6,8 @@ export const CommonHeaderStyles = css`
     grid-template-areas:
       'title actions'
       'filters filters';
-    gap: var(--padding-narrow) var(--padding-default);
-    padding: calc(var(--padding-default) / 2) var(--padding-default);
+    gap: var(--spacing-small) var(--spacing-medium);
+    padding: calc(var(--spacing-medium) / 2) var(--spacing-medium);
 
     align-items: center;
 
@@ -16,35 +16,36 @@ export const CommonHeaderStyles = css`
       display: flex;
       flex-direction: row;
       align-items: center;
-      gap: var(--padding-narrow);
+      gap: var(--spacing-small);
 
       font: var(--subtitle-font);
-      color: var(--primary-text-color);
+      color: var(--md-sys-color-on-secondary-container);
       text-transform: capitalize;
     }
 
     .filters {
       grid-area: filters;
-      border: 1px solid rgba(var(--primary-color-rgb), 0.2);
-      border-radius: var(--border-radius);
-      background-color: rgba(var(--primary-color-rgb), 0.1);
-      padding: var(--padding-default);
+      border: 1px solid var(--md-sys-color-outline-variant);
+      border-radius: var(--md-sys-shape-corner-small, 5px);
+      background-color: var(--md-sys-color-surface-container);
+      padding: var(--spacing-small) var(--spacing-medium);
       display: flex;
       flex-direction: row;
       align-items: center;
-      gap: var(--padding-wide);
+      gap: var(--spacing-large);
 
       .filter {
         display: flex;
         flex-direction: row;
 
         align-items: center;
-        gap: var(--padding-narrow);
+        gap: var(--spacing-small);
       }
 
       label {
-        font: 600 var(--fontsize-default) var(--theme-font);
-        color: var(--label-color);
+        font: var(--md-sys-typescale-label-medium-weight, var(--md-ref-typeface-weight-medium, 500))
+          var(--fontsize-default) var(--theme-font);
+        color: var(--md-sys-color-primary);
       }
     }
 
@@ -58,7 +59,7 @@ export const CommonHeaderStyles = css`
       display: flex;
       flex-direction: row-reverse;
       align-items: center;
-      gap: var(--padding-narrow);
+      gap: var(--spacing-small);
 
       * {
         cursor: pointer;
@@ -66,12 +67,12 @@ export const CommonHeaderStyles = css`
 
       .textbtn,
       .iconbtn {
-        background-color: var(--button-background-color);
+        background-color: var(--md-sys-color-secondary-container);
         border: var(--button-border);
         border-radius: var(--button-border-radius);
         padding: var(--button-padding);
 
-        color: var(--button-color);
+        color: var(--md-sys-color-on-secondary-container);
         font: var(--button-font);
 
         &:hover {
@@ -79,15 +80,16 @@ export const CommonHeaderStyles = css`
           background-color: var(--button-activ-background-color);
           box-shadow: var(--button-active-box-shadow);
 
-          color: var(--button-activ-color);
+          color: var(--md-sys-color-on-secondary);
         }
       }
+
       .iconbtn {
-        padding: var(--iconbtn-padding);
+        padding: var(--spacing-tiny);
         line-height: 0.9;
 
         md-icon {
-          --md-icon-size: var(--iconbtn-size);
+          --md-icon-size: var(--icon-size-medium);
         }
       }
     }
@@ -103,15 +105,23 @@ export const CommonHeaderStyles = css`
       gap: 0;
 
       grid-template-areas:
-        'title'
         'actions'
         'filters';
 
+      .title {
+        display: none;
+      }
+
       .filters {
         flex-wrap: wrap;
-        gap: var(--padding-default);
+        gap: var(--spacing-medium);
         border: none;
       }
+
+      .actions {
+        background-color: var(--md-sys-color-on-secondary-container);
+        margin: 0;
+      }
     }
   }
 `

package/src/scrollbar-styles.ts

@@ -2,30 +2,31 @@ import { css } from 'lit'
 
 export const ScrollbarStyles = css`
   ::-webkit-scrollbar {
-    width: 5px;
-    height: 5px;
+    width: var(--scrollbar-width, 5px);
+    height: var(--scrollbar-height, 5px);
   }
   ::-webkit-scrollbar-track {
     background-color: transparent;
   }
   ::-webkit-scrollbar-thumb {
-    background-color: var(--scrollbar-thumb-color, rgba(0, 0, 0, 0.2));
+    background-color: var(--scrollbar-thumb-color, var(--md-sys-color-outline));
+    border-radius: var(--scrollbar-thumb-border-radius, 0);
   }
   ::-webkit-scrollbar-thumb:hover {
-    background-color: var(--scrollbar-thumb-hover-color, #aa866a);
+    background-color: var(--scrollbar-thumb-hover-color, var(--md-sys-color-outline-variant));
   }
 
   :host::-webkit-scrollbar {
-    width: 5px;
-    height: 5px;
+    width: var(--scrollbar-width, 5px);
+    height: var(--scrollbar-height, 5px);
   }
   :host::-webkit-scrollbar-track {
     background-color: transparent;
   }
   :host::-webkit-scrollbar-thumb {
-    background-color: var(--scrollbar-thumb-color, rgba(0, 0, 0, 0.2));
+    background-color: var(--scrollbar-thumb-color, var(--md-sys-color-outline));
   }
   :host::-webkit-scrollbar-thumb:hover {
-    background-color: var(--scrollbar-thumb-hover-color, #aa866a);
+    background-color: var(--scrollbar-thumb-hover-color, var(--md-sys-color-outline-variant));
   }
 `

package/src/spinner-styles.ts

@@ -14,6 +14,7 @@ export const SpinnerStyles = css`
     background: var(--oops-spinner-image) 0 0 no-repeat;
     background-size: 700%;
     animation: spinner steps(6) 2s infinite both;
+    z-index: 10;
   }
 
   #spinner[show] {

package/src/tooltip-styles.ts

@@ -6,7 +6,7 @@ export const TooltipStyles = css`
     position: absolute;
     content: attr(data-tooltip);
     color: #fff;
-    z-index: 1;
+    z-index: 1000;
     pointer-events: none;
     display: block;
 

package/stories/button-container-styles.stories.ts

@@ -2,11 +2,14 @@ import '@material/web/icon/icon.js'
 import { ButtonContainerStyles } from '../src/button-container-styles.js'
 
 import { css, html, render, TemplateResult } from 'lit'
+import { styles as MDTypeScaleStyles } from '@material/web/typography/md-typescale-styles'
 
 export default {
   title: 'button-container-styles-pure',
   component: 'div',
-  argTypes: {}
+  argTypes: {
+    theme: { control: 'select', options: ['light', 'dark'] }
+  }
 }
 
 interface Story<T> {
@@ -16,12 +19,16 @@ interface Story<T> {
 }
 
 interface ArgTypes {
-  label?: string
+  theme?: 'light' | 'dark'
 }
 
-const Template: Story<ArgTypes> = ({ label = '' }: ArgTypes) => html`
-  <link href="/themes/app-theme.css" rel="stylesheet" />
-  <link href="/themes/form-theme.css" rel="stylesheet" />
+const Template: Story<ArgTypes> = ({ theme = 'light' }: ArgTypes) => html`
+  <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet" />
+
+  <link href="/themes/light.css" rel="stylesheet" />
+  <link href="/themes/dark.css" rel="stylesheet" />
+  <link href="/themes/spacing.css" rel="stylesheet" />
+
   <link
     href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL@20..48,100..700,0..1"
     rel="stylesheet"
@@ -35,14 +42,36 @@ const Template: Story<ArgTypes> = ({ label = '' }: ArgTypes) => html`
     rel="stylesheet"
   />
 
+  <script>
+    document.body.classList.add('${theme}')
+  </script>
+
   <style>
     body {
-      background-color: white;
+      width: 100%;
+      height: 500px;
+      text-align: center;
+
+
+      background-color: var(--md-sys-color-background);
+      color: var(--md-sys-color-on-background);
     }
 
+    .container {
+      padding: var(--spacing-medium);
+      background-color: var(--md-sys-color-primary-container);
+      color: var(--md-sys-color-on-primary-container);
+
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+    }
+
+    ${MDTypeScaleStyles.cssText}
     ${ButtonContainerStyles.cssText}
   </style>
-  <div style="height:400px; background-color: black; padding: 10px; display: flex; flex-direction: column;gap: 10px;">
+
+  <div class="container md-typescale-body-medium">
     <div class="button-container" style="background-color: white;">
       <button raised><md-icon>save</md-icon>save</button>
       <button outlined><md-icon>launch</md-icon>remove</button>

package/stories/common-header-styles-actions.stories.ts

@@ -4,12 +4,14 @@ import '@operato/context/ox-context-page-toolbar.js'
 import { CommonHeaderStyles } from '../src/common-header-styles.js'
 
 import { css, html, render, TemplateResult } from 'lit'
+import { styles as MDTypeScaleStyles } from '@material/web/typography/md-typescale-styles'
 
 export default {
   title: 'common-header-styles-actions',
   component: 'div',
   argTypes: {
-    label: { control: 'string' }
+    label: { control: 'string' },
+    theme: { control: 'select', options: ['light', 'dark'] }
   }
 }
 
@@ -21,12 +23,17 @@ interface Story<T> {
 
 interface ArgTypes {
   label?: string
+  theme?: 'light' | 'dark'
 }
 
-const Template: Story<ArgTypes> = ({ label = '' }: ArgTypes) => html`
-  <link href="/themes/app-theme.css" rel="stylesheet" />
-  <link href="/themes/form-theme.css" rel="stylesheet" />
-    <link
+const Template: Story<ArgTypes> = ({ label = '', theme = 'light' }: ArgTypes) => html`
+  <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap" rel="stylesheet" />
+
+  <link href="/themes/light.css" rel="stylesheet" />
+  <link href="/themes/dark.css" rel="stylesheet" />
+  <link href="/themes/spacing.css" rel="stylesheet" />
+
+  <link
     href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL@20..48,100..700,0..1"
     rel="stylesheet"
   />
@@ -39,54 +46,72 @@ const Template: Story<ArgTypes> = ({ label = '' }: ArgTypes) => html`
     rel="stylesheet"
   />
 
+  <script>
+    document.body.classList.add('${theme}')
+  </script>
 
   <style>
     body {
-      background-color: white;
+      width: 100%;
+      height: 500px;
+      text-align: center;
+
+      background-color: var(--md-sys-color-background);
+      color: var(--md-sys-color-on-background);
     }
 
+    .container {
+      padding: var(--spacing-medium);
+      background-color: var(--md-sys-color-primary-container);
+      color: var(--md-sys-color-on-primary-container);
+
+      display: flex;
+      flex-direction: column;
+      gap: var(--spacing-medium);
+    }
+
+    ${MDTypeScaleStyles.cssText}
     ${CommonHeaderStyles.cssText}
   </style>
 
-  <div style="height:600px;">
+  <div class="container md-typescale-body-medium">
     <div class="header">
-      <div class="title">
-        ${label}
-      </div>
-
-      <div class="filters">
-        <label>Filter</label><input type="text"></input>
-      </div>
-
-      <ox-context-page-toolbar class="actions" .context=${{
-        exportable: {
-          // name: i18next.t('title.data-set list'),
-          // data: this.exportHandler.bind(this)
-        },
-        importable: {
-          // handler: this.importHandler.bind(this)
-        },
-        actions: [
-          {
-            title: 'save',
-            // action: this._updateDataSet.bind(this),
-            icon: 'save'
+      <div class="title">${label}</div>
+
+      <div class="filters"><label>Filter</label><input type="text" /></div>
+
+      <ox-context-page-toolbar
+        class="actions"
+        .context=${{
+          exportable: {
+            // name: i18next.t('title.data-set list'),
+            // data: this.exportHandler.bind(this)
           },
-          {
-            title: 'copy',
-            // action: this._copyDataSet.bind(this),
-            icon: 'content_copy'
+          importable: {
+            // handler: this.importHandler.bind(this)
           },
-          {
-            title: 'delete',
-            // action: this._deleteDataSet.bind(this),
-            icon: 'delete'
-          }
-        ],
-        toolbar: false
-      }}
-        
-      }> </ox-context-page-toolbar>
+          actions: [
+            {
+              title: 'save',
+              // action: this._updateDataSet.bind(this),
+              icon: 'save'
+            },
+            {
+              title: 'copy',
+              // action: this._copyDataSet.bind(this),
+              icon: 'content_copy'
+            },
+            {
+              title: 'delete',
+              // action: this._deleteDataSet.bind(this),
+              icon: 'delete'
+            }
+          ],
+          toolbar: false
+        }}
+        }
+      >
+      </ox-context-page-toolbar>
     </div>
   </div>
 `