Skip to content

✨ Innovative and open-source visualization application that transforms various data formats, such as JSON, YAML, XML and CSV into interactive graphs.

fix theme scroll background

AykutSarac9e33ff60c830
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 5d8b6733..b977993c 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -2,7 +2,7 @@ import React from "react";
import styled, { DefaultTheme } from "styled-components";
enum ButtonType {
- PRIMARY = "SILVER_DARK",
+ PRIMARY = "PRIMARY",
SECONDARY = "BLURPLE",
DANGER = "DANGER",
SUCCESS = "SEAGREEN",
diff --git a/src/constants/globalStyle.ts b/src/constants/globalStyle.ts
index aa142ea0..aec86d02 100644
--- a/src/constants/globalStyle.ts
+++ b/src/constants/globalStyle.ts
@@ -12,17 +12,6 @@ const GlobalStyle = createGlobalStyle`
font-size: 16px;
}
-
- ::-webkit-scrollbar {
- width: 8px;
- background: ${({ theme }) => theme.BLACK_SECONDARY};
- }
-
- ::-webkit-scrollbar-thumb {
- border-radius: 5px;
- background-color: ${({ theme }) => theme.SILVER_DARK};
- }
-
a {
text-decoration: none;
color: unset;
diff --git a/src/constants/theme.ts b/src/constants/theme.ts
index 78b28ee1..356b9166 100644
--- a/src/constants/theme.ts
+++ b/src/constants/theme.ts
@@ -16,6 +16,7 @@ export const darkTheme: DefaultTheme = {
ORANGE: "#FAA81A",
SILVER: "#B9BBBE",
SILVER_DARK: "#4D4D4D",
+ PRIMARY: "#4D4D4D",
INTERACTIVE_NORMAL: "#b9bbbe",
INTERACTIVE_HOVER: "#dcddde",
@@ -37,7 +38,7 @@ export const lightTheme: DefaultTheme = {
BLACK_DARK: "#2C2F33",
BLACK_LIGHT: "#2F3136",
BLACK_PRIMARY: "#36393f",
- BLACK_SECONDARY: "#23272A",
+ BLACK_SECONDARY: "#F2F2F2",
CRIMSON: "#DC143C",
DARK_SALMON: "#E9967A",
DANGER: "#db662e",
@@ -45,7 +46,8 @@ export const lightTheme: DefaultTheme = {
SEAGREEN: "#3BA55D",
ORANGE: "#FAA81A",
SILVER: "#B9BBBE",
- SILVER_DARK: "#4D4D4D",
+ SILVER_DARK: "#CCCCCC",
+ PRIMARY: "#4D4D4D",
INTERACTIVE_NORMAL: "#4f5660",
INTERACTIVE_HOVER: "#2e3338",
diff --git a/src/pages/editor/index.tsx b/src/pages/editor/index.tsx
index ccd7389b..540867f6 100644
--- a/src/pages/editor/index.tsx
+++ b/src/pages/editor/index.tsx
@@ -1,10 +1,23 @@
import React from "react";
import Head from "next/head";
import { Editor } from "src/containers/Editor";
+import styled from "styled-components";
+
+const StyledEditorWrapper = styled.div`
+ *::-webkit-scrollbar {
+ width: 8px;
+ background: ${({ theme }) => theme.BLACK_SECONDARY};
+ }
+
+ *::-webkit-scrollbar-thumb {
+ border-radius: 5px;
+ background-color: ${({ theme }) => theme.SILVER_DARK};
+ }
+`;
const EditorPage: React.FC = () => {
return (
- <>
+ <StyledEditorWrapper>
<Head>
<title>Editor | JSON Visio</title>
<meta
@@ -13,7 +26,7 @@ const EditorPage: React.FC = () => {
/>
</Head>
<Editor />
- </>
+ </StyledEditorWrapper>
);
};
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index fc25d9e0..b6f79add 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -12,6 +12,16 @@ import { useRouter } from "next/router";
const StyledHome = styled.div`
padding: 24px;
+
+ ::-webkit-scrollbar {
+ width: 8px;
+ background: #23272a !important;
+ }
+
+ ::-webkit-scrollbar-thumb {
+ border-radius: 5px;
+ background-color: #4d4d4d !important;
+ }
`;
const StyledContent = styled.div`
diff --git a/src/typings/styled.d.ts b/src/typings/styled.d.ts
index 72a56794..4f355b32 100644
--- a/src/typings/styled.d.ts
+++ b/src/typings/styled.d.ts
@@ -24,6 +24,7 @@ declare module "styled-components" {
ORANGE: string;
SILVER: string;
SILVER_DARK: string;
+ PRIMARY: string;
INTERACTIVE_NORMAL: string;
INTERACTIVE_HOVER: string;