Skip to content

Commit 8826a0a

Browse files
authored
Merge pull request #10 from penicillin0/feature-9/font
フォントをmac, windows標準のものに変更
2 parents 93f256e + 32db7ad commit 8826a0a

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

src/App.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.App {
22
text-align: center;
3-
width: 372px;
3+
width: 360px;
44
}

src/components/Console.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const Console: React.FC<Props> = () => {
120120
uncheckedIcon={false}
121121
/>
122122
<Spacer width={6} />
123-
<span>Indent Visible Line</span>
123+
<span>Indent Visible</span>
124124
</SwitchLabel>
125125
</TitleWrapper>
126126
<IndentContainer>
@@ -197,7 +197,7 @@ const TitleWrapper = styled.div`
197197
const Title = styled.div`
198198
font-size: 16px;
199199
text-align: left;
200-
margin: 10px 10px;
200+
margin: 10px 12px;
201201
`;
202202

203203
const SwitchLabel = styled.label`
@@ -225,7 +225,7 @@ const VerticalLine = styled.div`
225225
`;
226226

227227
const Indent = styled.div<{ isGey: boolean }>`
228-
width: 20px;
228+
width: 24px;
229229
height: 15px;
230230
background-color: ${(props) => (props.isGey ? '#f5f5f5' : '#fff')};
231231
`;
@@ -248,23 +248,23 @@ const IndentRow = styled.div<{ spaceNum: number }>`
248248
`;
249249

250250
const IndentContent = styled.div`
251-
margin-left: 5px;
252-
margin-top: 4px;
253-
margin-bottom: 4px;
251+
margin-left: 6px;
252+
margin-top: 1.8px;
253+
margin-bottom: 1.8px;
254254
display: flex;
255255
align-items: center;
256256
`;
257257

258258
const DemonstrationContainer = styled.div`
259-
margin: 14px;
259+
margin: 12px 14px;
260260
padding: 6px 0px;
261261
background-color: #fefefe;
262262
border-radius: 2%;
263263
box-shadow: 0px 5px 5px -3px #9e9e9e;
264264
`;
265265

266266
const Demonstration = styled.div`
267-
padding: 0px 10px;
267+
padding: 0px 12px;
268268
border-left: 5px solid #808b8c;
269269
box-sizing: border-box;
270270
`;

src/components/Header.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ export const Header: React.FC<Props> = () => {
2727
const githubIconConfig = {
2828
color: '#444',
2929
size: '22px',
30-
style: { paddingLeft: '52px' },
30+
style: { paddingLeft: '36px' },
3131
};
3232

3333
const Main = styled.div`
3434
padding: 7px;
35-
height: 54px;
35+
height: 50px;
3636
display: flex;
3737
align-items: center;
3838
justify-content: left;
@@ -48,7 +48,7 @@ const Image = styled.img`
4848
`;
4949

5050
const Title = styled.p`
51-
font-size: 20px;
51+
font-size: 21px;
5252
color: #fff;
5353
font-weight: bold;
5454
font-family: 'Noto Serif JP', 游ゴシック体, 'Yu Gothic', YuGothic,

src/index.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
body {
22
margin: 0;
3-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
4-
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
5-
sans-serif;
3+
font-family: '游ゴシック体', 'Yu Gothic', YuGothic, 'ヒラギノ角ゴ Pro',
4+
'Hiragino Kaku Gothic Pro', 'メイリオ', 'Meiryo', 'sans-serif';
65
-webkit-font-smoothing: antialiased;
76
-moz-osx-font-smoothing: grayscale;
87
}

0 commit comments

Comments
 (0)