Merge branch 'feature/rule' into develop

chiachunho · May 28, 2021 · 4da18a3 · 4da18a3
2 parents 251b9fd + 7cae7d2
commit 4da18a3
Show file tree

Hide file tree

Showing 3 changed files with 330 additions and 158 deletions.
diff --git a/mysite/frontend/src/components/game/GamePlaying.js b/mysite/frontend/src/components/game/GamePlaying.js
@@ -255,6 +255,7 @@ function OtherGamePlayer(props) {
     return (
         <Col xs={4} lg={6} className={'px-2 my-2'}>
             <Button
+                className={'text-wrap'}
                 variant={props.nowPlaying ? 'brown' : 'outline-brown'}
                 size={'sm'}
                 block={true}
@@ -287,6 +288,7 @@ function SelfGamePlayer(props) {
                 <Col xs={8} lg={12} className={'px-2'}>
                     <TutorialOverlayTrigger placement={'top'} overlay={overlay} show={showPosition === 'SELF_BTN'}>
                         <Button
+                            className={'text-wrap'}
                             variant={props.nowPlaying ? 'brown' : 'outline-brown'}
                             block={true}
                             size={''}

diff --git a/mysite/frontend/src/images/rules/board.png b/mysite/frontend/src/images/rules/board.png