From 043b1ae08ad35270ea269316c3f67b89adce3d5a Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Sun, 9 Mar 2014 23:58:41 +0100 Subject: [PATCH 01/63] add analytics --- index.html | 9 +++++++++ js/html_actuator.js | 1 + style/main.css | 2 +- style/main.scss | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index d2009ff81f..cca0fa6ff8 100644 --- a/index.html +++ b/index.html @@ -62,5 +62,14 @@

2048

Created by Gabriele Cirulli. Based on 1024 by Veewo Studio.

+ diff --git a/js/html_actuator.js b/js/html_actuator.js index a73fdb1db6..7f47788cfb 100644 --- a/js/html_actuator.js +++ b/js/html_actuator.js @@ -89,4 +89,5 @@ HTMLActuator.prototype.updateScore = function (score) { HTMLActuator.prototype.message = function (won) { var type = won ? "game-won" : "game-over"; this.gameContainer.classList.add(type); + if (ga) ga("send", "event", "game", "end", type, this.score); }; diff --git a/style/main.css b/style/main.css index b7d96218c9..1a1b8f7147 100644 --- a/style/main.css +++ b/style/main.css @@ -53,7 +53,7 @@ h1.title { position: relative; float: right; background: #bbada0; - padding: 15px 20px; + padding: 15px 25px; font-size: 25px; height: 25px; line-height: 47px; diff --git a/style/main.scss b/style/main.scss index 3d81a13cdb..a224dccb23 100644 --- a/style/main.scss +++ b/style/main.scss @@ -64,7 +64,7 @@ h1.title { position: relative; float: right; background: $game-container-background; - padding: 15px 20px; + padding: 15px 25px; font-size: $height; height: $height; line-height: $height + 22px; From 54da66da1403779d3058549868a2d29e1fc99187 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Mon, 10 Mar 2014 00:20:48 +0100 Subject: [PATCH 02/63] add twitter sharing button --- index.html | 4 ++++ style/main.css | 4 ++++ style/main.scss | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/index.html b/index.html index cca0fa6ff8..d2445e53d9 100644 --- a/index.html +++ b/index.html @@ -61,6 +61,10 @@

2048

Created by Gabriele Cirulli. Based on 1024 by Veewo Studio.

+ diff --git a/js/html_actuator.js b/js/html_actuator.js index a68d60005f..fac7c82a9e 100644 --- a/js/html_actuator.js +++ b/js/html_actuator.js @@ -130,7 +130,7 @@ HTMLActuator.prototype.scoreTweetButton = function () { tweet.setAttribute("data-via", "gabrielecirulli"); tweet.textContent = "Tweet"; - var text = "I scored " + this.score + " points at 2048, a game where you " + + var text = "I scored " + this.score + " points at #2048, a game where you " + "join numbers to score high!"; tweet.setAttribute("data-text", text); From 1ddcdae4213f08a8820c5d55c1c70236d86ad0e2 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Mon, 10 Mar 2014 19:55:24 +0100 Subject: [PATCH 06/63] fix hashtag --- index.html | 2 +- js/html_actuator.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index bdba0e5ea8..bdf5f87ed7 100644 --- a/index.html +++ b/index.html @@ -75,7 +75,7 @@

2048

Created by Gabriele Cirulli. Based on 1024 by Veewo Studio.

diff --git a/js/html_actuator.js b/js/html_actuator.js index fac7c82a9e..2da738b65a 100644 --- a/js/html_actuator.js +++ b/js/html_actuator.js @@ -130,8 +130,8 @@ HTMLActuator.prototype.scoreTweetButton = function () { tweet.setAttribute("data-via", "gabrielecirulli"); tweet.textContent = "Tweet"; - var text = "I scored " + this.score + " points at #2048, a game where you " + - "join numbers to score high!"; + var text = "I scored " + this.score + " points at 2048, a game where you " + + "join numbers to score high! #2048game"; tweet.setAttribute("data-text", text); return tweet; From 6aa953cc1e16e39524989a6c933b0bfb4a03267b Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 11:52:03 +0100 Subject: [PATCH 07/63] add btc donate button --- index.html | 15 +++++++++++++++ style/main.css | 3 +++ style/main.scss | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/index.html b/index.html index 0a09d1fc0b..17fa495481 100644 --- a/index.html +++ b/index.html @@ -77,6 +77,21 @@

2048

- - - + @@ -85,6 +85,26 @@

2048

+ + + + + - - From a95df7a1808f1f0ca89b0009f29f69de5185a452 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 15:06:28 +0100 Subject: [PATCH 12/63] comment out coinwidget --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index bbb4f6051d..8d0fc5ffce 100644 --- a/index.html +++ b/index.html @@ -97,7 +97,7 @@

2048

ga("send", "pageview"); - + From bfd21d6e6b6912f7a627821ccbd3a04a19886c65 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 15:20:47 +0100 Subject: [PATCH 13/63] add basic btc button --- index.html | 4 + meta/icon_bitcoin.png | Bin 0 -> 1825 bytes style/main.css | 703 ++++-------------------------------------- style/main.scss | 5 + 4 files changed, 69 insertions(+), 643 deletions(-) create mode 100644 meta/icon_bitcoin.png diff --git a/index.html b/index.html index 8d0fc5ffce..7158d3fcf4 100644 --- a/index.html +++ b/index.html @@ -75,6 +75,10 @@

2048

diff --git a/meta/icon_bitcoin.png b/meta/icon_bitcoin.png new file mode 100644 index 0000000000000000000000000000000000000000..85e491b2c13938cf1074e402a15e80339e4552ed GIT binary patch literal 1825 zcmaJ?c~BEq91d1&xC{sg6}8JERcj!JT#1PaIW&YQhNu(=!;&my4au&_VgfiSptVp$ z4n+;%QM|PX7IBpOs8&Sf^lpcWwVA2_M8l6dFFnt(-?3qk9oeq3_K*F0&8ON6L zg&%zp78g|EIL4;Y3EPIES5!s$@C!*KKdjr4jFy4daq#xKCD;h5DZ69 zEnrcEV$npL3lfojNI`>rlGW-zmWe1B%?M#MhA-Wc(lAgW`G2TJ^9ilTrSRu?|5I2m zOTu896xO4OIt9_VI4_GUjLp-*5RU3(D4H-_#c&mhqk0vJ0lWx*KmsWct;K$imq^$m ztsaN83RuMFf`o!Ef+*SkJf^pSipdxt3ATV1#ErtV348N}&$b0Pj;~BO}Mc8d2{fS2=Pl!6R~ML@+cJl*mr-#~hiD)YW@$v$rSG zd-YIp^X37kOU6H%rrau>9sS^DO0E8)ckQ6ceO`CB{r%H6d4Jt=5moODYrZ7TEP5$w zQD0th=l7cH)sRX4oHJxNq5xd;8|YJ1W_f8ZIg`5D9QLHEs@J(>%8cp3o$09QDQC{1 z#FSGThmO{qtj-&1U0Fo2NyD!C2WCO2e0LLAA$0W&PNQN6XRje$sx03j zZ+`M-QXi+qYn)^*r6N_`w4yRcwwN4p-#Ti`K9^~3GGImI_~0DBiJ6qELEBr3DHF@u z=P)-k)+OO%532-0;R)mw-`Zx!=U4Q*uUkWIG&Jb!gTDLz90ribofxz=bx&0VOxSL! zAsvYj?5obM?Q6?TeahVhP$;I9`v_S)ik~{>ydz!nD9EF@rw%$JJQ6iZ(4IP$QBjpl zzqzqQ-Bz(YUEB5WMRJX)cfc`giCxr{4S5s4lyn9q-em<<+ISb73D!_NX1v-xraeDR z@ato+VtN1U#J{QXXQ>`LQmKeZI9JF!B@e!yj*&m lI@qA6Hi9WxZx^n!B9&SH5W8cOX`$t(B@!&)mxjco{R5h_*Kq&< literal 0 HcmV?d00001 diff --git a/style/main.css b/style/main.css index 016732234c..f305c36fd7 100644 --- a/style/main.css +++ b/style/main.css @@ -1,643 +1,60 @@ -@import url(fonts/clear-sans.css); -html, body { - margin: 0; - padding: 0; - background: #faf8ef; - color: #776e65; - font-family: "Clear Sans", "Helvetica Neue", Arial, sans-serif; - font-size: 18px; } - -body { - margin: 80px 0; } - -.heading:after { - content: ""; - display: block; - clear: both; } - -h1.title { - font-size: 80px; - font-weight: bold; - margin: 0; - display: block; - float: left; } - -@-webkit-keyframes move-up { - 0% { - top: 25px; - opacity: 1; } - - 100% { - top: -50px; - opacity: 0; } } - -@-moz-keyframes move-up { - 0% { - top: 25px; - opacity: 1; } - - 100% { - top: -50px; - opacity: 0; } } - -@keyframes move-up { - 0% { - top: 25px; - opacity: 1; } - - 100% { - top: -50px; - opacity: 0; } } - -.score-container { - position: relative; - float: right; - background: #bbada0; - padding: 15px 25px; - font-size: 25px; - height: 25px; - line-height: 47px; - font-weight: bold; - border-radius: 3px; - color: white; - margin-top: 8px; } - .score-container:after { - position: absolute; - width: 100%; - top: 10px; - left: 0; - content: "Score"; - text-transform: uppercase; - font-size: 13px; - line-height: 13px; - text-align: center; - color: #eee4da; } - .score-container .score-addition { - position: absolute; - right: 30px; - color: red; - font-size: 25px; - line-height: 25px; - font-weight: bold; - color: rgba(119, 110, 101, 0.9); - z-index: 100; - -webkit-animation: move-up 600ms ease-in; - -moz-animation: move-up 600ms ease-in; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; } - -p { - margin-top: 0; - margin-bottom: 10px; - line-height: 1.65; } - -a { - color: #776e65; - font-weight: bold; - text-decoration: underline; - cursor: pointer; } - -strong.important { - text-transform: uppercase; } - -hr { - border: none; - border-bottom: 1px solid #d8d4d0; - margin-top: 20px; - margin-bottom: 30px; } - -.container { - width: 500px; - margin: 0 auto; } - -@-webkit-keyframes fade-in { - 0% { - opacity: 0; } - - 100% { - opacity: 1; } } - -@-moz-keyframes fade-in { - 0% { - opacity: 0; } - - 100% { - opacity: 1; } } - -@keyframes fade-in { - 0% { - opacity: 0; } - - 100% { - opacity: 1; } } - -.game-container { - margin-top: 40px; - position: relative; - padding: 15px; - cursor: default; - -webkit-touch-callout: none; - -webkit-user-select: none; - -moz-user-select: none; - background: #bbada0; - border-radius: 6px; - width: 500px; - height: 500px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } - .game-container .game-message { - display: none; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: rgba(238, 228, 218, 0.5); - z-index: 100; - text-align: center; - -webkit-animation: fade-in 800ms ease 1200ms; - -moz-animation: fade-in 800ms ease 1200ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; } - .game-container .game-message p { - font-size: 60px; - font-weight: bold; - height: 60px; - line-height: 60px; - margin-top: 222px; } - .game-container .game-message .lower { - display: block; - margin-top: 59px; } - .game-container .game-message a { - display: inline-block; - background: #8f7a66; - border-radius: 3px; - padding: 0 20px; - text-decoration: none; - color: #f9f6f2; - height: 40px; - line-height: 42px; - margin-left: 9px; } - .game-container .game-message .score-sharing { - display: inline-block; - vertical-align: middle; - margin-left: 10px; } - .game-container .game-message.game-won { - background: rgba(237, 194, 46, 0.5); - color: #f9f6f2; } - .game-container .game-message.game-won, .game-container .game-message.game-over { - display: block; } - -.grid-container { - position: absolute; - z-index: 1; } - -.grid-row { - margin-bottom: 15px; } - .grid-row:last-child { - margin-bottom: 0; } - .grid-row:after { - content: ""; - display: block; - clear: both; } - -.grid-cell { - width: 106.25px; - height: 106.25px; - margin-right: 15px; - float: left; - border-radius: 3px; - background: rgba(238, 228, 218, 0.35); } - .grid-cell:last-child { - margin-right: 0; } - -.tile-container { - position: absolute; - z-index: 2; } - -.tile { - width: 106.25px; - height: 106.25px; - line-height: 116.25px; } - .tile.tile-position-1-1 { - position: absolute; - left: 0px; - top: 0px; } - .tile.tile-position-1-2 { - position: absolute; - left: 0px; - top: 121px; } - .tile.tile-position-1-3 { - position: absolute; - left: 0px; - top: 243px; } - .tile.tile-position-1-4 { - position: absolute; - left: 0px; - top: 364px; } - .tile.tile-position-2-1 { - position: absolute; - left: 121px; - top: 0px; } - .tile.tile-position-2-2 { - position: absolute; - left: 121px; - top: 121px; } - .tile.tile-position-2-3 { - position: absolute; - left: 121px; - top: 243px; } - .tile.tile-position-2-4 { - position: absolute; - left: 121px; - top: 364px; } - .tile.tile-position-3-1 { - position: absolute; - left: 243px; - top: 0px; } - .tile.tile-position-3-2 { - position: absolute; - left: 243px; - top: 121px; } - .tile.tile-position-3-3 { - position: absolute; - left: 243px; - top: 243px; } - .tile.tile-position-3-4 { - position: absolute; - left: 243px; - top: 364px; } - .tile.tile-position-4-1 { - position: absolute; - left: 364px; - top: 0px; } - .tile.tile-position-4-2 { - position: absolute; - left: 364px; - top: 121px; } - .tile.tile-position-4-3 { - position: absolute; - left: 364px; - top: 243px; } - .tile.tile-position-4-4 { - position: absolute; - left: 364px; - top: 364px; } - -.tile { - border-radius: 3px; - background: #eee4da; - text-align: center; - font-weight: bold; - z-index: 10; - font-size: 55px; - -webkit-transition: 100ms ease-in-out; - -moz-transition: 100ms ease-in-out; - -webkit-transition-property: top, left; - -moz-transition-property: top, left; } - .tile.tile-2 { - background: #eee4da; - box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); } - .tile.tile-4 { - background: #ede0c8; - box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0), inset 0 0 0 1px rgba(255, 255, 255, 0); } - .tile.tile-8 { - color: #f9f6f2; - background: #f2b179; } - .tile.tile-16 { - color: #f9f6f2; - background: #f59563; } - .tile.tile-32 { - color: #f9f6f2; - background: #f67c5f; } - .tile.tile-64 { - color: #f9f6f2; - background: #f65e3b; } - .tile.tile-128 { - color: #f9f6f2; - background: #edcf72; - box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.2381), inset 0 0 0 1px rgba(255, 255, 255, 0.14286); - font-size: 45px; } - @media screen and (max-width: 480px) { - .tile.tile-128 { - font-size: 25px; } } - .tile.tile-256 { - color: #f9f6f2; - background: #edcc61; - box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.31746), inset 0 0 0 1px rgba(255, 255, 255, 0.19048); - font-size: 45px; } - @media screen and (max-width: 480px) { - .tile.tile-256 { - font-size: 25px; } } - .tile.tile-512 { - color: #f9f6f2; - background: #edc850; - box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.39683), inset 0 0 0 1px rgba(255, 255, 255, 0.2381); - font-size: 45px; } - @media screen and (max-width: 480px) { - .tile.tile-512 { - font-size: 25px; } } - .tile.tile-1024 { - color: #f9f6f2; - background: #edc53f; - box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.47619), inset 0 0 0 1px rgba(255, 255, 255, 0.28571); - font-size: 35px; } - @media screen and (max-width: 480px) { - .tile.tile-1024 { - font-size: 15px; } } - .tile.tile-2048 { - color: #f9f6f2; - background: #edc22e; - box-shadow: 0 0 30px 10px rgba(243, 215, 116, 0.55556), inset 0 0 0 1px rgba(255, 255, 255, 0.33333); - font-size: 35px; } - @media screen and (max-width: 480px) { - .tile.tile-2048 { - font-size: 15px; } } - -@-webkit-keyframes appear { - 0% { - opacity: 0; - -webkit-transform: scale(0); - -moz-transform: scale(0); } - - 100% { - opacity: 1; - -webkit-transform: scale(1); - -moz-transform: scale(1); } } - -@-moz-keyframes appear { - 0% { - opacity: 0; - -webkit-transform: scale(0); - -moz-transform: scale(0); } - - 100% { - opacity: 1; - -webkit-transform: scale(1); - -moz-transform: scale(1); } } - -@keyframes appear { - 0% { - opacity: 0; - -webkit-transform: scale(0); - -moz-transform: scale(0); } - - 100% { - opacity: 1; - -webkit-transform: scale(1); - -moz-transform: scale(1); } } - -.tile-new { - -webkit-animation: appear 200ms ease 100ms; - -moz-animation: appear 200ms ease 100ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; } - -@-webkit-keyframes pop { - 0% { - -webkit-transform: scale(0); - -moz-transform: scale(0); } - - 50% { - -webkit-transform: scale(1.2); - -moz-transform: scale(1.2); } - - 100% { - -webkit-transform: scale(1); - -moz-transform: scale(1); } } - -@-moz-keyframes pop { - 0% { - -webkit-transform: scale(0); - -moz-transform: scale(0); } - - 50% { - -webkit-transform: scale(1.2); - -moz-transform: scale(1.2); } - - 100% { - -webkit-transform: scale(1); - -moz-transform: scale(1); } } - -@keyframes pop { - 0% { - -webkit-transform: scale(0); - -moz-transform: scale(0); } - - 50% { - -webkit-transform: scale(1.2); - -moz-transform: scale(1.2); } - - 100% { - -webkit-transform: scale(1); - -moz-transform: scale(1); } } - -.tile-merged { - z-index: 20; - -webkit-animation: pop 200ms ease 100ms; - -moz-animation: pop 200ms ease 100ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; } - -.game-intro { - margin-bottom: 0; } - -.game-explanation { - margin-top: 50px; } - -.sharing { - margin-top: 20px; - text-align: center; } - .sharing > iframe, .sharing span { - display: inline-block; - vertical-align: middle; } - -@media screen and (max-width: 480px) { - html, body { - font-size: 15px; } - - body { - margin: 20px 0; - padding: 0 20px; } - - h1.title { - font-size: 50px; } - - .container { - width: 280px; - margin: 0 auto; } - - .score-container { - margin-top: 0; } - - .heading { - margin-bottom: 10px; } - - .game-container { - margin-top: 40px; - position: relative; - padding: 10px; - cursor: default; - -webkit-touch-callout: none; - -webkit-user-select: none; - -moz-user-select: none; - background: #bbada0; - border-radius: 6px; - width: 280px; - height: 280px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } - .game-container .game-message { - display: none; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - background: rgba(238, 228, 218, 0.5); - z-index: 100; - text-align: center; - -webkit-animation: fade-in 800ms ease 1200ms; - -moz-animation: fade-in 800ms ease 1200ms; - -webkit-animation-fill-mode: both; - -moz-animation-fill-mode: both; } - .game-container .game-message p { - font-size: 60px; - font-weight: bold; - height: 60px; - line-height: 60px; - margin-top: 222px; } - .game-container .game-message .lower { - display: block; - margin-top: 59px; } - .game-container .game-message a { - display: inline-block; - background: #8f7a66; - border-radius: 3px; - padding: 0 20px; - text-decoration: none; - color: #f9f6f2; - height: 40px; - line-height: 42px; - margin-left: 9px; } - .game-container .game-message .score-sharing { - display: inline-block; - vertical-align: middle; - margin-left: 10px; } - .game-container .game-message.game-won { - background: rgba(237, 194, 46, 0.5); - color: #f9f6f2; } - .game-container .game-message.game-won, .game-container .game-message.game-over { - display: block; } - - .grid-container { - position: absolute; - z-index: 1; } - - .grid-row { - margin-bottom: 10px; } - .grid-row:last-child { - margin-bottom: 0; } - .grid-row:after { - content: ""; - display: block; - clear: both; } - - .grid-cell { - width: 57.5px; - height: 57.5px; - margin-right: 10px; - float: left; - border-radius: 3px; - background: rgba(238, 228, 218, 0.35); } - .grid-cell:last-child { - margin-right: 0; } - - .tile-container { - position: absolute; - z-index: 2; } - - .tile { - width: 57.5px; - height: 57.5px; - line-height: 67.5px; } - .tile.tile-position-1-1 { - position: absolute; - left: 0px; - top: 0px; } - .tile.tile-position-1-2 { - position: absolute; - left: 0px; - top: 68px; } - .tile.tile-position-1-3 { - position: absolute; - left: 0px; - top: 135px; } - .tile.tile-position-1-4 { - position: absolute; - left: 0px; - top: 203px; } - .tile.tile-position-2-1 { - position: absolute; - left: 68px; - top: 0px; } - .tile.tile-position-2-2 { - position: absolute; - left: 68px; - top: 68px; } - .tile.tile-position-2-3 { - position: absolute; - left: 68px; - top: 135px; } - .tile.tile-position-2-4 { - position: absolute; - left: 68px; - top: 203px; } - .tile.tile-position-3-1 { - position: absolute; - left: 135px; - top: 0px; } - .tile.tile-position-3-2 { - position: absolute; - left: 135px; - top: 68px; } - .tile.tile-position-3-3 { - position: absolute; - left: 135px; - top: 135px; } - .tile.tile-position-3-4 { - position: absolute; - left: 135px; - top: 203px; } - .tile.tile-position-4-1 { - position: absolute; - left: 203px; - top: 0px; } - .tile.tile-position-4-2 { - position: absolute; - left: 203px; - top: 68px; } - .tile.tile-position-4-3 { - position: absolute; - left: 203px; - top: 135px; } - .tile.tile-position-4-4 { - position: absolute; - left: 203px; - top: 203px; } - - .game-container { - margin-top: 20px; } - - .tile { - font-size: 35px; } - - .game-message p { - font-size: 30px !important; - height: 30px !important; - line-height: 30px !important; - margin-top: 90px !important; } - .game-message .lower { - margin-top: 30px !important; } } +/* +Syntax error: Undefined mixin 'button'. + on line 492 of style/main.scss, in `button' + from line 492 of style/main.scss + +487: } +488: +489: // Bitcoin donate button +490: .btc-donate { +491: font-size: 14px; +492: @include button; +493: } + +Backtrace: +style/main.scss:492:in `button' +style/main.scss:492 +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:253:in `visit_mixin' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:37:in `visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:100:in `visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:53:in `block in visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:53:in `map' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:53:in `visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:109:in `block in visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:121:in `with_environment' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:108:in `visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:37:in `block in visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:320:in `visit_rule' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:37:in `visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:100:in `visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:53:in `block in visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:53:in `map' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:53:in `visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:109:in `block in visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:121:in `with_environment' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:108:in `visit_children' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:37:in `block in visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:128:in `visit_root' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/base.rb:37:in `visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:100:in `visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/visitors/perform.rb:7:in `visit' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/tree/root_node.rb:20:in `render' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/engine.rb:315:in `_render' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/engine.rb:262:in `render' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/plugin/compiler.rb:362:in `update_stylesheet' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/plugin/compiler.rb:203:in `block in update_stylesheets' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/plugin/compiler.rb:201:in `each' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/plugin/compiler.rb:201:in `update_stylesheets' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/lib/sass/plugin/compiler.rb:283:in `block in watch' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/vendor/listen/lib/listen/multi_listener.rb:108:in `call' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/vendor/listen/lib/listen/multi_listener.rb:108:in `on_change' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/vendor/listen/lib/listen/multi_listener.rb:117:in `block in initialize_adapter' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/vendor/listen/lib/listen/adapter.rb:198:in `call' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/vendor/listen/lib/listen/adapter.rb:198:in `report_changes' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/vendor/listen/lib/listen/adapter.rb:210:in `poll_changed_dirs' +/Users/gabriele/.rvm/gems/ruby-2.1.0/gems/sass-3.2.14/vendor/listen/lib/listen/adapters/darwin.rb:38:in `block in start' +*/ +body:before { + white-space: pre; + font-family: monospace; + content: "Syntax error: Undefined mixin 'button'.\A on line 492 of style/main.scss, in `button'\A from line 492 of style/main.scss\A \A 487: }\A 488: \A 489: // Bitcoin donate button\A 490: .btc-donate {\A 491: font-size: 14px;\A 492: @include button;\A 493: }"; } diff --git a/style/main.scss b/style/main.scss index 9570ff3cf2..404ac76ede 100644 --- a/style/main.scss +++ b/style/main.scss @@ -485,3 +485,8 @@ hr { } } } + +// Bitcoin donate button +.btc-donate { + font-size: 14px; +} From f162d2a17c1f4503e265790d8ba2cccf1f693d96 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 15:21:01 +0100 Subject: [PATCH 14/63] remove coinwidget --- index.html | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/index.html b/index.html index 7158d3fcf4..9ad406706c 100644 --- a/index.html +++ b/index.html @@ -100,25 +100,5 @@

2048

ga("create", "UA-42620757-2", "gabrielecirulli.github.io"); ga("send", "pageview"); - - From 9d50e7d746271a246659bcc3bf2ad47a0c3a63fe Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 15:39:30 +0100 Subject: [PATCH 15/63] add bitcoin donate button --- index.html | 4 ++- style/main.css | 54 +++++++++++++++++++++++++++++++++++++++- style/main.scss | 65 ++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 120 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 9ad406706c..a0ea081ea6 100644 --- a/index.html +++ b/index.html @@ -76,7 +76,9 @@

2048

- Donate + + Donate + 1Ec6onfsQmoP9kkL3zkpB6c5sA4PVcXU2i diff --git a/style/main.css b/style/main.css index 8e56bb6d10..cec63657d6 100644 --- a/style/main.css +++ b/style/main.css @@ -642,4 +642,56 @@ hr { .game-message .lower { margin-top: 30px !important; } } .btc-donate { - font-size: 14px; } + position: relative; + margin-left: 20px; + display: inline-block; + background: #8f7a66; + border-radius: 3px; + padding: 0 20px; + text-decoration: none; + color: #f9f6f2; + height: 40px; + line-height: 42px; + cursor: pointer; } + .btc-donate img { + vertical-align: -2px; + margin-right: 8px; } + .btc-donate a { + color: #f9f6f2; + text-decoration: none; + font-weight: normal; } + .btc-donate .address { + cursor: auto; + position: absolute; + width: 340px; + right: 50%; + margin-right: -170px; + padding-bottom: 7px; + top: 40px; + opacity: 0; + -webkit-transition: 200ms ease; + -moz-transition: 200ms ease; + -webkit-transition-property: top, opacity; + -moz-transition-property: top, opacity; } + .btc-donate .address:after { + position: absolute; + border-top: 10px solid #bbada0; + border-right: 7px solid transparent; + border-left: 7px solid transparent; + content: ""; + bottom: 0px; + left: 50%; + margin-left: -7px; } + .btc-donate .address code { + background-color: #bbada0; + padding: 10px 15px; + width: 100%; + border-radius: 3px; + line-height: 1; + font-weight: normal; + font-size: 15px; + font-family: Consolas, "Liberation Mono", Courier, monospace; + text-align: center; } + .btc-donate:hover .address, .btc-donate .address:hover .address { + opacity: 1; + top: -45px; } diff --git a/style/main.scss b/style/main.scss index 00dd8d49f1..f41928b419 100644 --- a/style/main.scss +++ b/style/main.scss @@ -493,5 +493,68 @@ hr { // Bitcoin donate button .btc-donate { - font-size: 14px; + // font-size: 14px; + position: relative; + margin-left: 20px; + @include button; + cursor: pointer; + + img { + vertical-align: -2px; + margin-right: 8px; + } + + a { + color: $bright-text-color; + text-decoration: none; + font-weight: normal; + } + + .address { + // display: none; + cursor: auto; + position: absolute; + // background: red; + width: 340px; + right: 50%; + margin-right: -170px; + + padding-bottom: 7px; + + top: 40px; + opacity: 0; + @include transition(200ms ease); + @include transition-property(top, opacity); + + &:after { + position: absolute; + border-top: 10px solid $game-container-background; + border-right: 7px solid transparent; + border-left: 7px solid transparent; + content: ""; + bottom: 0px; + left: 50%; + margin-left: -7px; + } + + code { + background-color: $game-container-background; + padding: 10px 15px; + width: 100%; + border-radius: 3px; + line-height: 1; + font-weight: normal; + font-size: 15px; + font-family: Consolas, "Liberation Mono", Courier, monospace; + text-align: center; + + } + } + + &:hover, .address:hover { + .address { + opacity: 1; + top: -45px; + } + } } From 603833b981bb03fcf97654a9d88d7dc353b5e606 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 15:47:11 +0100 Subject: [PATCH 16/63] improve donate button animation --- style/main.css | 10 ++++++---- style/main.scss | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/style/main.css b/style/main.css index cec63657d6..41af5e1f31 100644 --- a/style/main.css +++ b/style/main.css @@ -667,10 +667,11 @@ hr { right: 50%; margin-right: -170px; padding-bottom: 7px; - top: 40px; + top: -30px; opacity: 0; - -webkit-transition: 200ms ease; - -moz-transition: 200ms ease; + pointer-events: none; + -webkit-transition: 400ms ease; + -moz-transition: 400ms ease; -webkit-transition-property: top, opacity; -moz-transition-property: top, opacity; } .btc-donate .address:after { @@ -694,4 +695,5 @@ hr { text-align: center; } .btc-donate:hover .address, .btc-donate .address:hover .address { opacity: 1; - top: -45px; } + top: -45px; + pointer-events: auto; } diff --git a/style/main.scss b/style/main.scss index f41928b419..07090fde9a 100644 --- a/style/main.scss +++ b/style/main.scss @@ -521,9 +521,10 @@ hr { padding-bottom: 7px; - top: 40px; + top: -30px; opacity: 0; - @include transition(200ms ease); + pointer-events: none; + @include transition(400ms ease); @include transition-property(top, opacity); &:after { @@ -555,6 +556,7 @@ hr { .address { opacity: 1; top: -45px; + pointer-events: auto; } } } From ff72bf8a14f43e4515e468692b569356be987b8b Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 15:56:37 +0100 Subject: [PATCH 17/63] custom bitcoin icon --- meta/icon_bitcoin.png | Bin 1825 -> 18221 bytes style/main.css | 2 +- style/main.scss | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/icon_bitcoin.png b/meta/icon_bitcoin.png index 85e491b2c13938cf1074e402a15e80339e4552ed..8cc2e1dc77403c70f6f6dc48cd031f8017292c3f 100644 GIT binary patch literal 18221 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 delta 1475 zcmZ46$GDKst24mQotI0Bi-CcG*VDr#2uKTnFb5lul>huc5lBgvxJHx&=ckpFCl;kL zIHu$$r7C#lCZ?wbr6#6S7M@JCVPIfZnrP+Es4%h1PTxQ`*}%*|!OT$4(AdP>++0V& z$iUD*-@r)U&`8(N+{)O<%D_MY3Y6?7{&JF2uqjGOvvNr-PA->0CHch}`2`Bj!KMnn ziOHFHAifevy|1s8XI^nhVqS8pr;Du;P(&{?GsVi(*~rAe%+$%!#M#i$(ACJo*~Qew z(%j6=(8=7z)YSl{*Cju>G&eP`1f+NJE;fyNB|8Nhh_NoIMVV!(DQ-pixeCQ4L8)n0 znYb;o#BC8oZwit{AV;Pk9O;Opw;t7%`asv{qlF(#D9FVP#H_Fa8kd_|k_hD3R}>^B zXQ!4Zq~@jADitZ&+g(viJq(P&sh%#5Ar-fDg1z&lQ$=h)%bl-Cv#C4YIr&+rYUb1j zP8nXBAsj2Bwp!P>2y9p}q3cMKthd-7MwT}b8yGlQghcz-bqP!e(G3z+U2;TKG4t__ zm2;2u{}4Q1aqqCoqjh$%FYi?ED?X>X?{9{L`_-#FFLrTG`tn@FbI&}VBj>%l=6v%! zm3=Mi>D|4z_9V`V|77#Oe08#d=;VV2Dj9#`*FEOw(y965^X|&-$HMiCRkSr7FE{7U z`e0+fvb1_<`~Nk2x9^$s|4iW=e$J+XzJe>+;-L}KWP_AH^-tH||L53)9~u{Pvo+S_ zFZ_|gef1V&PJ4^g`@@}+g-fh%fB$ps+2hM5o_~%QO!1DLEi8E9*ON_>7Q~a3&OF~)}HD|net2Ec^Kytl=%kt$Dd)(AMd!J71ORZnHZl3V`S$luH68|fF z`N*@su5YgH_UN7Kn3TZNc}C#TOC6rmTn9v4ZyuvTtloDGT{J@Na3%KAg2}LP#iw(+k$9DN98( z#6uLaBE%dgn8{f*YA(ObhKu$_t%vqkmhi30aJ2}?;mFeB>Pw%z<-J5h9mk>a zgGD?Rk!>dn6gY&o{^go=RXxK@YR0U+46B1(m+tAS-}mOi#KsS{^A-5{XH~z*P@ z*{4iED);5)r8Dln-;N4VW)LhB`ShPX)^<8L1O^L>8u!)s^rLtJa3r?qT* z|65@n_qm@h7QVJ}Qsi5f=__qk7#nz1oYim+=Owpov)5Mb-L*gC_P6j&I)4uq>l{+5 g?)mNCz{s$HwIgX}?<{{{am>Ks>FVdQ&MBb@00?4eUjP6A diff --git a/style/main.css b/style/main.css index 41af5e1f31..568b1df28c 100644 --- a/style/main.css +++ b/style/main.css @@ -654,7 +654,7 @@ hr { line-height: 42px; cursor: pointer; } .btc-donate img { - vertical-align: -2px; + vertical-align: -4px; margin-right: 8px; } .btc-donate a { color: #f9f6f2; diff --git a/style/main.scss b/style/main.scss index 07090fde9a..0918d7a89b 100644 --- a/style/main.scss +++ b/style/main.scss @@ -500,7 +500,7 @@ hr { cursor: pointer; img { - vertical-align: -2px; + vertical-align: -4px; margin-right: 8px; } @@ -518,7 +518,7 @@ hr { width: 340px; right: 50%; margin-right: -170px; - + padding-bottom: 7px; top: -30px; @@ -537,7 +537,7 @@ hr { left: 50%; margin-left: -7px; } - + code { background-color: $game-container-background; padding: 10px 15px; @@ -548,7 +548,7 @@ hr { font-size: 15px; font-family: Consolas, "Liberation Mono", Courier, monospace; text-align: center; - + } } From ce45d4cd8e1e0b65c15776b44a7ec2a7b9ff8b12 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 16:16:42 +0100 Subject: [PATCH 18/63] improve bitcoin popup for mobile --- style/main.css | 9 +++++++++ style/main.scss | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/style/main.css b/style/main.css index 568b1df28c..ca5137ef3a 100644 --- a/style/main.css +++ b/style/main.css @@ -697,3 +697,12 @@ hr { opacity: 1; top: -45px; pointer-events: auto; } + @media screen and (max-width: 480px) { + .btc-donate .address { + margin-right: -85px; + width: 300px; } + .btc-donate .address code { + font-size: 13px; } + .btc-donate .address:after { + left: 73%; + bottom: 2px; } } diff --git a/style/main.scss b/style/main.scss index 0918d7a89b..f363be04c2 100644 --- a/style/main.scss +++ b/style/main.scss @@ -559,4 +559,22 @@ hr { pointer-events: auto; } } + + // Styles for small screens + @include smaller(480px) { + .address{ + margin-right: -85px; + // background: red; + width: 300px; + + code { + font-size: 13px; + } + + &:after { + left: 73%; + bottom: 2px; + } + } + } } From e8618987aa4be7a1cf715d4496be534e16d784f8 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Tue, 11 Mar 2014 16:20:39 +0100 Subject: [PATCH 19/63] svg bitcoin icon --- index.html | 2 +- meta/icon_bitcoin.png | Bin 18221 -> 0 bytes meta/icon_bitcoin.svg | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) delete mode 100644 meta/icon_bitcoin.png create mode 100644 meta/icon_bitcoin.svg diff --git a/index.html b/index.html index a0ea081ea6..169b1ec22d 100644 --- a/index.html +++ b/index.html @@ -77,7 +77,7 @@

2048

- Donate + Donate 1Ec6onfsQmoP9kkL3zkpB6c5sA4PVcXU2i diff --git a/meta/icon_bitcoin.png b/meta/icon_bitcoin.png deleted file mode 100644 index 8cc2e1dc77403c70f6f6dc48cd031f8017292c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18221 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 diff --git a/meta/icon_bitcoin.svg b/meta/icon_bitcoin.svg new file mode 100644 index 0000000000..944d65d063 --- /dev/null +++ b/meta/icon_bitcoin.svg @@ -0,0 +1,17 @@ + + + + + + + + + + From 96ad918a06c99558211a9a2de9b3cca8357e8d5c Mon Sep 17 00:00:00 2001 From: Eli White Date: Wed, 12 Mar 2014 22:42:18 +1100 Subject: [PATCH 20/63] Adding a cache manifest --- cache.appcache | 26 ++++++++++++++++++++++++++ index.html | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 cache.appcache diff --git a/cache.appcache b/cache.appcache new file mode 100644 index 0000000000..a5d5be73a6 --- /dev/null +++ b/cache.appcache @@ -0,0 +1,26 @@ +CACHE MANIFEST +index.html + +style/fonts/clear-sans.css +style/fonts/ClearSans-Bold-webfont.eot +style/fonts/ClearSans-Bold-webfont.svg +style/fonts/ClearSans-Bold-webfont.woff +style/fonts/ClearSans-Light-webfont.eot +style/fonts/ClearSans-Light-webfont.svg +style/fonts/ClearSans-Light-webfont.woff +style/fonts/ClearSans-Regular-webfont.eot +style/fonts/ClearSans-Regular-webfont.svg +style/fonts/ClearSans-Regular-webfont.woff + +js/animframe_polyfill.js +js/application.js +js/game_manager.js +js/grid.js +js/html_actuator.js +js/keyboard_input_manager.js +js/tile.js + +favicon.ico + +NETWORK: +* diff --git a/index.html b/index.html index adab8320ef..8dccd8f49b 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + 2048 From 119d8ecdd0182290fa698f726a38092969ba23f4 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Wed, 12 Mar 2014 13:05:55 +0100 Subject: [PATCH 21/63] restore ga in gh-pages --- js/html_actuator.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/html_actuator.js b/js/html_actuator.js index c697dabcb2..189208732d 100644 --- a/js/html_actuator.js +++ b/js/html_actuator.js @@ -117,6 +117,10 @@ HTMLActuator.prototype.message = function (won) { var type = won ? "game-won" : "game-over"; var message = won ? "You win!" : "Game over!"; + if (typeof ga !== "undefined") { + ga("send", "event", "game", "end", type, this.score); + } + this.messageContainer.classList.add(type); this.messageContainer.getElementsByTagName("p")[0].textContent = message; From 66b623dc1f49154cd188a68884cf5942f18a8d35 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Wed, 12 Mar 2014 17:56:43 +0100 Subject: [PATCH 22/63] add paypal donate button --- index.html | 11 ++++++++++- meta/icon_pp.svg | 11 +++++++++++ style/helpers.scss | 7 +++++++ style/main.css | 47 ++++++++++++++++++++++++++++++++++++---------- style/main.scss | 35 ++++++++++++++++++++++++++++++---- 5 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 meta/icon_pp.svg diff --git a/index.html b/index.html index fb8ac73448..09ce159fc9 100644 --- a/index.html +++ b/index.html @@ -80,12 +80,21 @@

2048

diff --git a/meta/icon_pp.svg b/meta/icon_pp.svg new file mode 100644 index 0000000000..50f2e2cd52 --- /dev/null +++ b/meta/icon_pp.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/style/helpers.scss b/style/helpers.scss index a8f108c695..7d0a61d339 100644 --- a/style/helpers.scss +++ b/style/helpers.scss @@ -60,3 +60,10 @@ @content; } } + +// Appearance +@mixin appearance($args...) { + -webkit-appearance: $args; + -moz-appearance: $args; + appearance: $args; +} diff --git a/style/main.css b/style/main.css index b9816bec8b..79e5cc2955 100644 --- a/style/main.css +++ b/style/main.css @@ -459,7 +459,7 @@ hr { .sharing { margin-top: 20px; text-align: center; } - .sharing > iframe, .sharing span { + .sharing > iframe, .sharing > span, .sharing > form { display: inline-block; vertical-align: middle; } @@ -653,7 +653,32 @@ hr { line-height: 30px !important; margin-top: 90px !important; } .game-message .lower { - margin-top: 30px !important; } } + margin-top: 30px !important; } + + .sharing > iframe, .sharing > span, .sharing > form { + display: block; + margin: 0 auto; + margin-bottom: 20px; } } +.pp-donate button { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + border: none; + font: inherit; + color: inherit; + cursor: pointer; + display: inline-block; + background: #8f7a66; + border-radius: 3px; + padding: 0 20px; + text-decoration: none; + color: #f9f6f2; + height: 40px; + line-height: 42px; } + .pp-donate button img { + vertical-align: -4px; + margin-right: 8px; } + .btc-donate { position: relative; margin-left: 20px; @@ -711,11 +736,13 @@ hr { top: -45px; pointer-events: auto; } @media screen and (max-width: 480px) { - .btc-donate .address { - margin-right: -85px; - width: 300px; } - .btc-donate .address code { - font-size: 13px; } - .btc-donate .address:after { - left: 73%; - bottom: 2px; } } + .btc-donate { + width: 120px; } + .btc-donate .address { + margin-right: -150px; + width: 300px; } + .btc-donate .address code { + font-size: 13px; } + .btc-donate .address:after { + left: 50%; + bottom: 2px; } } diff --git a/style/main.scss b/style/main.scss index d7b1e2dd52..7b80b64261 100644 --- a/style/main.scss +++ b/style/main.scss @@ -438,7 +438,7 @@ hr { margin-top: 20px; text-align: center; - > iframe, span { + > iframe, > span, > form { display: inline-block; vertical-align: middle; } @@ -510,6 +510,31 @@ hr { margin-top: 30px !important; } } + + .sharing { + > iframe, > span, > form { + display: block; + margin: 0 auto; + margin-bottom: 20px; + } + } +} + +// PP Donate button +.pp-donate { + button { + @include appearance(none); + border: none; + font: inherit; + color: inherit; + cursor: pointer; + @include button; + + img { + vertical-align: -4px; + margin-right: 8px; + } + } } // Bitcoin donate button @@ -583,8 +608,10 @@ hr { // Styles for small screens @include smaller(480px) { - .address{ - margin-right: -85px; + width: 120px; + + .address { + margin-right: -150px; // background: red; width: 300px; @@ -593,7 +620,7 @@ hr { } &:after { - left: 73%; + left: 50%; bottom: 2px; } } From 53dd0a79d99dd0d5e2de43690ce5a8cf157033c6 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Wed, 12 Mar 2014 17:58:23 +0100 Subject: [PATCH 23/63] fix paypal image name --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 09ce159fc9..fae667c72e 100644 --- a/index.html +++ b/index.html @@ -84,7 +84,7 @@

2048

- +
From d7932b9ddb96c4dbc5742fb99cd20afde3770cad Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Wed, 12 Mar 2014 18:57:20 +0100 Subject: [PATCH 24/63] update button id --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index fae667c72e..0327030131 100644 --- a/index.html +++ b/index.html @@ -83,7 +83,7 @@

2048

- +
From 1fa911145a95b89db747cf5614dabe26109848f2 Mon Sep 17 00:00:00 2001 From: Gabriele Cirulli Date: Wed, 12 Mar 2014 19:05:30 +0100 Subject: [PATCH 25/63] remove space between buttons --- style/main.css | 2 +- style/main.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/style/main.css b/style/main.css index 79e5cc2955..6dbbaed348 100644 --- a/style/main.css +++ b/style/main.css @@ -681,7 +681,7 @@ hr { .btc-donate { position: relative; - margin-left: 20px; + margin-left: 10px; display: inline-block; background: #8f7a66; border-radius: 3px; diff --git a/style/main.scss b/style/main.scss index 7b80b64261..e4915dbb5f 100644 --- a/style/main.scss +++ b/style/main.scss @@ -541,7 +541,7 @@ hr { .btc-donate { // font-size: 14px; position: relative; - margin-left: 20px; + margin-left: 10px; @include button; cursor: pointer; From 887c6b4cfe1f8e04dcb7ffdd495231a60df9c271 Mon Sep 17 00:00:00 2001 From: Cotton Hou Date: Sat, 15 Mar 2014 01:13:21 +0800 Subject: [PATCH 26/63] shorten links while tweeting, ref #34 --- index.html | 2 +- js/html_actuator.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 3fb403eb11..4396090c91 100644 --- a/index.html +++ b/index.html @@ -83,7 +83,7 @@

2048

Created by Gabriele Cirulli. Based on 1024 by Veewo Studio and conceptually similar to Threes by Asher Vollmer.