diff --git a/css/flippy.css b/css/flippy.css index a180f87..d547d19 100644 --- a/css/flippy.css +++ b/css/flippy.css @@ -66,7 +66,6 @@ flippy.fancy { float: left; margin: 0 10px 10px 0; position: relative; - font-size: .8em; cursor: pointer; } diff --git a/css/pexeso.css b/css/pexeso.css index f9622d3..766b970 100644 --- a/css/pexeso.css +++ b/css/pexeso.css @@ -6,7 +6,6 @@ body { #mainContent { font-family: Arial, Helvetica, sans-serif; - font-size: xx-large; font-weight: bold; border-radius: 4px; @@ -57,4 +56,12 @@ body { #levelTitle { float:right; -} \ No newline at end of file +} + +.textCard { + height: 100%; +} + +.textCardLabel { + margin-top: 15%; +} diff --git a/index.html b/index.html index 6d367ce..81cf29b 100644 --- a/index.html +++ b/index.html @@ -68,7 +68,7 @@ -
{{card.label}}
+
{{card.label}}
diff --git a/js/level-data-service.js b/js/level-data-service.js index 95bd9fd..751d5f0 100644 --- a/js/level-data-service.js +++ b/js/level-data-service.js @@ -55,7 +55,7 @@ var basicCards = { var mathCards = { 'zero': { 'arabic': '0', - 'roman': 'nulla', + 'roman': ' ', 'math': '1-1', 'japanese': '〇' }, diff --git a/js/pexeso-controller.js b/js/pexeso-controller.js index d697930..8e555a4 100644 --- a/js/pexeso-controller.js +++ b/js/pexeso-controller.js @@ -332,9 +332,16 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) */ $scope.computeCardSize = function(cardsPerRow) { var cardSize = Math.floor(Math.min(window.innerWidth, window.innerHeight) / cardsPerRow) - 20; + + var fontSize = Math.floor(cardSize * 0.6); + if (fontSize < 12) { + fontSize = 12; + } + $scope.cardStyle = { width: cardSize + "px", - height: cardSize + "px" + height: cardSize + "px", + "font-size": fontSize + "px" }; var paddingLeft = Math.floor((window.innerWidth - (cardSize + 10) * cardsPerRow) / 2);