Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9a6eeef

Browse files
committed
fix: mobile device responsive styles
1 parentbf6f242 commit9a6eeef

File tree

12 files changed

+172
-106
lines changed

12 files changed

+172
-106
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"license":"MIT",
6161
"scripts": {
6262
"build":"gatsby build",
63-
"develop":"gatsby develop",
63+
"develop":"gatsby develop -H 0.0.0.0",
6464
"format":"prettier --write\"**/*.{js,jsx,ts,tsx,json,md}\"",
6565
"start":"npm run develop",
6666
"serve":"gatsby serve",

‎src/@chakra-ui/gatsby-plugin/theme.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ const theme = extendTheme({
1616
body:{
1717
bg:colorMode==='dark' ?'blue.800' :'white',
1818
},
19+
'.chakra-modal__content-container':{
20+
p:{base:'2',lg:'0'},
21+
},
1922
'#blobSvg':{
2023
overflow:'visible',
2124
},

‎src/components/Common/Input.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Input = ({ value, onEnter }) => (
1212
defaultValue={value}
1313
_focus={{borderColor:'primary',boxShadow:'0 0 0 1px #d7819b'}}
1414
onKeyDown={(e)=>{
15-
if(e.code!=='Enter')return;
15+
if(e.key!=='Enter')return;
1616
if(!validateHex(e.target.value))return;
1717
onEnter(e.target.value);
1818
}}

‎src/components/Common/Modal.js‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,26 @@ const Modal = ({ title, src, children, actions, size = '2xl' }) => {
3131
<ModalOverlaybackground="rgba(78,86,107,0.71)"/>
3232
<ModalContent>
3333
<ModalHeaderpx="10">
34-
<Flexjustify="space-between"align="center">
35-
<HeadingfontSize="xl"variant="main">
36-
{title}
37-
</Heading>
38-
<Flex>
34+
<Flexalign="center">
35+
<Flex
36+
direction={{base:'column',lg:'row'}}
37+
align="center"
38+
justify={{base:'center',lg:'space-between'}}
39+
flex="1"
40+
>
41+
<HeadingfontSize="xl"variant="main">
42+
{title}
43+
</Heading>
3944
<Box>{actions}</Box>
40-
<Button
41-
onClick={onClose}
42-
variant="subtle"
43-
pos="relative"
44-
right="-20px"
45-
>
46-
<CloseIcon/>
47-
</Button>
4845
</Flex>
46+
<Button
47+
onClick={onClose}
48+
variant="subtle"
49+
pos="relative"
50+
right="-20px"
51+
>
52+
<CloseIcon/>
53+
</Button>
4954
</Flex>
5055
</ModalHeader>
5156
<Divider/>

‎src/components/Common/Popover.js‎

Lines changed: 64 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,71 @@ import {
1010
PopoverTrigger,
1111
Tooltip,
1212
}from'@chakra-ui/react';
13-
importReactfrom'react';
13+
importReact,{useState}from'react';
1414

15-
constPopover=({ props, children, label, trigger})=>(
16-
<ChakPopoverautoFocus={false}isLazyplacement="top"arrowSize="0">
17-
<PopoverTrigger>
18-
<Box>
19-
{!!trigger&&<Box>{trigger}</Box>}
20-
{!trigger&&(
21-
<Box>
22-
<Tooltip
23-
label={label}
24-
aria-label={label}
25-
hasArrow
26-
variant="default"
27-
>
28-
<Box
29-
as="button"
30-
p="15px"
31-
_focus={{outline:0}}
32-
_hover={{boxShadow:'xl'}}
33-
rounded="2xl"
34-
{...props}
35-
/>
36-
</Tooltip>
37-
</Box>
38-
)}
39-
</Box>
40-
</PopoverTrigger>
41-
<PopoverContent
42-
bg="gray.50"
43-
shadow="2xl"
44-
_dark={{bg:'gray.700'}}
45-
_focus={{boxShadow:'none',outline:'none'}}
15+
constPopover=({ props, children, label, trigger})=>{
16+
const[isOpen,setIsOpen]=useState(false);
17+
constopen=()=>setIsOpen(!isOpen);
18+
constclose=()=>setIsOpen(false);
19+
20+
return(
21+
<ChakPopover
22+
autoFocus={false}
23+
isLazy
24+
placement="top"
25+
arrowSize="0"
26+
isOpen={isOpen}
27+
onClose={close}
4628
>
47-
<PopoverArrow/>
48-
<PopoverCloseButtonmt="6px"/>
49-
<PopoverHeaderpy="3">
50-
<Heading
51-
fontSize="md"
52-
letterSpacing="-0.9px"
53-
textAlign="center"
54-
fontWeight="700"
55-
variant="main"
56-
>
57-
{label}
58-
</Heading>
59-
</PopoverHeader>
60-
<PopoverBodyp="0">{children}</PopoverBody>
61-
</PopoverContent>
62-
</ChakPopover>
63-
);
29+
<PopoverTrigger>
30+
<BoxonClick={open}>
31+
{!!trigger&&<Box>{trigger}</Box>}
32+
{!trigger&&(
33+
<Box>
34+
<Tooltip
35+
label={label}
36+
aria-label={label}
37+
hasArrow
38+
variant="default"
39+
>
40+
<Box
41+
as="button"
42+
p="15px"
43+
_focus={{outline:0}}
44+
_hover={{boxShadow:'xl'}}
45+
rounded="2xl"
46+
{...props}
47+
/>
48+
</Tooltip>
49+
</Box>
50+
)}
51+
</Box>
52+
</PopoverTrigger>
53+
<PopoverContent
54+
bg="gray.50"
55+
shadow="2xl"
56+
_dark={{bg:'gray.700'}}
57+
_focus={{boxShadow:'none',outline:'none'}}
58+
>
59+
<PopoverArrow/>
60+
<PopoverCloseButtonmt="6px"/>
61+
<PopoverHeaderpy="3">
62+
<Heading
63+
fontSize="md"
64+
letterSpacing="-0.9px"
65+
textAlign="center"
66+
fontWeight="700"
67+
variant="main"
68+
>
69+
{label}
70+
</Heading>
71+
</PopoverHeader>
72+
<PopoverBodyp="0">
73+
{typeofchildren==='function' ?children(close) :children}
74+
</PopoverBody>
75+
</PopoverContent>
76+
</ChakPopover>
77+
);
78+
};
6479

6580
exportdefaultPopover;

‎src/components/Common/UrlInput.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const UrlInput = ({ value, onEnter }) => {
1515
defaultValue={value}
1616
_focus={{borderColor:'primary',boxShadow:'0 0 0 1px #d7819b'}}
1717
onKeyDown={(e)=>{
18-
if(e.code!=='Enter')return;
18+
if(e.key!=='Enter')return;
1919
consturl=e.target.value;
2020
if(!urlRegex.test(url)){
2121
setError('Invalid URL');

‎src/components/Settings/GradientColorsPicker.js‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable react/jsx-wrap-multilines */
12
importReactfrom'react';
23
import{Box,Divider,Flex}from'@chakra-ui/react';
34
import{dynamic}from'../../state';
@@ -38,23 +39,44 @@ const GradientColorsPicker = ({
3839
}
3940
/>
4041
);
42+
constContent=({ close})=>(
43+
<Box>
44+
<Pallette
45+
onClick={(value)=>{
46+
switchToGradientColors(value);
47+
close();
48+
}}
49+
colors={defaultColors}
50+
/>
51+
<Dividermb="4"/>
52+
<Boxp="3"pt="0">
53+
<Flex>
54+
<Input
55+
value={start}
56+
onEnter={(value)=>{
57+
updateGradientStartColor(value);
58+
close();
59+
}}
60+
/>
61+
<Dividermx="2"orientation="vertical"/>
62+
<Input
63+
value={end}
64+
onEnter={(value)=>{
65+
updateGradientEndColor(value);
66+
close();
67+
}}
68+
/>
69+
</Flex>
70+
</Box>
71+
</Box>
72+
);
4173
return(
4274
<Popover
4375
props={{bgGradient:`linear(to-b,${start},${end})`}}
4476
label="Gradient colors"
4577
trigger={<Picker/>}
4678
>
47-
<Box>
48-
<PalletteonClick={switchToGradientColors}colors={defaultColors}/>
49-
<Dividermb="4"/>
50-
<Boxp="3"pt="0">
51-
<Flex>
52-
<Inputvalue={start}onEnter={updateGradientStartColor}/>
53-
<Dividermx="2"orientation="vertical"/>
54-
<Inputvalue={end}onEnter={updateGradientEndColor}/>
55-
</Flex>
56-
</Box>
57-
</Box>
79+
{(close)=><Contentclose={close}/>}
5880
</Popover>
5981
);
6082
};

‎src/components/Settings/ImageSetter.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
importReactfrom'react';
2-
import{Box}from'@chakra-ui/react';
2+
import{Box,Button}from'@chakra-ui/react';
33
import{dynamic}from'../../state';
44
importPopoverfrom'../Common/Popover';
55
importUrlInputfrom'../Common/UrlInput';
66
importDingfrom'../Common/Ding';
7-
import{ImageIcon,LandscapeIcon}from'../icons';
7+
import{ImageIcon,LandscapeIcon,RightArrowIcon}from'../icons';
88

99
constImageSetter=({ type, image, switchToImage})=>{
1010
constPicker=()=>(
@@ -15,16 +15,20 @@ const ImageSetter = ({ type, image, switchToImage }) => {
1515
activeComp={<LandscapeIconcolor="primary"/>}
1616
/>
1717
);
18+
constContent=({ close})=>(
19+
<Boxp="3"textAlign="center">
20+
<UrlInput
21+
value={image}
22+
onEnter={(value)=>{
23+
switchToImage(value);
24+
close();
25+
}}
26+
/>
27+
</Box>
28+
);
1829
return(
1930
<Popoverprops={{bg:'red'}}label="Set image"trigger={<Picker/>}>
20-
<Boxp="3">
21-
<UrlInput
22-
value={image}
23-
onEnter={(url)=>{
24-
switchToImage(url);
25-
}}
26-
/>
27-
</Box>
31+
{(close)=><Contentclose={close}/>}
2832
</Popover>
2933
);
3034
};

‎src/components/Settings/PatternSetter.js‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable react/jsx-wrap-multilines */
2-
importReact,{useState}from'react';
3-
import{Box,Text,useColorModeValue}from'@chakra-ui/react';
2+
importReactfrom'react';
3+
import{Box,useColorModeValue}from'@chakra-ui/react';
44
import{dynamic}from'../../state';
55
importPopoverfrom'../Common/Popover';
66
import*asPatternsfrom'../../patterns';
@@ -63,18 +63,25 @@ const PatternSetter = ({ type, pattern, switchToPattern }) => {
6363
);
6464
};
6565

66+
constContent=({ close})=>(
67+
<Boxp="3">
68+
{Object.keys(Patterns).map((name)=>(
69+
<PatternBox
70+
key={name}
71+
meta={Patterns[name]}
72+
clickHandler={(value)=>{
73+
switchToPattern(value);
74+
close();
75+
}}
76+
isSelected={pattern===name}
77+
/>
78+
))}
79+
</Box>
80+
);
81+
6682
return(
6783
<Popoverprops={{bg:'red'}}label="Set pattern"trigger={<Picker/>}>
68-
<Boxp="3">
69-
{Object.keys(Patterns).map((name)=>(
70-
<PatternBox
71-
key={name}
72-
meta={Patterns[name]}
73-
clickHandler={switchToPattern}
74-
isSelected={pattern===name}
75-
/>
76-
))}
77-
</Box>
84+
{(close)=><Contentclose={close}/>}
7885
</Popover>
7986
);
8087
};

‎src/components/Settings/SolidColorPicker.js‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,30 @@ const SolidColorPicker = ({ type, color, switchToSolidColor }) => {
2121
<Ding
2222
label="Color"
2323
Icon={PaintIcon}
24-
isSelected={type=='solid'}
24+
isSelected={type==='solid'}
2525
activeComp={<Boxp="4px"rounded="2xl"bg={color}w="1px"/>}
2626
/>
2727
);
2828

29-
return(
30-
<Popoverprops={{bg:color}}label="Choose a color"trigger={<Picker/>}>
29+
constContent=({ close})=>{
30+
constselectAndClose=(value)=>{
31+
switchToSolidColor(value);
32+
close();
33+
};
34+
return(
3135
<Box>
32-
<PalletteonClick={switchToSolidColor}colors={defaultColors}/>
36+
<PalletteonClick={selectAndClose}colors={defaultColors}/>
3337
<Dividermb="4"/>
3438
<Boxp="3"pt="0">
35-
<Inputvalue={color}onEnter={switchToSolidColor}/>
39+
<Inputvalue={color}onEnter={selectAndClose}/>
3640
</Box>
3741
</Box>
42+
);
43+
};
44+
45+
return(
46+
<Popoverprops={{bg:color}}label="Choose a color"trigger={<Picker/>}>
47+
{(close)=><Contentclose={close}/>}
3848
</Popover>
3949
);
4050
};

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp