diff --git a/src/_h5ai/client/css/inc/colors.less b/src/_h5ai/client/css/inc/colors.less index 279d4d05..3e914372 100644 --- a/src/_h5ai/client/css/inc/colors.less +++ b/src/_h5ai/client/css/inc/colors.less @@ -1,16 +1,19 @@ -@col-blue-200: #90caf9; @col-blue-400: #42a5f5; -@col-blue-500: #2196F3; -@col-blue-700: #1976D2; -@col-blue-900: #0D47A1; -@col-green: #4caf50; -@col-red: #f44336; +@col-green-500: #4caf50; +@col-red-500: #f44336; @col-pink-a200: #ff4081; -@col-light: #ffffff; -@col-lightgray: #fafafa; -@col-darkgray: #f3f3f3; -@col-dark: #212121; +@col-white: #ffffff; +@col-grey-50: #fafafa; +@col-grey-100: #f5f5f5; +@col-grey-300: #e0e0e0; +@col-grey-700: #616161; +@col-grey-900: #212121; + +@col-light: @col-white; +@col-lightgrey: @col-grey-50; +@col-darkgrey: @col-grey-100; +@col-dark: @col-grey-900; @col-text-primary-black: rgba(0,0,0,0.87); @col-text-secondary-black: rgba(0,0,0,0.54); @@ -25,13 +28,11 @@ @col-text-selected: @col-text-primary-white; @col-back-selected: @col-blue-400; -@col-text-highlight: #111111; - @col-font-light: @col-light; @col-font-dark: @col-dark; -@col-back-light: @col-lightgray; -@col-back-dark: @col-darkgray; +@col-back-light: @col-lightgrey; +@col-back-dark: @col-darkgrey; @col: @col-text-primary-black; @col-back: @col-back-dark; @@ -40,17 +41,10 @@ @col-border-strong: rgba(0,0,0,0.15); @col-border-stronger: rgba(0,0,0,0.3); -@col-okay: @col-green; -@col-error: @col-red; +@col-okay: @col-green-500; +@col-error: @col-red-500; @col-link: @col-blue-400; -@col-link-hover: @col-blue-400; -@col-widget-back: rgb(245,245,245); -@col-widget-back-highlight: rgba(255,255,255,0.8); -@col-widget-back-hover: rgba(255,255,255,0.8); -@col-widget-back-sel: rgba(255,255,255,0.8); -@col-widget-sep: @col-border; - -@col-range-back: rgb(224,224,224); -@col-range-thumb: #555; +@col-range-back: @col-grey-300; +@col-range-thumb: @col-grey-700; diff --git a/src/_h5ai/client/css/inc/core/fallback.less b/src/_h5ai/client/css/inc/core/fallback.less index 3d7ab5c3..884d3a35 100644 --- a/src/_h5ai/client/css/inc/core/fallback.less +++ b/src/_h5ai/client/css/inc/core/fallback.less @@ -63,7 +63,7 @@ overflow: hidden; box-shadow: 0 0 8px 0 rgba(0,0,0,0.2); text-align: right; - background: @col-lightgray; + background: @col-lightgrey; a, a:active, a:visited { display: inline-block; diff --git a/src/_h5ai/client/css/inc/core/notify.less b/src/_h5ai/client/css/inc/core/notify.less index 2d2bcd03..df7cf7b3 100644 --- a/src/_h5ai/client/css/inc/core/notify.less +++ b/src/_h5ai/client/css/inc/core/notify.less @@ -5,8 +5,8 @@ margin-left: -100px; z-index: 100; padding: 3px 6px 6px 6px; - color: #fff; - background-color: rgba(0, 0, 0, 0.2); + color: @col-light; + background: rgba(0,0,0,0.2); border-radius: 0 0 4px 4px; text-align: center; } diff --git a/src/_h5ai/client/css/inc/core/root-info.less b/src/_h5ai/client/css/inc/core/root-info.less index 47442765..372c7a0d 100644 --- a/src/_h5ai/client/css/inc/core/root-info.less +++ b/src/_h5ai/client/css/inc/core/root-info.less @@ -13,7 +13,7 @@ border-radius: 4px; font-family: @font-family-mono; letter-spacing: 0.05em; - background-color: @col-widget-back; + background: @col-lightgrey; border: 1px solid @col-border; font-size: 0.9em; } diff --git a/src/_h5ai/client/css/inc/core/topbar.less b/src/_h5ai/client/css/inc/core/topbar.less index bb3a6eb3..da27b0e3 100644 --- a/src/_h5ai/client/css/inc/core/topbar.less +++ b/src/_h5ai/client/css/inc/core/topbar.less @@ -10,7 +10,7 @@ align-content: flex-start; align-items: stretch; - background: @col-lightgray; + background: @col-lightgrey; box-shadow: 0 0 8px 0 rgba(0,0,0,0.2); z-index: 1; } diff --git a/src/_h5ai/client/css/inc/core/view.less b/src/_h5ai/client/css/inc/core/view.less index 0d93b841..1079a2e2 100644 --- a/src/_h5ai/client/css/inc/core/view.less +++ b/src/_h5ai/client/css/inc/core/view.less @@ -27,7 +27,7 @@ &:hover { color: @col-hover; - background: @col-lightgray; + background: @col-lightgrey; border-color: @col-border; .selector { diff --git a/src/_h5ai/client/css/inc/ext/contextmenu.less b/src/_h5ai/client/css/inc/ext/contextmenu.less index 70c6d562..e723c8bf 100644 --- a/src/_h5ai/client/css/inc/ext/contextmenu.less +++ b/src/_h5ai/client/css/inc/ext/contextmenu.less @@ -40,7 +40,7 @@ &:hover { color: @col-hover; - background: @col-darkgray; + background: @col-darkgrey; } .cm-icon { diff --git a/src/_h5ai/client/css/inc/ext/crumb.less b/src/_h5ai/client/css/inc/ext/crumb.less index a5e484d6..2789c93b 100644 --- a/src/_h5ai/client/css/inc/ext/crumb.less +++ b/src/_h5ai/client/css/inc/ext/crumb.less @@ -12,7 +12,6 @@ &.active { font-weight: bold; - color: @col-text-highlight; } &:hover { color: @col-hover; diff --git a/src/_h5ai/client/css/inc/ext/custom.less b/src/_h5ai/client/css/inc/ext/custom.less index 7f35e1d2..b7d3c285 100644 --- a/src/_h5ai/client/css/inc/ext/custom.less +++ b/src/_h5ai/client/css/inc/ext/custom.less @@ -9,7 +9,7 @@ cursor: pointer; &:hover { - color: #000; + color: @col-dark; } } diff --git a/src/_h5ai/client/css/inc/ext/download.less b/src/_h5ai/client/css/inc/ext/download.less index 492028e2..81828ce5 100644 --- a/src/_h5ai/client/css/inc/ext/download.less +++ b/src/_h5ai/client/css/inc/ext/download.less @@ -2,6 +2,6 @@ display: none; &.failed { - background-color: @col-error; + background: @col-error; } } diff --git a/src/_h5ai/client/css/inc/ext/preview-txt.less b/src/_h5ai/client/css/inc/ext/preview-txt.less index 61b01165..8b98bc45 100644 --- a/src/_h5ai/client/css/inc/ext/preview-txt.less +++ b/src/_h5ai/client/css/inc/ext/preview-txt.less @@ -1,7 +1,7 @@ #pv-txt-text { max-width: 960px; text-align: left; - background-color: #fff; + background: #fff; margin: 0 auto; padding: 8px; overflow: auto; diff --git a/src/_h5ai/client/css/inc/ext/preview.less b/src/_h5ai/client/css/inc/ext/preview.less index b06696e8..8fd7e625 100644 --- a/src/_h5ai/client/css/inc/ext/preview.less +++ b/src/_h5ai/client/css/inc/ext/preview.less @@ -7,14 +7,14 @@ bottom: 0; z-index: 100; - background-color: rgba(0,0,0,0.5); + background: rgba(0,0,0,0.5); transition: background-color 0.3s ease-in-out; text-align: center; } #pv-overlay.fullscreen { - background-color: #111; + background: #111; } #pv-content { @@ -58,7 +58,7 @@ &:hover { img { opacity: 1; - background-color: rgba(27,27,27,0.8); + background: rgba(27,27,27,0.8); box-shadow: 0 0 8px 2px rgba(0,0,0,0.3); } } @@ -112,7 +112,7 @@ &:hover { opacity: 1.0; - background-color: rgba(255,255,255,0.1); + background: rgba(255,255,255,0.1); } } @@ -131,7 +131,7 @@ left: 0; right: 0; bottom: 0; - background-color: rgb(27,27,27); + background: rgb(27,27,27); box-shadow: 0 0 8px 2px rgba(0,0,0,0.3); height: 48px; } diff --git a/src/_h5ai/client/css/inc/responsive.less b/src/_h5ai/client/css/inc/responsive.less index a38c4c4c..27b70db4 100644 --- a/src/_h5ai/client/css/inc/responsive.less +++ b/src/_h5ai/client/css/inc/responsive.less @@ -24,7 +24,7 @@ a[href]:after { content: "" !important; } - #toolbar, #download, #sidebar, #tree, #info { + #toolbar, #sidebar, #tree, #info { display: none !important; } } diff --git a/test/styles.less b/test/styles.less index af4c5db3..6ac00f44 100644 --- a/test/styles.less +++ b/test/styles.less @@ -1,9 +1,14 @@ @charset "utf-8"; -@col-red: #f44336; -@col-red-text: #c62828; -@col-green: #4caf50; -@col-grey: #555; +@col-white: #ffffff; +@col-red-500: #f44336; +@col-red-800: #c62828; +@col-green-500: #4caf50; +@col-grey-200: #eeeeee; +@col-grey-800: #424242; + +@col-medium: #c09853; +@col-slow: #b94a48; #report { font-family: Roboto, Helvetica, Arial, sans-serif; @@ -11,9 +16,9 @@ left: 0; top: 0; right: 0; - background: @col-grey; + background: @col-grey-800; z-index: 10000; - color: #fff; + color: @col-white; font-size: 14px; font-weight: bold; line-height: 32px; @@ -22,14 +27,14 @@ a, a:active, a:visited, a:hover { display: block; - color: #fff; + color: @col-white; text-decoration: none; } &.pass { - background: @col-green; + background: @col-green-500; } &.fail { - background: @col-red; + background: @col-red-500; } } @@ -40,7 +45,7 @@ top: 32px; right: 0; bottom: 0; - background: #fff; + background: @col-white; z-index: 10000; overflow-x: auto; overflow-y: scroll; @@ -79,11 +84,11 @@ overflow: hidden; &:hover { - background: #eee; + background: @col-grey-200; } &.fail { - color: @col-red-text; + color: @col-red-800; } &::before { @@ -93,34 +98,34 @@ height: 10px; float: left; margin-right: 8px; - background: @col-grey; + background: @col-grey-800; border-radius: 20px; position: relative; top: 3px; } &.pass::before { - background: @col-green; + background: @col-green-500; } &.fail::before { - background: @col-red; + background: @col-red-500; } &.pending::before { - background: @col-grey; + background: @col-grey-800; } .duration { display: inline-block; - color: @col-grey; + color: @col-grey-800; border: none; box-shadow: none; font-size: 9px; margin-left: 12px; } &.medium .duration { - background: #c09853; + background: @col-medium; } &.slow .duration { - background: #b94a48; + background: @col-slow; } pre { @@ -132,10 +137,10 @@ padding: 0 8px; max-width: 80%; word-wrap: break-word; - border-left: 2px solid @col-grey; + border-left: 2px solid @col-grey-800; &.error { - color: @col-red-text; + color: @col-red-800; } } } @@ -144,7 +149,7 @@ margin: 16px 0 8px 24px; > h1 { - color: @col-grey; + color: @col-grey-800; height: 24px; line-height: 24px; font-size: 16px; @@ -161,7 +166,7 @@ } a:hover { - background: #eee; + background: @col-grey-200; cursor: pointer; } @@ -169,11 +174,11 @@ font-size: 0.85em; .passed { - color: @col-green; + color: @col-green-500; margin-left: 1em; } .failed { - color: @col-red; + color: @col-red-500; margin-left: 0.5em; } } @@ -190,7 +195,7 @@ top: 40px; right: 20px; margin: 0; - color: @col-grey; + color: @col-grey-800; z-index: 1; font-size: 13px;