Merge remote-tracking branch 'origin/master' into leader-mode

# Conflicts: # src/components/Board.js
cmavelis · Mar 8, 2019 · e6f8f9e · e6f8f9e
2 parents 3aa90c7 + 825c147
commit e6f8f9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Game.css b/src/Game.css
@@ -76,7 +76,7 @@ p {
     border: 6px solid var(--card-border);
     border-radius: 10px;
     /*float: left;*/
-    font-size: 2vw;
+    font-size: 2.2vw;
     font-weight: bold;
     line-height: 34px;
     /*height: 10%;*/
@@ -90,6 +90,10 @@ p {
     overflow-y: visible;
 }
 
+.card-smaller-font {
+    font-size: 1.9vw;
+}
+
 .card-color-w {
     background: gray;
     color: white;

diff --git a/src/components/Board.js b/src/components/Board.js
@@ -11,8 +11,9 @@ function Card(props) {
     } = props;
     const cls = `card${status ? ` card-color-${color}` : ''}
         ${leaderMark ? ' card-leader-mark' : ''}`;
+    const smallerFontClass = value.length > 8 ? 'card-smaller-font' : '';
     return (
-        <button type="button" className={cls} onClick={onClick}>
+        <button type="button" className={cls + smallerFontClass} onClick={onClick}>
             {value}
         </button>
     );