Merge pull request #39 from LHRUN/dev

1.3.1

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.3.1
+
+### Feat
+
+- update font family
+
+### Docs
+
+- README adds browser support
+
 # 1.3.0
 
 ### Feat

README.md

@@ -101,6 +101,14 @@ docker run -d -p 8080:80 --name paint-board paint-board
 
 3. Accessed by opening `http://localhost:8080/paint-board/` in your browser.
 
+## Browser support
+
+We recommend using the latest version of Google Chrome, the following is the minimum version support
+
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
+| :--: | :--: | :--: | :--: |
+| 80+ | 80+ | 70+ | 13+ |
+
 ## Contact me
 
 If you have any suggestions or good ideas, welcome to contact me at any time!

README.zh.md

@@ -97,6 +97,14 @@ docker run -d -p 8080:80 --name paint-board paint-board
 
 3. 在浏览器打开 `http://localhost:8080/paint-board/` 即可访问。
 
+## 浏览器支持
+
+建议使用最新版谷歌浏览器, 以下是最低版本支持
+
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt=" Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari |
+| :--: | :--: | :--: | :--: |
+| 80+ | 80+ | 70+ | 13+ |
+
 ## 联系我
 
 如果你有任何建议或者有好的想法，欢迎随时与我联系！

package.json

@@ -1,7 +1,7 @@
 {
   "name": "paint-board",
   "private": true,
-  "version": "1.3.0",
+  "version": "1.3.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/components/toolPanel/drawConfig/freeStyleConfig/drawStyleConfig/index.tsx

@@ -16,8 +16,8 @@ const DrawStyleConfig = () => {
           {styleSwitch[lineKey].map(({ type, text }) => (
             <button
               key={type}
-              className={`btn btn-xs flex-grow font-fredokaOne text-xs ${
-                drawStyle === type ? 'btn-active' : ''
+              className={`btn btn-xs flex-grow font-fredokaOne text-xs font-normal ${
+                drawStyle === type ? 'btn-active font-semibold' : ''
               }`}
               onClick={() => updateDrawStyle(type)}
             >

src/components/toolPanel/drawConfig/freeStyleConfig/fontFamilyConfig/index.tsx

@@ -34,7 +34,7 @@ const FontFamilyConfg: FC<IProps> = ({ fontFamily, updateFontFamily }) => {
           >
             <div
               style={{
-                fontFamily: `${fontFamilyRadio[key]}, cursive`
+                fontFamily: `${fontFamilyRadio[key]}`
               }}
               className="text-xs"
             >

src/components/toolPanel/drawConfig/index.tsx

@@ -19,8 +19,8 @@ const DrawConfig = () => {
         {DrawTypeSwitch.map(({ type, text }) => (
           <button
             key={type}
-            className={`btn btn-xs flex-grow font-fredokaOne ${
-              drawType === type ? 'btn-active' : ''
+            className={`btn btn-xs flex-grow font-fredokaOne font-normal ${
+              drawType === type ? 'btn-active font-semibold' : ''
             }`}
             onClick={() => {
               updateDrawType(type)

src/components/toolPanel/index.tsx

@@ -35,7 +35,7 @@ const ToolPanel: FC = () => {
             {modeSwitch.map(({ type, text }) => (
               <a
                 key={type}
-                className={`tab tab-sm flex-grow font-fredokaOne text-white ${
+                className={`tab tab-sm flex-grow font-fredokaOne text-white font-medium ${
                   mode === type ? 'tab-active' : ''
                 }`}
                 onClick={() => {

src/store/files.ts

@@ -54,7 +54,7 @@ interface FileAction {
 }
 
 const initId = uuidv4()
-export const BOARD_VERSION = '1.3.0'
+export const BOARD_VERSION = '1.3.1'
 
 const useFileStore = create<FileState & FileAction>()(
   persist(

tailwind.config.cjs

@@ -4,13 +4,20 @@ module.exports = {
   theme: {
     extend: {
       fontFamily: {
-        georgia: ['Georgia', 'cursive'],
-        fredokaOne: ['Fredoka One', 'cursive'],
-        hanaleiFill: ['Hanalei Fill', 'cursive'],
-        ruslanDisplay: ['Ruslan Display', 'cursive'],
-        lobster: ['Lobster', 'cursive'],
-        pacifico: ['Pacifico', 'cursive'],
-        gloriaHallelujah: ['Gloria Hallelujah', 'cursive']
+        georgia: ['Georgia'],
+        fredokaOne: [
+          'Fredoka One',
+          'PingFang SC',
+          'Microsoft Yahei',
+          'Helvetica',
+          'Arial',
+          'sans-serif'
+        ],
+        hanaleiFill: ['Hanalei Fill'],
+        ruslanDisplay: ['Ruslan Display'],
+        lobster: ['Lobster'],
+        pacifico: ['Pacifico'],
+        gloriaHallelujah: ['Gloria Hallelujah']
       },
       screens: {
         xs: {