민병수 / Voicoding

Go to a project
Toggle navigation Toggle navigation pinning
천현우
8ae40ac8 2 parents 661704f0 e948ff43

merge

Inline Side-by-side
Showing 2 changed files with 11 additions and 0 deletions
...@@ -119,13 +119,22 @@ button:hover{ ...@@ -119,13 +119,22 @@ button:hover{
119 margin: 23px; 119 margin: 23px;
120 } 120 }
121 #output{ 121 #output{
122 + padding:10px;
122 margin:20px; 123 margin:20px;
123 display:flex; 124 display:flex;
125 +<<<<<<< HEAD
124 padding: 10px; 126 padding: 10px;
125 height:700px; 127 height:700px;
126 background-color:rgba(0,0,0,.87); 128 background-color:rgba(0,0,0,.87);
127 color:var(--text-color); 129 color:var(--text-color);
128 font-size:20px; 130 font-size:20px;
131 +=======
132 + font-size:20px;
133 + height:700px;
134 + background-color:rgba(0,0,0,.87);
135 + color:var(--text-color);
136 + font-family: 'Raleway', 'Noto Serif KR';
137 +>>>>>>> e948ff4325bc9174b01571ab61b4339fdec7cbdf
129 } 138 }
130 #recordButton{ 139 #recordButton{
131 line-height: 22px; 140 line-height: 22px;
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
10 <script defer src="menu.js"></script> 10 <script defer src="menu.js"></script>
11 <link rel="preconnect" href="https://fonts.gstatic.com"> 11 <link rel="preconnect" href="https://fonts.gstatic.com">
12 <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300&display=swap" rel="stylesheet"> 12 <link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@300&display=swap" rel="stylesheet">
13 + <link href="https://fonts.googleapis.com/css2?family=Raleway:wght@200&display=swap" rel="stylesheet">
14 + <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+KR&family=Raleway:wght@200&display=swap" rel="stylesheet">
13 <script defer src="https://cdn.rawgit.com/mattdiamond/Recorderjs/08e7abd9/dist/recorder.js"></script> 15 <script defer src="https://cdn.rawgit.com/mattdiamond/Recorderjs/08e7abd9/dist/recorder.js"></script>
14 <script defer src="client.js"></script> 16 <script defer src="client.js"></script>
15 <meta name="description" content="Free and open-source online code editor that allows you to write and execute code from a rich set of languages."> 17 <meta name="description" content="Free and open-source online code editor that allows you to write and execute code from a rich set of languages.">
......