@punch-in/strapi-admin 1.2.3 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/admin/src/components/GlobalStyle/index.js +5 -2
- package/admin/src/components/LeftMenu/LeftMenuLink/A.js +23 -9
- package/admin/src/components/LeftMenu/LeftMenuLink/LeftMenuIcon.js +3 -3
- package/admin/src/components/LeftMenu/LeftMenuLink/LeftMenuLinkContent.js +1 -1
- package/admin/src/components/NavTopRightWrapper/index.js +16 -1
- package/admin/src/themes/colors.js +12 -5
- package/package.json +1 -1
|
@@ -1,21 +1,24 @@
|
|
|
1
1
|
import { createGlobalStyle } from 'styled-components';
|
|
2
2
|
|
|
3
3
|
const GlobalStyle = createGlobalStyle`
|
|
4
|
+
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;900&display=swap');
|
|
5
|
+
|
|
4
6
|
html {
|
|
5
7
|
font-size: 62.5%;
|
|
6
8
|
}
|
|
7
9
|
|
|
8
10
|
body {
|
|
9
|
-
font-family: 'Lato';
|
|
11
|
+
font-family: 'Inter', 'Lato', sans-serif;
|
|
10
12
|
font-size: 1.4rem;
|
|
11
13
|
line-height: 1.5;
|
|
12
14
|
color: #004a99;
|
|
15
|
+
background-color: #f8fafc;
|
|
13
16
|
}
|
|
14
17
|
|
|
15
18
|
* {
|
|
16
19
|
-webkit-font-smoothing: antialiased;
|
|
17
20
|
box-sizing: border-box;
|
|
18
|
-
font-family: 'Lato';
|
|
21
|
+
font-family: 'Inter', 'Lato', sans-serif;
|
|
19
22
|
}
|
|
20
23
|
|
|
21
24
|
h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
|
@@ -8,29 +8,43 @@ const A = styled.a`
|
|
|
8
8
|
padding-left: 1.6rem;
|
|
9
9
|
min-height: 3.6rem;
|
|
10
10
|
line-height: 1.8rem;
|
|
11
|
-
border-left:
|
|
11
|
+
border-left: 3px solid transparent;
|
|
12
12
|
cursor: pointer;
|
|
13
13
|
color: ${props => props.theme.main.colors.leftMenu['link-color']};
|
|
14
|
+
font-size: 1.4rem;
|
|
15
|
+
font-weight: 500;
|
|
16
|
+
letter-spacing: 0.01rem;
|
|
14
17
|
text-decoration: none;
|
|
15
18
|
-webkit-font-smoothing: antialiased;
|
|
16
19
|
|
|
20
|
+
svg {
|
|
21
|
+
color: ${props => props.theme.main.colors.secondaryText};
|
|
22
|
+
}
|
|
23
|
+
|
|
17
24
|
&:hover {
|
|
18
|
-
color: ${props => props.theme.main.colors.
|
|
19
|
-
background: ${props => props.theme.main.colors.
|
|
20
|
-
border-left: 0.3rem solid ${props => props.theme.main.colors.strapi.red};
|
|
25
|
+
color: ${props => props.theme.main.colors.mediumBlue};
|
|
26
|
+
background: ${props => props.theme.main.colors.activeBackground};
|
|
21
27
|
text-decoration: none;
|
|
28
|
+
|
|
29
|
+
svg {
|
|
30
|
+
color: ${props => props.theme.main.colors.mediumBlue};
|
|
31
|
+
}
|
|
22
32
|
}
|
|
23
33
|
|
|
24
34
|
&:focus {
|
|
25
|
-
color: ${props => props.theme.main.colors.
|
|
26
|
-
border-left: 0.3rem solid ${props => props.theme.main.colors.strapi.blue};
|
|
35
|
+
color: ${props => props.theme.main.colors.mediumBlue};
|
|
27
36
|
text-decoration: none;
|
|
28
37
|
}
|
|
29
38
|
|
|
30
39
|
&.linkActive {
|
|
31
|
-
color: ${props => props.theme.main.colors.
|
|
32
|
-
border-left:
|
|
33
|
-
background: ${props => props.theme.main.colors.
|
|
40
|
+
color: ${props => props.theme.main.colors.mediumBlue} !important;
|
|
41
|
+
border-left: 3px solid ${props => props.theme.main.colors.mediumBlue};
|
|
42
|
+
background: ${props => props.theme.main.colors.activeBackground};
|
|
43
|
+
font-weight: 600;
|
|
44
|
+
|
|
45
|
+
svg {
|
|
46
|
+
color: ${props => props.theme.main.colors.mediumBlue};
|
|
47
|
+
}
|
|
34
48
|
}
|
|
35
49
|
`;
|
|
36
50
|
|
|
@@ -5,10 +5,10 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
|
|
|
5
5
|
|
|
6
6
|
const FaIcon = styled(({ small, ...props }) => <FontAwesomeIcon {...props} />)`
|
|
7
7
|
position: absolute;
|
|
8
|
-
top: ${({ small }) => (small ? 'calc(50% - 0.3rem)' : 'calc(50% - 0.
|
|
8
|
+
top: ${({ small }) => (small ? 'calc(50% - 0.3rem)' : 'calc(50% - 0.95rem)')};
|
|
9
9
|
left: ${({ small }) => (small ? '2.2rem' : '1.6rem')};
|
|
10
|
-
width: ${({ small }) => (small ? 'auto' : '1.
|
|
11
|
-
font-size: ${({ small }) => (small ? '.5rem' : '1.
|
|
10
|
+
width: ${({ small }) => (small ? 'auto' : '1.9rem')} !important;
|
|
11
|
+
font-size: ${({ small }) => (small ? '.5rem' : '1.9rem')};
|
|
12
12
|
`;
|
|
13
13
|
|
|
14
14
|
const LeftMenuIcon = ({ icon }) => <FaIcon small={icon === 'circle'} icon={icon} />;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import styled from 'styled-components';
|
|
2
|
+
import PropTypes from 'prop-types';
|
|
2
3
|
|
|
3
4
|
const NavTopRightWrapper = styled.div`
|
|
4
5
|
position: fixed;
|
|
5
6
|
top: 0;
|
|
6
7
|
right: 0;
|
|
7
8
|
display: flex;
|
|
8
|
-
background-color:
|
|
9
|
+
background-color: ${props => props.theme.main.colors.mediumBlue};
|
|
9
10
|
color: #fff;
|
|
10
11
|
width: 100%;
|
|
11
12
|
justify-content: space-between;
|
|
@@ -17,4 +18,18 @@ const NavTopRightWrapper = styled.div`
|
|
|
17
18
|
z-index: 15;
|
|
18
19
|
`;
|
|
19
20
|
|
|
21
|
+
NavTopRightWrapper.defaultProps = {
|
|
22
|
+
theme: {
|
|
23
|
+
main: {
|
|
24
|
+
colors: {
|
|
25
|
+
mediumBlue: '#006fe6',
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
NavTopRightWrapper.propTypes = {
|
|
32
|
+
theme: PropTypes.object,
|
|
33
|
+
};
|
|
34
|
+
|
|
20
35
|
export default NavTopRightWrapper;
|
|
@@ -26,9 +26,16 @@ const colors = {
|
|
|
26
26
|
greyAlpha: 'rgba(227, 233, 243, 0.5)',
|
|
27
27
|
lightestBlue: '#e4f0fc',
|
|
28
28
|
lightBlue: '#e6f0fb',
|
|
29
|
-
mediumBlue: '#
|
|
29
|
+
mediumBlue: '#006fe6',
|
|
30
30
|
darkBlue: '#aed4fb',
|
|
31
31
|
pale: '#f7f8f8',
|
|
32
|
+
// Modern-SaaS-palette redesign (2026-08): secondary/active/border/page
|
|
33
|
+
// tokens the old palette didn't have named slots for - see colors below
|
|
34
|
+
// for what each replaces.
|
|
35
|
+
secondaryText: '#607d94',
|
|
36
|
+
activeBackground: '#e6f2ff',
|
|
37
|
+
borderLight: '#d9e4ee',
|
|
38
|
+
pageBackground: '#f8fafc',
|
|
32
39
|
content: {
|
|
33
40
|
background: '#fafafb',
|
|
34
41
|
'background-alpha': 'rgba(14, 22, 34, 0.02)',
|
|
@@ -36,9 +43,9 @@ const colors = {
|
|
|
36
43
|
leftMenu: {
|
|
37
44
|
'link-hover': '#00458f',
|
|
38
45
|
'link-visited': '#03a9f4',
|
|
39
|
-
'link-color': '#
|
|
40
|
-
'title-color': '#
|
|
41
|
-
'background-header-link': '#
|
|
46
|
+
'link-color': '#243b53', // was #002b7d
|
|
47
|
+
'title-color': '#243b53', // was #002b7d
|
|
48
|
+
'background-header-link': '#006fe6', // was #007eff
|
|
42
49
|
},
|
|
43
50
|
strapi: {
|
|
44
51
|
'gray-light': '#eff3f6',
|
|
@@ -46,7 +53,7 @@ const colors = {
|
|
|
46
53
|
'blue-darker': '#18202e',
|
|
47
54
|
'blue-dark': '#151c2e',
|
|
48
55
|
blue: '#0097f7',
|
|
49
|
-
'light-blue-transparent': '#
|
|
56
|
+
'light-blue-transparent': '#f4f8fc', // was #d0edff
|
|
50
57
|
red: '#E91E63'
|
|
51
58
|
},
|
|
52
59
|
};
|
package/package.json
CHANGED