Fix path to converse.css and add some mockup fixes

48adc047 · JC Brand · 1d9bbb8d · 48adc047 · 48adc047 · 48adc047
Commit 48adc047 authored Jun 04, 2019 by JC Brand
9 changed files
--- a/docs/source/builds.rst
+++ b/docs/source/builds.rst
@@ -48,7 +48,7 @@ The Converse repository does not include the minified files in the ``dist`` or
 To only generate the minified files, you can make them individually. ::

    make dist/converse.min.js
-    make css/converse.min.css
+    make dist/converse.min.css

 .. note::


--- a/jslicenses.html
+++ b/jslicenses.html
 <!DOCTYPE html>
 <html lang=en>
 <head>
-    <title>Converse.js</title>
+    <title>Converse</title>
    <meta charset="utf-8">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="description" content="Converse.js: An XMPP chat client which can be integrated into any website" />
+    <meta name="description" content="Converse: An XMPP chat client which can be integrated into any website" />
    <meta name="author" content="JC Brand" />
-    <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>
+    <meta name="keywords" content="xmpp chat webchat converse.js Converse" />
+
+    <!-- These files are NOT needed when using converse.js in your own project. -->
+    <link rel="shortcut icon" type="image/ico" href="images/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/4.2.0/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/4.2.0/css/website.min.css" />
    <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
-    <script src="src/website.js"></script>
+    <script type="text/javascript" src="/src/website.js"></script>
+    <script type="text/javascript" src="analytics.js"></script>
+    <!-- *********************************************************************** -->
+
    <![if gte IE 11]>
-        <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
-        <script src="dist/converse.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/4.2.0/css/converse.min.css" />
+        <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
+        <script src="https://cdn.conversejs.org/4.2.0/dist/converse.min.js"></script>
    <![endif]>
 </head>


--- a/mockup/chatbox.html
+++ b/mockup/chatbox.html
--- a/mockup/chatroom.html
+++ b/mockup/chatroom.html
--- a/mockup/fullscreen-login.html
+++ b/mockup/fullscreen-login.html
@@ -6,7 +6,7 @@
    <title>Login Fullscreen</title>
    <link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/bootstrap/dist/css/bootstrap.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../../css/converse.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../../dist/converse.css" />
 </head>

 <body>

--- a/mockup/index.html
+++ b/mockup/index.html
@@ -4,8 +4,8 @@
 <head>
    <title>Converse.js Live Mockup</title>
    <meta name="description" content="Converse.js: A chat client for your website" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../css/website.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../css/converse.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../dist/website.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../dist/converse.css" />
 </head>

 <body>

--- a/mockup/overlayed-login.html
+++ b/mockup/overlayed-login.html
@@ -5,8 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Login Overlayed</title>
    <link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../../css/converse.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/mockup.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../../dist/converse.css" />
 </head>

 <body class="reset">

--- a/mockup/overlayed.html
+++ b/mockup/overlayed.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Overlayed chats</title>
    <link type="text/css" rel="stylesheet" media="screen" href="../../node_modules/font-awesome/css/font-awesome.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="../../css/converse.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../../dist/converse.css" />
 </head>

 <body style="background-color: #578EA9">

--- a/redirect.html
+++ b/redirect.html
@@ -5,7 +5,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <title>Converse</title>
    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="dist/converse.css" />
    <script src="node_modules/hellojs/dist/hello.all.js"></script>
 </head>
 <body>