Skip to content

Commit f34e20c

Browse files
committed
Fixed inconsistent styling
1 parent b92bbb0 commit f34e20c

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ const App = () => {
7171
export default interface Theme {
7272
theme: string;
7373
bg: string;
74-
contentBg: string;
7574
text: string;
75+
contentBg: string;
76+
contentText: string;
7677
border: string;
7778
searchBarBg: string;
7879
tabBarBg: string;

src/components/ArcBrowser/styles.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import Theme from "../types/BrowserTheme";
44
export const lightTheme: Theme = {
55
theme: "light",
66
bg: "linear-gradient(210deg, #D3C26A 0%, #E97580 100%)",
7-
contentBg: "#FFF",
87
text: "#71393E",
8+
contentBg: "#FFF",
9+
contentText: "#000",
910
border: "#6b4f52",
1011
tabBarBg: "transparent",
1112
searchBarBg: "rgba(100,50,0,0.1)",
@@ -58,6 +59,7 @@ export const ContentContainer = styled.div<{
5859
theme: Theme;
5960
}>`
6061
background-color: ${({ theme }) => theme.contentBg};
62+
color: ${({ theme }) => theme.contentText};
6163
border-radius: 6px;
6264
width: 100%;
6365
box-shadow: 0 0 40px rgba(0, 0, 0, 0.1);

src/components/ChromeBrowser/ChromeBrowser.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const ChromeBrowser: React.FC<BrowserProps> = ({
4646
},
4747
],
4848
shadow = true,
49-
useContentSize = true,
49+
useContentSize = false,
5050
contentScroll = true,
5151
leftIcons = (
5252
<>

src/components/ChromeBrowser/styles.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import Theme from "../types/BrowserTheme";
44
export const lightTheme: Theme = {
55
theme: "light",
66
bg: "#fff",
7-
contentBg: "#fff",
87
text: "#333",
8+
contentBg: "#fff",
9+
contentText: "#000",
910
border: "#E1E3E1",
1011
tabBarBg: "#E3E3E3",
1112
searchBarBg: "#efeded",
@@ -17,8 +18,9 @@ export const lightTheme: Theme = {
1718
export const darkTheme: Theme = {
1819
theme: "dark",
1920
bg: "#333",
20-
contentBg: "#333",
2121
text: "#f5f5f5",
22+
contentBg: "#333",
23+
contentText: "#f5f5f5",
2224
border: "#555",
2325
tabBarBg: "#222",
2426
searchBarBg: "#444",
@@ -56,6 +58,8 @@ export const BrowserContainer = styled.div<{
5658
color: ${({ theme }) => theme.text};
5759
overflow: hidden;
5860
text-align: left;
61+
display: flex;
62+
flex-direction: column;
5963
transition:
6064
background-color 0.3s,
6165
color 0.3s;
@@ -139,8 +143,10 @@ export const ContentContainer = styled.div<{
139143
theme: Theme;
140144
}>`
141145
background-color: ${({ theme }) => theme.contentBg};
146+
color: ${({ theme }) => theme.contentText};
142147
width: 100%;
143148
overflow: ${({ $contentScroll }) => ($contentScroll ? "auto" : "hidden")};
144149
position: relative;
145-
height: 100%;
150+
flex-grow: 1;
151+
max-height: 100%;
146152
`;

src/components/types/BrowserTheme.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
export default interface Theme {
22
theme: string;
33
bg: string;
4-
contentBg: string;
54
text: string;
5+
contentBg: string;
6+
contentText: string;
67
border: string;
78
searchBarBg: string;
89
tabBarBg: string;

0 commit comments

Comments
 (0)