diff --git a/.gitignore b/.gitignore index f446d6a3f..baaaceff2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ .idea .su? .sass-cache +pip-selfcheck.json 3rdparty/libsignal-protocol-javascript/ *.map diff --git a/css/converse.css b/css/converse.css index 2eb6cdac3..d229c3167 100644 --- a/css/converse.css +++ b/css/converse.css @@ -5,6 +5,12 @@ * Copyright (c) 2013-2018, JC Brand * Licensed under the Mozilla Public License */ +@font-face { + font-family: 'Baumans'; + font-style: normal; + font-weight: 400; + src: local("Baumans Regular"), local("Baumans-Regular"), url(webfonts/baumans.ttf) format("truetype"); } + @font-face { font-family: 'ConverseFontAwesomeBrands'; font-style: normal; @@ -9351,7 +9357,7 @@ readers do not read off random characters that represent icons */ --mobile-chat-width: 100%; --mobile-chat-height: 400px; --normal-font: "Helvetica", "Arial", sans-serif; - --heading-font: futura, 'Century Gothic', 'URW Gothic L', Verdana, sans-serif; + --heading-font: 'Baumans', cursive; --heading-display: block; --heading-color: white; --chatroom-head-color: #E77051; @@ -9470,13 +9476,6 @@ readers do not read off random characters that represent icons */ body.reset { margin: 0; } -@font-face { - font-family: 'Converse-js'; - src: url("webfonts/icomoon/fonts/icomoon.eot?wvi0ht"); - src: url("webfonts/icomoon/fonts/icomoon.eot?wvi0ht#iefix") format("embedded-opentype"), url("webfonts/icomoon/fonts/icomoon.ttf?wvi0ht") format("truetype"), url("webfonts/icomoon/fonts/icomoon.woff?wvi0ht") format("woff"), url("webfonts/icomoon/fonts/icomoon.svg?wvi0ht#icomoon") format("svg"); - font-weight: normal; - font-style: normal; } - .icon-conversejs { padding-right: 0.5em; font-family: 'Converse-js'; @@ -9598,7 +9597,26 @@ body.reset { text-align: center; } #conversejs .brand-heading { font-size: 200%; + display: inline-flex; + align-items: flex-end; font-family: var(--heading-font); } + #conversejs .brand-heading:hover .brand-name { + color: var(--link-color); } + #conversejs .brand-heading .converse-svg-logo { + height: 1.2em; + margin-right: 0.25em; + margin-bottom: -0.3em; } + #conversejs .brand-heading .converse-svg-logo .cls-1 { + isolation: isolate; } + #conversejs .brand-heading .converse-svg-logo .cls-2 { + opacity: 0.5; + mix-blend-mode: multiply; } + #conversejs .brand-heading .converse-svg-logo .cls-3 { + fill: var(--link-color); } + #conversejs .brand-heading .converse-svg-logo .cls-4 { + fill: var(--link-color); } + #conversejs .brand-heading--inverse .converse-svg-logo { + margin-bottom: 0em; } #conversejs .popover { position: fixed; } #conversejs .converse-chatboxes { @@ -9700,7 +9718,6 @@ body.reset { font-weight: normal; font-size: 90%; } #conversejs .btn { - font-family: var(--heading-font); font-weight: normal; color: #fff; } #conversejs .btn .fa, #conversejs .btn .far, #conversejs .btn .fas { diff --git a/css/fonts.css b/css/fonts.css index e756837d3..6b5f364d2 100644 --- a/css/fonts.css +++ b/css/fonts.css @@ -1,3 +1,9 @@ +@font-face { + font-family: 'Baumans'; + font-style: normal; + font-weight: 400; + src: local('Baumans Regular'), local('Baumans-Regular'), url(webfonts/baumans.ttf) format('truetype'); +} @font-face { font-family: 'ConverseFontAwesomeBrands'; font-style: normal; diff --git a/css/webfonts/baumans.ttf b/css/webfonts/baumans.ttf new file mode 100644 index 000000000..efad51c86 Binary files /dev/null and b/css/webfonts/baumans.ttf differ diff --git a/css/webfonts/icomoon/fonticons/fonts/icomoon.eot b/css/webfonts/icomoon/fonticons/fonts/icomoon.eot deleted file mode 100755 index 0bb986f5b..000000000 Binary files a/css/webfonts/icomoon/fonticons/fonts/icomoon.eot and /dev/null differ diff --git a/css/webfonts/icomoon/fonticons/fonts/icomoon.svg b/css/webfonts/icomoon/fonticons/fonts/icomoon.svg deleted file mode 100755 index 5c9dc2563..000000000 --- a/css/webfonts/icomoon/fonticons/fonts/icomoon.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - \ No newline at end of file diff --git a/css/webfonts/icomoon/fonticons/fonts/icomoon.ttf b/css/webfonts/icomoon/fonticons/fonts/icomoon.ttf deleted file mode 100755 index c618735a6..000000000 Binary files a/css/webfonts/icomoon/fonticons/fonts/icomoon.ttf and /dev/null differ diff --git a/css/webfonts/icomoon/fonticons/fonts/icomoon.woff b/css/webfonts/icomoon/fonticons/fonts/icomoon.woff deleted file mode 100755 index be9a8ee11..000000000 Binary files a/css/webfonts/icomoon/fonticons/fonts/icomoon.woff and /dev/null differ diff --git a/css/webfonts/icomoon/fonticons/selection.json b/css/webfonts/icomoon/fonticons/selection.json deleted file mode 100755 index a92f27d69..000000000 --- a/css/webfonts/icomoon/fonticons/selection.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "IcoMoonType": "selection", - "icons": [ - { - "icon": { - "width": 820, - "paths": [ - "M66.030 0.028c-36.579 0-66.011 29.432-66.011 66.011v769.403c0 36.579 29.432 66.048 66.011 66.048h687.91c36.579 0 66.048-29.468 66.048-66.048v-769.403c0-36.579-29.468-66.011-66.048-66.011h-687.91zM81.878 14.334h657.571c35.498 0 64.098 28.602 64.098 64.098v252.827l-98.85 112.2h-573.65l-11.069 9.194-100.689 116.356-1.618-177.512 0.514-5.37c-0.232-2.218-0.368-4.448-0.368-6.731v-300.964c0-35.498 28.565-64.098 64.061-64.098zM566.423 122.563c-58.205 0-105.397 47.155-105.397 105.359s47.191 105.397 105.397 105.397c58.205 0 105.397-47.191 105.397-105.397s-47.191-105.359-105.397-105.359zM249.498 564.081c0.903-0.022 1.812 0 2.721 0 58.205 0 105.359 47.155 105.359 105.359s-47.155 105.397-105.359 105.397c-58.205 0-105.397-47.191-105.397-105.397 0-57.296 45.728-103.916 102.676-105.359z" - ], - "attrs": [ - { - "opacity": 1, - "visibility": false - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "conversejs" - ], - "grid": 16 - }, - "attrs": [ - { - "opacity": 1, - "visibility": false - } - ], - "properties": { - "order": 94, - "id": 9, - "prevSize": 32, - "code": 58880, - "name": "conversejs", - "ligatures": "" - }, - "setIdx": 0, - "setId": 9, - "iconIdx": 9 - } - ], - "height": 1024, - "metadata": { - "name": "icomoon" - }, - "preferences": { - "fontPref": { - "prefix": "icon-", - "metadata": { - "fontFamily": "icomoon", - "majorVersion": 1, - "minorVersion": 0 - }, - "showGlyphs": true, - "metrics": { - "emSize": 512, - "baseline": 14.285714285714285, - "whitespace": 25 - }, - "resetPoint": 58880, - "showQuickUse": true, - "quickUsageToken": false, - "showMetrics": true, - "showMetadata": true, - "ie7": false, - "includeMetadata": false, - "embed": false, - "cssVars": false, - "showSelector": true, - "showVersion": true, - "postfix": "", - "selector": "", - "classSelector": ".conversejs", - "autoHost": false - }, - "imagePref": { - "color": 0, - "height": 32, - "columns": 16, - "margin": 16, - "png": false, - "sprites": true - }, - "historySize": 100, - "showCodes": true, - "gridSize": 16, - "showLiga": true, - "showGrid": true, - "showGlyphs": true, - "showQuickUse": false, - "search": "", - "showQuickUse2": true, - "showSVGs": true, - "quickUsageToken": { - "UntitledProject": "NTM5OWJhMDg1M2ZlZjhjOGUxODNmOGExNDdiZDU3ZjUjMSMxNDg3NDQ2NzgyIyMj" - } - } -} \ No newline at end of file diff --git a/css/webfonts/icomoon/fonticons/style.css b/css/webfonts/icomoon/fonticons/style.css deleted file mode 100755 index 17d29bc56..000000000 --- a/css/webfonts/icomoon/fonticons/style.css +++ /dev/null @@ -1,29 +0,0 @@ -@font-face { - font-family: 'icomoon'; - src: url('fonts/icomoon.eot?x0id2b'); - src: url('fonts/icomoon.eot?x0id2b#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?x0id2b') format('truetype'), - url('fonts/icomoon.woff?x0id2b') format('woff'), - url('fonts/icomoon.svg?x0id2b#icomoon') format('svg'); - font-weight: normal; - font-style: normal; -} - -[class^="icon-"], [class*=" icon-"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - - /* Better Font Rendering =========== */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-conversejs:before { - content: "\e600"; -} diff --git a/css/webfonts/icomoon/fonts/icomoon.eot b/css/webfonts/icomoon/fonts/icomoon.eot deleted file mode 100755 index 0bb986f5b..000000000 Binary files a/css/webfonts/icomoon/fonts/icomoon.eot and /dev/null differ diff --git a/css/webfonts/icomoon/fonts/icomoon.svg b/css/webfonts/icomoon/fonts/icomoon.svg deleted file mode 100755 index 5c9dc2563..000000000 --- a/css/webfonts/icomoon/fonts/icomoon.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - \ No newline at end of file diff --git a/css/webfonts/icomoon/fonts/icomoon.ttf b/css/webfonts/icomoon/fonts/icomoon.ttf deleted file mode 100755 index c618735a6..000000000 Binary files a/css/webfonts/icomoon/fonts/icomoon.ttf and /dev/null differ diff --git a/css/webfonts/icomoon/fonts/icomoon.woff b/css/webfonts/icomoon/fonts/icomoon.woff deleted file mode 100755 index be9a8ee11..000000000 Binary files a/css/webfonts/icomoon/fonts/icomoon.woff and /dev/null differ diff --git a/css/webfonts/icomoon/selection.json b/css/webfonts/icomoon/selection.json deleted file mode 100755 index a92f27d69..000000000 --- a/css/webfonts/icomoon/selection.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "IcoMoonType": "selection", - "icons": [ - { - "icon": { - "width": 820, - "paths": [ - "M66.030 0.028c-36.579 0-66.011 29.432-66.011 66.011v769.403c0 36.579 29.432 66.048 66.011 66.048h687.91c36.579 0 66.048-29.468 66.048-66.048v-769.403c0-36.579-29.468-66.011-66.048-66.011h-687.91zM81.878 14.334h657.571c35.498 0 64.098 28.602 64.098 64.098v252.827l-98.85 112.2h-573.65l-11.069 9.194-100.689 116.356-1.618-177.512 0.514-5.37c-0.232-2.218-0.368-4.448-0.368-6.731v-300.964c0-35.498 28.565-64.098 64.061-64.098zM566.423 122.563c-58.205 0-105.397 47.155-105.397 105.359s47.191 105.397 105.397 105.397c58.205 0 105.397-47.191 105.397-105.397s-47.191-105.359-105.397-105.359zM249.498 564.081c0.903-0.022 1.812 0 2.721 0 58.205 0 105.359 47.155 105.359 105.359s-47.155 105.397-105.359 105.397c-58.205 0-105.397-47.191-105.397-105.397 0-57.296 45.728-103.916 102.676-105.359z" - ], - "attrs": [ - { - "opacity": 1, - "visibility": false - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "tags": [ - "conversejs" - ], - "grid": 16 - }, - "attrs": [ - { - "opacity": 1, - "visibility": false - } - ], - "properties": { - "order": 94, - "id": 9, - "prevSize": 32, - "code": 58880, - "name": "conversejs", - "ligatures": "" - }, - "setIdx": 0, - "setId": 9, - "iconIdx": 9 - } - ], - "height": 1024, - "metadata": { - "name": "icomoon" - }, - "preferences": { - "fontPref": { - "prefix": "icon-", - "metadata": { - "fontFamily": "icomoon", - "majorVersion": 1, - "minorVersion": 0 - }, - "showGlyphs": true, - "metrics": { - "emSize": 512, - "baseline": 14.285714285714285, - "whitespace": 25 - }, - "resetPoint": 58880, - "showQuickUse": true, - "quickUsageToken": false, - "showMetrics": true, - "showMetadata": true, - "ie7": false, - "includeMetadata": false, - "embed": false, - "cssVars": false, - "showSelector": true, - "showVersion": true, - "postfix": "", - "selector": "", - "classSelector": ".conversejs", - "autoHost": false - }, - "imagePref": { - "color": 0, - "height": 32, - "columns": 16, - "margin": 16, - "png": false, - "sprites": true - }, - "historySize": 100, - "showCodes": true, - "gridSize": 16, - "showLiga": true, - "showGrid": true, - "showGlyphs": true, - "showQuickUse": false, - "search": "", - "showQuickUse2": true, - "showSVGs": true, - "quickUsageToken": { - "UntitledProject": "NTM5OWJhMDg1M2ZlZjhjOGUxODNmOGExNDdiZDU3ZjUjMSMxNDg3NDQ2NzgyIyMj" - } - } -} \ No newline at end of file diff --git a/css/webfonts/icomoon/style.css b/css/webfonts/icomoon/style.css deleted file mode 100755 index 17d29bc56..000000000 --- a/css/webfonts/icomoon/style.css +++ /dev/null @@ -1,29 +0,0 @@ -@font-face { - font-family: 'icomoon'; - src: url('fonts/icomoon.eot?x0id2b'); - src: url('fonts/icomoon.eot?x0id2b#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?x0id2b') format('truetype'), - url('fonts/icomoon.woff?x0id2b') format('woff'), - url('fonts/icomoon.svg?x0id2b#icomoon') format('svg'); - font-weight: normal; - font-style: normal; -} - -[class^="icon-"], [class*=" icon-"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icomoon' !important; - speak: none; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; - - /* Better Font Rendering =========== */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.icon-conversejs:before { - content: "\e600"; -} diff --git a/dist/converse.js b/dist/converse.js index 8482b9336..32e781df7 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -93014,7 +93014,7 @@ return __p var _ = {escape:__webpack_require__(/*! ./node_modules/lodash/escape.js */ "./node_modules/lodash/escape.js")}; module.exports = function(o) { var __t, __p = ''; -__p += '\n\n
\n \n converse\n \n
\n\n'; +__p += '\n\n
\n \n \n converse\n \n
\n\n'; return __p }; @@ -93561,7 +93561,7 @@ return __p var _ = {escape:__webpack_require__(/*! ./node_modules/lodash/escape.js */ "./node_modules/lodash/escape.js")}; module.exports = function(o) { var __t, __p = '', __e = _.escape; -__p += '\n
\n
\n

Converse

\n

' + +__p += '\n

\n
\n

\n \n converse\n

\n

' + __e(o.version_name) + '

\n

Open Source XMPP chat client brought to you by Opkode

\n

Translate it into your own language

\n
\n
\n'; return __p diff --git a/index.html b/index.html index 1fea0a1df..aab645e5a 100644 --- a/index.html +++ b/index.html @@ -13,7 +13,6 @@ - @@ -37,7 +36,7 @@ - Converse + Converse
    diff --git a/sass/_core.scss b/sass/_core.scss index 2a86c8b27..76f5d8de6 100644 --- a/sass/_core.scss +++ b/sass/_core.scss @@ -10,16 +10,6 @@ body.reset { margin: 0; } -@font-face { - font-family: 'Converse-js'; - src: url($font-path + 'icomoon.eot?wvi0ht'); - src: url($font-path + 'icomoon.eot?wvi0ht#iefix') format('embedded-opentype'), - url($font-path + 'icomoon.ttf?wvi0ht') format('truetype'), - url($font-path + 'icomoon.woff?wvi0ht') format('woff'), - url($font-path + 'icomoon.svg?wvi0ht#icomoon') format('svg'); - font-weight: normal; - font-style: normal; -} .icon-conversejs { padding-right: 0.5em; @@ -146,7 +136,38 @@ body.reset { .brand-heading { font-size: 200%; + display: inline-flex; + align-items: flex-end; font-family: var(--heading-font); + &:hover { + .brand-name { + color: var(--link-color); + } + } + .converse-svg-logo { + height: 1.2em; + margin-right: 0.25em; + margin-bottom: -0.3em; + .cls-1 { + isolation: isolate; + } + .cls-2 { + opacity: 0.5; + mix-blend-mode: multiply; + } + .cls-3 { + fill: var(--link-color); + } + .cls-4 { + fill: var(--link-color); + } + } + } + + .brand-heading--inverse { + .converse-svg-logo { + margin-bottom: 0em; + } } .popover { @@ -299,7 +320,6 @@ body.reset { } .btn { - font-family: var(--heading-font); font-weight: normal; color: #fff; .fa, .far, .fas { diff --git a/sass/_variables.scss b/sass/_variables.scss index b8b7762b4..cf1a8c749 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -1,8 +1,6 @@ $mobile_landscape_height: 450px !default; $mobile_portrait_length: 480px !default; -$font-path: "webfonts/icomoon/fonts/" !default; - #conversejs, .converse-content { --subdued-color: #A8ABA1; --subdued-color-lighten-25-percent: #e6e7e4; // lighten(#A8ABA1, 25%) @@ -94,7 +92,7 @@ $font-path: "webfonts/icomoon/fonts/" !default; // --font-path: "webfonts/icomoon/fonts/"; --normal-font: "Helvetica", "Arial", sans-serif; - --heading-font: futura, 'Century Gothic', 'URW Gothic L', Verdana, sans-serif; + --heading-font: 'Baumans', cursive; --heading-display: block; --heading-color: white; diff --git a/sass/font-awesome.scss b/sass/font-awesome.scss index b4bb8b02b..a7a4daf7a 100644 --- a/sass/font-awesome.scss +++ b/sass/font-awesome.scss @@ -1,3 +1,10 @@ +@font-face { + font-family: 'Baumans'; + font-style: normal; + font-weight: 400; + src: local('Baumans Regular'), local('Baumans-Regular'), url(webfonts/baumans.ttf) format('truetype'); +} + @font-face { font-family: 'ConverseFontAwesomeBrands'; font-style: normal; diff --git a/sass/website.scss b/sass/website.scss index 851fcafed..cfa2d25e5 100644 --- a/sass/website.scss +++ b/sass/website.scss @@ -202,7 +202,6 @@ a { margin-top: -4em; height: calc(100vh + 4em); background: url(images/header.jpg) no-repeat bottom center scroll; - // background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #384955, #655361, #85505f); background-color: #211018; -webkit-background-size: cover; -moz-background-size: cover; diff --git a/src/templates/converse_brand_heading.html b/src/templates/converse_brand_heading.html index ba8181308..7ff49c5e1 100644 --- a/src/templates/converse_brand_heading.html +++ b/src/templates/converse_brand_heading.html @@ -1,7 +1,26 @@
    - converse + + converse
    diff --git a/src/templates/inverse_brand_heading.html b/src/templates/inverse_brand_heading.html index 0bbc4351d..8da4c4eb4 100644 --- a/src/templates/inverse_brand_heading.html +++ b/src/templates/inverse_brand_heading.html @@ -1,6 +1,27 @@
    -

    Converse

    +

    + + converse +

    {{{o.version_name}}}

    Open Source XMPP chat client brought to you by Opkode

    Translate it into your own language