Skip to content

Commit

Permalink
Fix accidental replace default theme with other
Browse files Browse the repository at this point in the history
  • Loading branch information
DeKal committed Dec 26, 2020
1 parent 57bfb80 commit 90eba76
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion modules/core/theme/ThemeProviderSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const useTheme = router => {
return tetTheme
}

return tetTheme
return theme
}

const selectGlobalCss = (router, theme) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,10 @@ exports[`Theme Provider Selector Selector fo normal theme should render for norm
<ThemeProvider
theme={
Object {
"aboutMarginTop": "-111px",
"aboutMarginTop": "-200px",
"colors": Object {
"bgColor": "#fff",
"colorAccent": "#FFA500",
"colorAccent": "#FFA726",
"colorBlack": "#000000",
"colorDark": "#2c3e50",
"colorDarken": "#bdc3c7",
Expand Down Expand Up @@ -511,12 +511,13 @@ exports[`Theme Provider Selector Selector fo normal theme should render for norm
"workexp": "\\\\e804",
},
"images": Object {
"background": "/images/tet/bg-tet.webp",
"background": "/images/bg.webp",
"backgroundMobile": "/images/bg-mobile.webp",
"bgPattern": "/images/tet/bg-pattern.webp",
"bgPatternOpacity": "0.1",
"overlay": "",
"overlayBgColor": "",
"bgPattern": "/images/bg-pattern.webp",
"bgPatternOpacity": "1",
"overlay": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDoAABSCAABFVgAADqXAAAXb9daH5AAAAAZSURBVHjaYmCAAGM0GjfHGEMGAAAA//8DACm0ATMe8beGAAAAAElFTkSuQmCC",
"overlayBgColor": "rgba(44, 62, 80, 0.4)",
"overlayBgColorMobile": "rgba(44, 62, 80, 0.3)",
},
"navContentMinHeight": "80px",
"navHeaderHeight": "40px",
Expand All @@ -533,17 +534,16 @@ exports[`Theme Provider Selector Selector fo normal theme should render for norm
"xxsmall": 10,
"xxxsmall": 7,
},
"titleBgColor": "rgba(44, 25, 0, 0.2)",
}
}
>
<GlobalStyleCss
theme={
Object {
"aboutMarginTop": "-111px",
"aboutMarginTop": "-200px",
"colors": Object {
"bgColor": "#fff",
"colorAccent": "#FFA500",
"colorAccent": "#FFA726",
"colorBlack": "#000000",
"colorDark": "#2c3e50",
"colorDarken": "#bdc3c7",
Expand Down Expand Up @@ -589,12 +589,13 @@ exports[`Theme Provider Selector Selector fo normal theme should render for norm
"workexp": "\\\\e804",
},
"images": Object {
"background": "/images/tet/bg-tet.webp",
"background": "/images/bg.webp",
"backgroundMobile": "/images/bg-mobile.webp",
"bgPattern": "/images/tet/bg-pattern.webp",
"bgPatternOpacity": "0.1",
"overlay": "",
"overlayBgColor": "",
"bgPattern": "/images/bg-pattern.webp",
"bgPatternOpacity": "1",
"overlay": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDoAABSCAABFVgAADqXAAAXb9daH5AAAAAZSURBVHjaYmCAAGM0GjfHGEMGAAAA//8DACm0ATMe8beGAAAAAElFTkSuQmCC",
"overlayBgColor": "rgba(44, 62, 80, 0.4)",
"overlayBgColorMobile": "rgba(44, 62, 80, 0.3)",
},
"navContentMinHeight": "80px",
"navHeaderHeight": "40px",
Expand All @@ -611,7 +612,6 @@ exports[`Theme Provider Selector Selector fo normal theme should render for norm
"xxsmall": 10,
"xxxsmall": 7,
},
"titleBgColor": "rgba(44, 25, 0, 0.2)",
}
}
/>
Expand Down

0 comments on commit 90eba76

Please sign in to comment.