From a1de5ae0c84783da6134acc04831bdc4684dcebb Mon Sep 17 00:00:00 2001 From: Lang Date: Sat, 19 Nov 2016 16:37:08 +0100 Subject: [PATCH] clipboard - not working #8 --- package.json | 1 + .../Resources/public/css/style.mineseeker.css | 62 ++++++++++++++++++- .../Resources/public/images/clippy.svg | 3 + .../Resources/public/js/mine-seeker/app.js | 12 +++- .../Resources/views/Game/play.html.twig | 1 + 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 src/Mine/SeekerBundle/Resources/public/images/clippy.svg diff --git a/package.json b/package.json index 6571b2f..537a5c9 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "babel-loader": "^6.2.5", "babel-preset-es2015": "^6.14.0", "babel-preset-react": "^6.11.1", + "clipboard": "^1.5.15", "howler": "^2.0.1", "js-base64": "^2.1.9", "react": "^15.3.2", diff --git a/src/Mine/SeekerBundle/Resources/public/css/style.mineseeker.css b/src/Mine/SeekerBundle/Resources/public/css/style.mineseeker.css index 5d9737e..974a855 100644 --- a/src/Mine/SeekerBundle/Resources/public/css/style.mineseeker.css +++ b/src/Mine/SeekerBundle/Resources/public/css/style.mineseeker.css @@ -103,6 +103,66 @@ main { font-size: 18px; } +#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy { + display: flex; + align-items: center; + width: 100%; +} + +#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy input { + border: 0; + height: 40px; + width: 90%; + padding: 0 20px; + + -webkit-border-top-left-radius: 3px; + border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + border-bottom-left-radius: 3px; + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); +} + +#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy button { + border: 0; + width: 10%; + height: 40px; + + cursor: pointer; + + -webkit-border-top-right-radius: 3px; + border-top-right-radius: 3px; + -webkit-border-bottom-right-radius: 3px; + border-bottom-right-radius: 3px; +} + +#mine-wrapper .game-wrapper .game-overlay .game-overlay-window .clippy button img { + width: 15px; + height: 15px; +} + +#mine-wrapper .game-wrapper .game-overlay .game-overlay-window a { + background: #d8e3ea; + display: table; + text-decoration: none; + color: #126aa2; + padding: 10px 50px; + margin: 0 auto; + + -webkit-border-radius: 3px; + border-radius: 3px; + -webkit-transition: all 250ms ease-in-out; + transition: all 250ms ease-in-out; +} + +#mine-wrapper .game-wrapper .game-overlay .game-overlay-window a:hover { + background: #a4afb6; + color: #ffffff; + + -webkit-transition: all 250ms ease-in-out; + transition: all 250ms ease-in-out; +} + #mine-wrapper .game-wrapper .users { width: 180px; padding: 0 10px 0 0; @@ -690,7 +750,7 @@ main { } /*#mine-wrapper .grid .field-wrapper.targeted > img.field-target {*/ - /*display: block;*/ +/*display: block;*/ /*}*/ /** width = 4 x .field */ diff --git a/src/Mine/SeekerBundle/Resources/public/images/clippy.svg b/src/Mine/SeekerBundle/Resources/public/images/clippy.svg new file mode 100644 index 0000000..e1b1703 --- /dev/null +++ b/src/Mine/SeekerBundle/Resources/public/images/clippy.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js b/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js index 590f42d..c71eb1e 100644 --- a/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js +++ b/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js @@ -85,7 +85,17 @@ class MineSeeker extends React.Component { overlay: true, overlayTitle: "We are waiting for your opponent...", overlaySubTitle: this.state.gameAssoc - ? Play w/ me! + ? +
+
+ + +
+ Play w/ me! +
: '', renderGridFields: this.state.gameAssoc }); diff --git a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig index 8917c56..9275325 100644 --- a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig +++ b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig @@ -21,6 +21,7 @@ {{ ws_client() }} + {% endblock %}