Browse Source

styles changes; fix expired link

romanmatiasko 9 years ago
parent
commit
679a977856
6 changed files with 14 additions and 8 deletions
  1. 0 0
      dist/css/main.css
  2. 0 0
      dist/js/index.js
  3. 1 1
      io.js
  4. 5 1
      src/css/_layout.scss
  5. 4 3
      src/css/main.scss
  6. 4 3
      src/js/components/Index.js

File diff suppressed because it is too large
+ 0 - 0
dist/css/main.css


File diff suppressed because it is too large
+ 0 - 0
dist/js/index.js


+ 1 - 1
io.js

@@ -13,7 +13,7 @@ io.sockets.on('connection', socket => {
   socket.on('start', data => {
     let token;
     const b = new Buffer(Math.random() + new Date().getTime() + socket.id);
-    token = b.toString('base64').slice(12, 32);
+    token = b.toString('base64').slice(12, 28);
 
     // token is valid for 3 minutes
     const timeout = setTimeout(() => {

+ 5 - 1
src/css/_layout.scss

@@ -103,7 +103,11 @@ footer {
 #footer {
   margin: 0 auto;
   max-width: 960px;
-  padding: 3em 2em 1em 2em; 
+  padding: 3em 1em 0; 
+}
+
+#container-wrapper, footer {
+  min-width: 480px;
 }
 
 .modal-mask {

+ 4 - 3
src/css/main.scss

@@ -58,9 +58,10 @@
         display: block;
         line-height: 45px;
         padding-left: 0;
+        font-size: 1rem;
 
         &::before {
-          margin-left: -7em;
+          margin-left: -6em;
           margin-top: 0;
           right: auto;
         }
@@ -89,8 +90,8 @@
   header, #board-moves-wrapper, #sounds-label {
     max-width: 470px;
   }
-  #game-link {
-    font-size: 1rem;
+  #game-link, footer p, footer a {
+    font-size: .75rem;
   }
   ul#clock {
     width: 118px;

+ 4 - 3
src/js/components/Index.js

@@ -7,7 +7,7 @@ import io from '../io';
 const Index = React.createClass({
   
   propTypes: {
-    io: React.PropTypes.object
+    io: React.PropTypes.object.isRequired
   },
 
   getInitialState() {
@@ -25,7 +25,8 @@ const Index = React.createClass({
       const {time, inc} = this.state;
 
       this.setState({
-        link: `${document.location.origin}/play/${data.token}/${time}/${inc}`
+        link: `${document.location.origin}/play/${data.token}/${time}/${inc}`,
+        hasExpired: false
       });
     });
     io.on('ready', () => {
@@ -85,7 +86,7 @@ const Index = React.createClass({
 
     if (isInvalid) {
       // fallback for old browsers
-      return window.alert('Form is invalid.');
+      return window.alert('Form is invalid. Enter numbers between 0 and 50.');
     } else {
       this.props.io.emit('start');
     }

Some files were not shown because too many files changed in this diff