Merge pull request #27 from orangecoloured/master

Chat release

gulpfile.js

@@ -22,19 +22,23 @@ gulp.task('build-js', function() {
             'source/js/ractive.js',
             'source/js/ractive-events-tap.js',
             'source/js/ractive-events-keys.js',
+            'source/js/autolinker.js',
             'source/js/ajax.js',
             'source/js/socket.js',
             'source/js/crypt.js',
             'source/js/helpers.js',
             'source/js/file.js',
             'source/js/errors.js',
+            'source/js/chat.js',
+            'source/js/notifications.js',
             'source/js/main.js'
         ])
         .pipe(closureCompiler({
             compilerPath: 'node_modules/google-closure-compiler/compiler.jar',
             fileName: 'app.js',
             compilerFlags: {
                 language_in: 'ES5',
+                //compilation_level: 'WHITESPACE_ONLY',
                 compilation_level: 'SIMPLE_OPTIMIZATIONS',
                 warning_level: 'QUIET'
             }

source/css/_font.scss

@@ -1,54 +1,36 @@
 @font-face {
-	font-family: 'Raleway';
-	font-style: normal;
-	font-weight: 400;
-	src:
-		local('Raleway'),
-		local('Raleway-Regular'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/JDau3G46nqY5-B-S9E_nwg.eot */
-		url('fonts/Raleway_400.eot?#iefix') format('embedded-opentype'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/IczWvq5y_Cwwv_rBjOtT0w.woff */
-		url('fonts/Raleway_400.woff') format('woff'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/0dTEPzkLWceF7z0koJaX1A.woff2 */
-		url('fonts/Raleway_400.woff2') format('woff2'),
-		/* from http://fonts.gstatic.com/l/font?kit=IP_NSg73bUZGuyb3zF6qcQ&skey=30a27f2564731c64#Raleway */
-		url('fonts/Raleway_400.svg#Raleway') format('svg'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/bIcY3_3JNqUVRAQQRNVteQ.ttf */
-		url('fonts/Raleway_400.ttf') format('truetype');
-}
-@font-face {
-	font-family: 'Raleway';
+	font-family: 'Rubik';
 	font-style: normal;
 	font-weight: 300;
 	src:
-		local('Raleway Light'),
-		local('Raleway-Light'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/-_Ctzj9b56b8RgXW8FAriVQlYEbsez9cZjKsNMjLOwM.eot */
-		url('fonts/Raleway_300.eot?#iefix') format('embedded-opentype'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/-_Ctzj9b56b8RgXW8FAriRsxEYwM7FgeyaSgU71cLG0.woff */
-		url('fonts/Raleway_300.woff') format('woff'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/-_Ctzj9b56b8RgXW8FArifk_vArhqVIZ0nv9q090hN8.woff2 */
-		url('fonts/Raleway_300.woff2') format('woff2'),
-		/* from http://fonts.gstatic.com/l/font?kit=-_Ctzj9b56b8RgXW8FAriaWUboTb-jS2tyCOQMtm97g&skey=f383b08b06c2c86f#Raleway */
-		url('fonts/Raleway_300.svg#Raleway') format('svg'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/-_Ctzj9b56b8RgXW8FAriS3USBnSvpkopQaUR-2r7iU.ttf */
-		url('fonts/Raleway_300.ttf') format('truetype');
+		local('Rubik Light'),
+		local('Rubik-Light'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/YpQQMr52QNegP8PsDqdzHg.eot */
+		url('fonts/Rubik_300.eot?#iefix') format('embedded-opentype'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/_MANZMrB8TMofsbpLHz-wQ.woff */
+		url('fonts/Rubik_300.woff') format('woff'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/DhJ8mE4Ie9jgcuwRrJoRug.woff2 */
+		url('fonts/Rubik_300.woff2') format('woff2'),
+		/* from http://fonts.gstatic.com/l/font?kit=pWab2LOkubLtf869kJwDCQ&skey=30892a5a5aea46ae&v=v1#Rubik */
+		url('fonts/Rubik_300.svg#Rubik') format('svg'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/o1vXYO8YwDpErHEAPAxpOg.ttf */
+		url('fonts/Rubik_300.ttf') format('truetype');
 }
 @font-face {
-	font-family: 'Raleway';
+	font-family: 'Rubik';
 	font-style: normal;
-	font-weight: 600;
+	font-weight: 400;
 	src:
-		local('Raleway SemiBold'),
-		local('Raleway-SemiBold'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/xkvoNo9fC8O2RDydKj12b1QlYEbsez9cZjKsNMjLOwM.eot */
-		url('fonts/Raleway_600.eot?#iefix') format('embedded-opentype'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/xkvoNo9fC8O2RDydKj12bxsxEYwM7FgeyaSgU71cLG0.woff */
-		url('fonts/Raleway_600.woff') format('woff'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/xkvoNo9fC8O2RDydKj12b_k_vArhqVIZ0nv9q090hN8.woff2 */
-		url('fonts/Raleway_600.woff2') format('woff2'),
-		/* from http://fonts.gstatic.com/l/font?kit=xkvoNo9fC8O2RDydKj12b6WUboTb-jS2tyCOQMtm97g&skey=484edb0fdce88a64#Raleway */
-		url('fonts/Raleway_600.svg#Raleway') format('svg'),
-		/* from http://fonts.gstatic.com/s/raleway/v10/xkvoNo9fC8O2RDydKj12by3USBnSvpkopQaUR-2r7iU.ttf */
-		url('fonts/Raleway_600.ttf') format('truetype');
-}
+		local('Rubik'),
+		local('Rubik-Regular'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/zhNS_edmJNn8l_UiSD5Qhw.eot */
+		url('fonts/Rubik_400.eot?#iefix') format('embedded-opentype'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/6AIK1e5MYhdCKIlT8VC0yQ.woff */
+		url('fonts/Rubik_400.woff') format('woff'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/v0oNw8_sYXfBdf4NFGYu5g.woff2 */
+		url('fonts/Rubik_400.woff2') format('woff2'),
+		/* from http://fonts.gstatic.com/l/font?kit=CmwKkoHI8xmKVge792zLsw&skey=cee854e66788286d&v=v1#Rubik */
+		url('fonts/Rubik_400.svg#Rubik') format('svg'),
+		/* from http://fonts.gstatic.com/s/rubik/v1/4sMyW_teKWHB3K8Hm-Il6A.ttf */
+		url('fonts/Rubik_400.ttf') format('truetype');
+}

source/css/_normalize.scss

@@ -116,7 +116,7 @@ abbr[title] {
 
 b,
 strong {
-  font-weight: bold;
+  font-weight: 400;
 }
 
 /**
@@ -406,7 +406,7 @@ textarea {
  */
 
 optgroup {
-  font-weight: bold;
+  font-weight: 400;
 }
 
 /* Tables

source/css/_skeleton.scss

@@ -123,8 +123,8 @@ html {
 body {
   font-size: 1.5em; /* currently ems cause chrome bug misinterpreting rems on body element */
   line-height: 1.6;
-  font-weight: 400;
-  font-family: "Raleway", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 300;
+  font-family: "Rubik", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif;
   color: #222; }
 
 
@@ -176,7 +176,7 @@ input[type="button"] {
   color: #555;
   text-align: center;
   font-size: 11px;
-  font-weight: 600;
+  font-weight: 400;
   line-height: 38px;
   letter-spacing: .1rem;
   text-transform: uppercase;
@@ -221,7 +221,12 @@ input[type="button"].button-primary:focus {
   color: #FFF;
   background-color: #1EAEDB;
   border-color: #1EAEDB; }
-
+.button.no-padding{
+  padding: 0;
+}
+.button.no-border{
+  border: none;
+}
 
 /* Forms
 –––––––––––––––––––––––––––––––––––––––––––––––––– */
@@ -272,7 +277,7 @@ label,
 legend {
   display: block;
   margin-bottom: .5rem;
-  font-weight: 600; }
+  font-weight: 400; }
 fieldset {
   padding: 0;
   border-width: 0; }