Bundle font-awesome in the css

11788bb7 · JC Brand · 03bda96e · 11788bb7 · 11788bb7 · 11788bb7
Commit 11788bb7 authored Mar 23, 2018 by JC Brand
7 changed files
--- a/css/converse.css
+++ b/css/converse.css
--- a/css/inverse.css
+++ b/css/inverse.css
--- a/dev.html
+++ b/dev.html
@@ -10,7 +10,6 @@
    <meta name="keywords" content="xmpp chat webchat converse.js" />
    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/font-awesome/css/font-awesome.min.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
    <script src="node_modules/requirejs/require.js"></script>

--- a/index.html
+++ b/index.html
@@ -10,7 +10,6 @@
    <meta name="keywords" content="xmpp chat webchat converse.js" />
    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
    <link type="text/css" rel="stylesheet" media="screen" href="css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/font-awesome.min.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
    <script type="text/javascript" src="analytics.js"></script>
    <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>

--- a/inverse.html
+++ b/inverse.html
@@ -11,7 +11,7 @@
    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/css/inverse.min.css" />
    <script src="https://cdn.conversejs.org/dist/converse.min.js"></script>
 </head>
-<body>
+<body class="reset">
    <div class="content">
        <div class="inner-content">
            <h1 class="brand-heading"><i class="icon-conversejs"></i> inVerse</h1>

--- a/sass/converse/converse.scss
+++ b/sass/converse/converse.scss
@@ -5,11 +5,12 @@
 * Copyright (c) 2012-2016, JC Brand <jc@opkode.com>
 * Licensed under the Mozilla Public License
 */
-
+@import "font-awesome/scss/font-awesome";

 @import "bourbon";
 @import "variables";

+
 @import "bootstrap/scss/functions";
 @import "bootstrap/scss/variables";
 @import "bootstrap/scss/mixins";

--- a/sass/inverse/inverse.scss
+++ b/sass/inverse/inverse.scss
@@ -5,6 +5,7 @@
 * Copyright (c) 2012-2014, JC Brand <jc@opkode.com>
 * Licensed under the Mozilla Public License
 */
+@import "font-awesome/scss/font-awesome";

 @import "bourbon";
 @import "variables";