From 9a649da2693106f677150190d5295325aa864a3b Mon Sep 17 00:00:00 2001 From: Lucas Oliveira <62335616+lucaseduoli@users.noreply.github.com> Date: Wed, 26 Mar 2025 13:24:12 -0300 Subject: [PATCH] fix: make json viewer design more consistent with current design (#7276) * Updated color of json editor * Added classes that make json viewer more consistent with current design --- src/frontend/src/App.css | 26 ------ src/frontend/src/style/applies.css | 7 +- src/frontend/src/style/classes.css | 127 +++++++++++++++++++++++++++++ src/frontend/src/style/index.css | 16 ++-- 4 files changed, 138 insertions(+), 38 deletions(-) diff --git a/src/frontend/src/App.css b/src/frontend/src/App.css index 1fa2b1f23..5db51f352 100644 --- a/src/frontend/src/App.css +++ b/src/frontend/src/App.css @@ -220,32 +220,6 @@ code { border-radius: 0px !important; } -.jse-space { - border-radius: var(--radius) !important; -} -.jse-button.jse-first { - border-radius: 5px !important; - border-top-right-radius: 0px !important; - border-bottom-right-radius: 0px !important; -} -.jse-group-button.jse-button:not(.jse-first) { - border-radius: 5px !important; - border-top-left-radius: 0px !important; - border-bottom-left-radius: 0px !important; - border-right: solid !important; -} -.jse-group-button.jse-button.jse-selected:not(.jse-first) { - border-right: none !important; -} - -.jse-menu .jse-button.jse-group-button { - border: 1px solid var(--jse-menu-color, var(--jse-text-color-inverse, #fff)) !important; -} - -.jse-menu .jse-separator { - margin-left: 10px !important; -} - .cm-gutters { display: none !important; } diff --git a/src/frontend/src/style/applies.css b/src/frontend/src/style/applies.css index 50b4b1108..442b439e2 100644 --- a/src/frontend/src/style/applies.css +++ b/src/frontend/src/style/applies.css @@ -1299,11 +1299,11 @@ } .deploy-dropdown-item { - @apply px-2.5 py-1 hover:bg-background cursor-pointer h-11 font-normal text-[14px] !important; + @apply h-11 cursor-pointer px-2.5 py-1 text-[14px] font-normal hover:bg-background !important; } .deploy-dropdown-item > :first-child { - @apply flex items-center w-full px-2 h-8 py-1 rounded-md !important; + @apply flex h-8 w-full items-center rounded-md px-2 py-1 !important; } :root { @@ -1343,7 +1343,8 @@ height: 100%; position: absolute; overflow: hidden; - background: url(data:image/png;base64,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), + background: + url(data:image/png;base64,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), var(--color-bg1); top: 0; left: 0; diff --git a/src/frontend/src/style/classes.css b/src/frontend/src/style/classes.css index 0e1cf5995..ff84f4c24 100644 --- a/src/frontend/src/style/classes.css +++ b/src/frontend/src/style/classes.css @@ -306,6 +306,133 @@ input[type="search"]::-webkit-search-cancel-button { right: 0 !important; } +.jse-status-bar { + padding: 10px !important; +} +.jse-menu { + padding: 10px !important; +} + +.jse-menu .jse-separator { + width: 0px !important; + opacity: 0 !important; +} + +.jse-menu .jse-space { + flex: 0 !important; +} + +.jse-space { + border-radius: var(--radius) !important; +} +.jse-group-button.jse-button.jse-first { + border-radius: 5px !important; + border-top-right-radius: 0px !important; + border-bottom-right-radius: 0px !important; + border-right: none !important; +} +.jse-group-button.jse-button:not(.jse-first) { + border-radius: 5px !important; + border-top-left-radius: 0px !important; + border-bottom-left-radius: 0px !important; + border-left: none !important; +} +.jse-group-button.jse-button:not(.jse-first) { + border-right: solid 1px hsl(var(--border)) !important; +} + +.jse-group-button.jse-button.jse-selected { + background-color: hsl(var(--background)) !important; + color: hsl(var(--foreground)) !important; + + background-image: linear-gradient( + to top, + hsl(var(--primary)) 2px, + transparent 2px + ) !important; +} + +.jse-group-button.jse-button { + background-color: hsl(var(--background)) !important; + color: hsl(var(--muted-foreground)) !important; + padding: 1rem !important; + font-weight: 500 !important; + margin: 0 !important; +} + +.jse-button { + color: hsl(var(--primary)) !important; +} + .linenumber { font-style: normal !important; } + +.jse-menu { + align-items: center !important; +} +.cm-textfield { + font-size: 0.875rem !important; + line-height: 1.25rem !important; + border: 1px solid hsl(var(--border)) !important; + background-color: hsl(var(--background)) !important; + border-radius: calc(var(--radius) - 2px) !important; + padding-left: 0.75rem !important; + padding-right: 0.75rem !important; + padding-top: 0.5rem !important; + padding-bottom: 0.5rem !important; +} + +.cm-button { + border-radius: var(--radius) !important; + color: hsl(var(--foreground)) !important; + font-size: 0.875rem !important; + line-height: 1.25rem !important; + padding-left: 1rem !important; + padding-right: 1rem !important; + padding-top: 0.25rem !important; + padding-bottom: 0.25rem !important; + height: 38px !important; +} + +.cm-button:hover { + background-color: hsl(var(--border)) !important; +} + +.cm-search.cm-panel { + gap: 0.5rem !important; + display: flex !important; + height: fit-content !important; + align-items: center !important; + padding-left: 10px !important; + padding-right: 10px !important; +} + +.cm-search.cm-panel label { + display: none; +} + +.cm-search.cm-panel button[name="close"] { + position: unset !important; + margin-left: auto !important; + border-radius: var(--radius) !important; + color: hsl(var(--foreground)) !important; + height: 32px !important; + padding-bottom: 5px !important; +} + +.jse-button.jse-search { + border-radius: var(--radius) !important; + color: hsl(var(--foreground)) !important; + height: 32px !important; + padding-bottom: 5px !important; + margin-left: auto !important; +} + +.jse-button.jse-search:hover { + background-color: hsl(var(--border)) !important; +} + +.jse-button.jse-search:active { + background-color: hsl(var(--border)) !important; +} diff --git a/src/frontend/src/style/index.css b/src/frontend/src/style/index.css index 8ef741ab2..07b2cb13d 100644 --- a/src/frontend/src/style/index.css +++ b/src/frontend/src/style/index.css @@ -46,9 +46,9 @@ --jse-theme-color: hsl(240, 5%, 96%); --jse-theme-color-highlight: hsl(240, 6%, 90%); - --jse-menu-color: hsl(0, 0%, 0%); + --jse-menu-color: hsl(240, 6%, 90%); --jse-main-border: hsl(240, 6%, 90%); - --jse-background-color: hsl(0, 0%, 100%); + --jse-background-color: hsl(240, 5%, 96%); --jse-text-color: hsl(0, 0%, 0%); --jse-selection-background-color: hsl(240, 5%, 96%); --jse-selection-background-inactive-color: hsl(240, 6%, 90%); @@ -188,10 +188,8 @@ --zinc-foreground: 240 5.9% 90%; - - --accent-amber: 21.7 77.8% 26.5%; - --accent-amber-foreground: 26 90.5% 37.1%; + --accent-amber-foreground: 26 90.5% 37.1%; --red-foreground: 0 90.6% 70.8%; } @@ -230,12 +228,13 @@ --accent-pink-foreground: 329 86% 70%; /* hsl(329, 86%, 70%) */ --tooltip: 0 0% 100%; /* hsl(0, 0%, 100%) */ - --jse-theme-color: hsl(240, 6%, 10%) !important; + --jse-theme-color: hsl(240, 4%, 16%) !important; --jse-theme-color-highlight: hsl(240, 4%, 16%); --jse-panel-background: hsl(240, 4%, 16%); - --jse-menu-color: hsl(240, 6%, 90%); + --jse-menu-color: hsl(240, 5%, 26%); + --jse-main-border: hsl(240, 5%, 26%); - --jse-background-color: hsl(0, 0%, 0%); + --jse-background-color: hsl(240, 4%, 16%); --jse-text-color: hsl(0, 0%, 100%); --jse-selection-background-color: hsl(240, 4%, 16%); --jse-selection-background-inactive-color: hsl(240, 5%, 26%); @@ -445,7 +444,6 @@ --zinc-foreground: 240 5.2% 33.9%; - --accent-amber: 48 96.5% 88.8%; --accent-amber-foreground: 45.9 96.7% 64.5%; --red-foreground: 0 72.2% 50.6%;