Skip to content

Commit 77110e1

Browse files
committed
enhance(style): use 12px radius as default round corner style
1 parent dc81a86 commit 77110e1

File tree

14 files changed

+31
-19
lines changed

14 files changed

+31
-19
lines changed

src/Admin.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ const theme = createTheme(
5252
palette: {
5353
background: {},
5454
},
55+
shape:{
56+
borderRadius:12,
57+
},
5558
overrides: {
5659
MuiButton: {
5760
root: {

src/App.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ export default function App() {
6363
: themeConfig.palette.primary.main,
6464
},
6565
},
66+
shape:{
67+
...themeConfig.shape,
68+
borderRadius:12,
69+
},
6670
overrides: {
6771
MuiButton: {
6872
root: {
@@ -73,7 +77,7 @@ export default function App() {
7377
root: {
7478
textTransform: "none",
7579
},
76-
},
80+
}
7781
},
7882
});
7983
changeThemeColor(

src/component/FileManager/FileIcon.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const styles = (theme) => ({
4545
button: {
4646
border: "1px solid " + theme.palette.divider,
4747
width: "100%",
48-
borderRadius: "6px",
48+
borderRadius: theme.shape.borderRadius,
4949
boxSizing: "border-box",
5050
transition:
5151
"background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms",
@@ -71,14 +71,14 @@ const styles = (theme) => ({
7171
overflow: "hidden",
7272
height: "150px",
7373
width: "100%",
74-
borderRadius: "6px 6px 0 0",
74+
borderRadius: "12px 12px 0 0",
7575
backgroundColor: theme.palette.background.default,
7676
},
7777
previewIcon: {
7878
overflow: "hidden",
7979
height: "149px",
8080
width: "100%",
81-
borderRadius: "5px 5px 0 0",
81+
borderRadius: "12px 12px 0 0",
8282
backgroundColor: theme.palette.background.paper,
8383
paddingTop: "50px",
8484
},
@@ -107,7 +107,7 @@ const styles = (theme) => ({
107107
display: "none",
108108
},
109109
loadingAnimation: {
110-
borderRadius: "6px 6px 0 0",
110+
borderRadius: "12px 12px 0 0",
111111
height: "100%",
112112
width: "100%",
113113
},

src/component/FileManager/Folder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const useStyles = makeStyles((theme) => ({
3939
height: "50px",
4040
border: "1px solid " + theme.palette.divider,
4141
width: "100%",
42-
borderRadius: "6px",
42+
borderRadius: theme.shape.borderRadius,
4343
boxSizing: "border-box",
4444
transition:
4545
"background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms",

src/component/FileManager/SmallIcon.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const styles = (theme) => ({
4141
height: "50px",
4242
border: "1px solid " + theme.palette.divider,
4343
width: "100%",
44-
borderRadius: "6px",
44+
borderRadius: theme.shape.borderRadius,
4545
boxSizing: "border-box",
4646
transition:
4747
"background-color 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,box-shadow 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms,border 250ms cubic-bezier(0.4, 0, 0.2, 1) 0ms",

src/component/Navbar/UserAvatarPopover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class UserAvatarPopoverCompoment extends Component {
8989
this.props.toggleSnackbar(
9090
"top",
9191
"right",
92-
"您已退出登录",
92+
this.props.t("login.loggedOut"),
9393
"success"
9494
);
9595
Auth.signout();

src/component/Setting/Profile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const styles = (theme) => ({
3636
},
3737
},
3838
userNav: {
39+
borderRadius: `${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0 0`,
3940
height: "270px",
4041
backgroundColor: theme.palette.primary.main,
4142
padding: "20px 20px 2em",
@@ -197,7 +198,7 @@ class ProfileCompoment extends Component {
197198
<div className={classes.layout}>
198199
{this.state.user === null && <div></div>}
199200
{this.state.user !== null && (
200-
<Paper square>
201+
<Paper>
201202
<div className={classes.userNav}>
202203
<div>
203204
<Avatar

src/component/Share/ReadMe.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ export default function ReadMe(props) {
127127
ref={$vm}
128128
style={{
129129
boxShadow: "none",
130-
borderRadius: 4,
130+
borderRadius: theme.shape.borderRadius,
131131
backgroundColor: theme.palette.background.paper,
132132
}}
133133
height={"100%"}

src/component/Share/SharedFile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const styles = (theme) => ({
6565
width: "100%",
6666
maxWidth: 440,
6767
backgroundColor: theme.palette.background.paper,
68-
borderRadius: 12,
68+
borderRadius: theme.shape.borderRadius,
6969
boxShadow: "0 8px 16px rgba(29,39,55,.25)",
7070
[theme.breakpoints.down("sm")]: {
7171
height: "calc(var(--vh, 100vh) - 56px)",

src/component/Viewer/Code.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ const useStyles = makeStyles((theme) => ({
3636
marginBottom: 40,
3737
},
3838
editor: {
39-
borderRadius: "4px",
39+
borderRadius: theme.shape.borderRadius,
4040
},
4141
"@global": {
4242
".overflow-guard": {
43-
borderRadius: "4px!important",
43+
borderRadius: "0 0 12px 12px!important",
4444
},
4545
},
4646
formControl: {

0 commit comments

Comments
 (0)