diff --git a/Gruntfile.js b/Gruntfile.js
index f92238c6..1a121980 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,7 +11,7 @@ module.exports = function(grunt) {
},
js: {
files: {
- "client/dist/build.js": libs
+ "client/build/build.js": libs
}
}
}
diff --git a/client/dist/build.js b/client/build/build.js
similarity index 100%
rename from client/dist/build.js
rename to client/build/build.js
diff --git a/client/css/fonts/LICENSE.txt b/client/css/fonts/LICENSE.txt
deleted file mode 100644
index 259b43d1..00000000
--- a/client/css/fonts/LICENSE.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-(c) 2012-2014 GitHub
-
-When using the GitHub logos, be sure to follow the GitHub logo guidelines (https://github.com/logos)
-
-Font License: SIL OFL 1.1 (http://scripts.sil.org/OFL)
-Applies to all font files
-
-Code License: MIT (http://choosealicense.com/licenses/mit/)
-Applies to all other files
diff --git a/client/css/fonts/fontawesome.svg b/client/css/fonts/fontawesome.svg
new file mode 100644
index 00000000..d907b25a
--- /dev/null
+++ b/client/css/fonts/fontawesome.svg
@@ -0,0 +1,520 @@
+
+
+
\ No newline at end of file
diff --git a/client/css/fonts/fontawesome.woff b/client/css/fonts/fontawesome.woff
new file mode 100644
index 00000000..628b6a52
Binary files /dev/null and b/client/css/fonts/fontawesome.woff differ
diff --git a/client/css/fonts/octicons.svg b/client/css/fonts/octicons.svg
deleted file mode 100644
index ea3e0f16..00000000
--- a/client/css/fonts/octicons.svg
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
diff --git a/client/css/fonts/octicons.woff b/client/css/fonts/octicons.woff
deleted file mode 100644
index 3c0e36ad..00000000
Binary files a/client/css/fonts/octicons.woff and /dev/null differ
diff --git a/client/css/style.css b/client/css/style.css
index 57a9f7ab..584c5af6 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -2,8 +2,8 @@
http://fonts.googleapis.com/css?family=Lato:400,700
);
@font-face {
- font-family: "Octicons";
- src: url("fonts/octicons.svg") format("svg"), url("fonts/octicons.woff") format("woff");
+ font-family: "FontAwesome";
+ src: url("fonts/fontawesome.svg") format("svg"), url("fonts/fontawesome.woff") format("woff");
}
html,
body {
@@ -119,6 +119,7 @@ button {
border: 1px solid transparent;
border-radius: 2px;
color: #bcc4d3;
+ color: #99a2b4;
font-size: 14px;
}
#sidebar button:hover,
@@ -130,7 +131,7 @@ button {
}
#sidebar .networks {
min-height: 100%;
- padding: 25px 40px 80px;
+ padding: 20px 30px 80px;
}
#sidebar .network + .network {
margin-top: 30px;
@@ -152,7 +153,7 @@ button {
position: relative;
text-align: left;
transition: all .2s;
- width: 160px;
+ width: 180px;
}
#sidebar .chan:first-child {
color: #84ce88;
@@ -163,6 +164,30 @@ button {
#sidebar .chan:first-child.active {
color: #c0f8c3;
}
+#sidebar .chan:before,
+#chat .title:before {
+ font: 14px FontAwesome;
+ float: left;
+ margin-top: 3px;
+ margin-right: 12px;
+ width: 14px;
+ text-align: center;
+}
+#chat .title:before {
+ margin-top: 17px;
+}
+#sidebar .chan.lobby:before,
+#chat .lobby .title:before {
+ content: "\f0a0";
+}
+#sidebar .chan.query:before,
+#chat .query .title:before {
+ content: "\f0e6";
+}
+#sidebar .chan.channel:before,
+#chat .channel .title:before {
+ content: "\f0f6";
+}
#sidebar .chan:hover .badge {
opacity: 0;
}
@@ -209,9 +234,7 @@ button {
height: 70px;
line-height: 70px;
margin-top: -70px;
- padding: 0 8px;
text-align: center;
- width: 220px;
}
#footer button {
border: 0;
@@ -222,7 +245,7 @@ button {
#footer .icon {
color: #818b9e;
display: inline-block;
- font: 16px Octicons;
+ font: 14px FontAwesome;
line-height: 34px;
padding: 0px 12px;
}
@@ -241,16 +264,16 @@ button {
display: none;
}
#footer .sign-in:before {
- content: "\f036";
+ content: "\f090";
}
#footer .connect:before {
- content: "\f085";
+ content: "\f1eb";
}
#footer .settings:before {
- content: "\f02f";
+ content: "\f02d";
}
#footer .sign-out:before {
- content: "\f032";
+ content: "\f13e";
}
#main {
background: #fff;
@@ -351,8 +374,8 @@ button {
}
#chat .header .lt:before,
#chat .header .rt:before {
- font: 16px Octicons;
- content: "\f05e";
+ font: 14px FontAwesome;
+ content: "\f0c9";
}
#chat .header .rt {
float: right;
@@ -362,6 +385,8 @@ button {
font: 16px Lato;
}
#chat .header .topic {
+ /* Hidden for now */
+ display: none;
color: #777;
margin-left: 8px;
text-transform: capitalize;
@@ -509,8 +534,8 @@ button {
}
#chat .count:before {
color: #eee;
- font: 16px Octicons;
- content: "\f02e";
+ font: 14px FontAwesome;
+ content: "\f002";
position: absolute;
right: 18px;
line-height: 50px;
@@ -599,8 +624,8 @@ button {
opacity: .8;
}
#settings #play:before {
- content: "\f0ba";
- font: 16px Octicons;
+ content: "\f028";
+ font: 14px FontAwesome;
margin-right: 9px;
}
#settings .about {
@@ -676,6 +701,9 @@ button {
-webkit-perspective: 1000;
perspective: 1000;
}
+ #chat .title:before {
+ display: none;
+ }
}
@media (max-width: 480px) {
diff --git a/client/index.html b/client/index.html
index ba23fe61..c070326c 100644
--- a/client/index.html
+++ b/client/index.html
@@ -170,7 +170,7 @@
<% } else { %>
-
+
<% } %>
diff --git a/client/js/libs/handlebars.runtime.js b/client/js/libs/handlebars.js
similarity index 100%
rename from client/js/libs/handlebars.runtime.js
rename to client/js/libs/handlebars.js
diff --git a/package.json b/package.json
index 551b4fc2..1af3e0b2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "shout",
"description": "A web IRC client",
- "version": "0.12.3",
+ "version": "0.13.0",
"author": "Mattias Erming",
"preferGlobal": true,
"bin": {