Skip to content

C
converse.js
Commit c2a09996 authored by JC Brand's avatar JC Brand
Browse files
Options

Put CSS files also in `./dist`

parent dd20fc4b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1313 additions and 114642 deletions
.gitignore
View file @ c2a09996
# Distribution directory
dist
# Editor fluff
*~ *~
*.min.js
*.min.css
.sw? .sw?
*.mo *.mo
*.kpf *.kpf
.*.sw? .*.sw?
.*.cfg
.hg/ .hg/
.bzr/ .bzr/
.svn/ .svn/
...@@ -18,18 +20,11 @@ pip-selfcheck.json ...@@ -18,18 +20,11 @@ pip-selfcheck.json
3rdparty/libsignal-protocol-javascript/ 3rdparty/libsignal-protocol-javascript/
*.map *.map
dist/converse-headless.js
dist/converse-no-dependencies.js
dist/converse-no-dependencies-es2015.js
locale.zip
css/webfonts.zip
css/font-awesome.css
analytics.js analytics.js
inverse-analytics.js
# python/buildout # virtualenv/python/buildout
.*.cfg
eggs eggs
.Python .Python
build build
...@@ -37,10 +32,11 @@ share ...@@ -37,10 +32,11 @@ share
parts parts
*.pyc *.pyc
*.egg-info *.egg-info
lib
include
bin
develop-eggs
dev-jc.html
inverse-dev.html
inverse-dev-jc.html
converse-logs/*.html converse-logs/*.html
Backbone.Overview Backbone.Overview
...@@ -55,12 +51,6 @@ docs/doctrees ...@@ -55,12 +51,6 @@ docs/doctrees
# Node.js # Node.js
node_modules node_modules
# Virtualenv/Buildout
lib
include
bin
develop-eggs
# OSX # OSX
.DS_Store .DS_Store
......
Makefile
View file @ c2a09996
...@@ -106,9 +106,9 @@ release: ...@@ -106,9 +106,9 @@ release:
$(INSTALL) -D dist/converse-headless.js 'converse-assets-$(VERSION)/converse-headless.js' $(INSTALL) -D dist/converse-headless.js 'converse-assets-$(VERSION)/converse-headless.js'
$(INSTALL) -D src/headless/dist/converse-headless.min.js 'converse-assets-$(VERSION)/converse-headless.min.js' $(INSTALL) -D src/headless/dist/converse-headless.min.js 'converse-assets-$(VERSION)/converse-headless.min.js'
$(INSTALL) -D src/headless/dist/converse-headless.min.js.map 'converse-assets-$(VERSION)/converse-headless.min.js.map' $(INSTALL) -D src/headless/dist/converse-headless.min.js.map 'converse-assets-$(VERSION)/converse-headless.min.js.map'
$(INSTALL) -D css/converse.css 'converse-assets-$(VERSION)/css/converse.css' $(INSTALL) -D dist/converse.css 'converse-assets-$(VERSION)/dist/converse.css'
$(INSTALL) -D css/converse.min.css 'converse-assets-$(VERSION)/css/converse.min.css' $(INSTALL) -D dist/converse.min.css 'converse-assets-$(VERSION)/dist/converse.min.css'
cp -r css/webfonts 'converse-assets-$(VERSION)/css/' cp -r dist/webfonts 'converse-assets-$(VERSION)/dist/'
cp -r sounds 'converse-assets-$(VERSION)/' cp -r sounds 'converse-assets-$(VERSION)/'
find locale -type f -name '*.json' \ find locale -type f -name '*.json' \
-exec $(INSTALL) -D '{}' 'converse-assets-$(VERSION)/{}' \; -exec $(INSTALL) -D '{}' 'converse-assets-$(VERSION)/{}' \;
...@@ -130,9 +130,9 @@ stamp-npm: $(LERNA) package.json package-lock.json src/headless/package.json ...@@ -130,9 +130,9 @@ stamp-npm: $(LERNA) package.json package-lock.json src/headless/package.json
clean: clean:
rm -rf node_modules stamp-npm rm -rf node_modules stamp-npm
rm -f dist/*.min.js* rm -f dist/*.min.js*
rm -f css/*.min.css rm -f dist/*.min.css
rm -f css/*.map rm -f dist/*.map
rm -f css/*.zip rm -f dist/*.zip
rm -f *.zip rm -f *.zip
.PHONY: dev .PHONY: dev
...@@ -142,23 +142,25 @@ dev: stamp-npm ...@@ -142,23 +142,25 @@ dev: stamp-npm
## Builds ## Builds
.PHONY: css .PHONY: css
css: sass/*.scss css/converse.css css/converse.min.css css/website.css css/website.min.css css/font-awesome.css css: sass/*.scss dist/converse.css dist/converse.min.css dist/website.css dist/website.min.css dist/font-awesome.css
css/converse.css:: stamp-npm webpack.config.js sass dist/converse.css:: stamp-npm webpack.config.js sass
$(NPX) webpack --type=css --mode=development $(NPX) webpack --type=css --mode=development
css/website.css:: stamp-npm sass dist/website.css:: stamp-npm sass
$(SASS) --source-map true --include-path $(BOURBON) --include-path $(BOOTSTRAP) sass/website.scss $@ $(SASS) --source-map true --include-path $(BOURBON) --include-path $(BOOTSTRAP) sass/website.scss $@
css/font-awesome.css:: stamp-npm sass dist/font-awesome.css:: stamp-npm sass
$(SASS) --source-map true --include-path $(BOURBON) --include-path $(BOOTSTRAP) sass/font-awesome.scss $@ $(SASS) --source-map true --include-path $(BOURBON) --include-path $(BOOTSTRAP) sass/font-awesome.scss $@
css/%.min.css:: css/%.css dist/converse.min.css:: stamp-npm dist/converse.css
make stamp-npm $(CLEANCSS) $< > $@
dist/website.min.css:: stamp-npm dist/website.css
$(CLEANCSS) $< > $@ $(CLEANCSS) $< > $@
.PHONY: watchcss .PHONY: watchcss
watchcss: stamp-npm watchcss: stamp-npm
$(NPX) webpack --type=css --mode=development --watch $(NPX) webpack --type=css --mode=development --watch
.PHONY: watchjs .PHONY: watchjs
...@@ -236,7 +238,7 @@ eslint: stamp-npm ...@@ -236,7 +238,7 @@ eslint: stamp-npm
$(ESLINT) spec/ $(ESLINT) spec/
.PHONY: check .PHONY: check
check: eslint dist/converse.js check: eslint dist/converse.js
LOG_CR_VERBOSITY=INFO $(CHROMIUM) --disable-gpu --no-sandbox http://localhost:$(HTTPSERVE_PORT)/tests/index.html LOG_CR_VERBOSITY=INFO $(CHROMIUM) --disable-gpu --no-sandbox http://localhost:$(HTTPSERVE_PORT)/tests/index.html
######################################################################## ########################################################################
......
css/converse.css deleted 100644 → 0
View file @ dd20fc4b
This diff is collapsed.
css/fonts.css deleted 100644 → 0
View file @ dd20fc4b
This diff is collapsed.
css/images/bgbl.svg deleted 100644 → 0
View file @ dd20fc4b
<!--
Tessellate 1.0 by HTML5 UP
html5up.net | @n33co
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" viewBox="0 0 1000 1000" zoomAndPan="disable">
<style type="text/css"><![CDATA[
line
{
stroke: rgba(255,255,255,0.1);
stroke-width: 0.85px;
}
]]></style>
<line x1="-180" y1="0" x2="820" y2="1000" />
<line x1="-380" y1="0" x2="620" y2="1000" />
<line x1="-530" y1="0" x2="470" y2="1000" />
<line x1="-655" y1="0" x2="345" y2="1000" />
<line x1="-755" y1="0" x2="245" y2="1000" />
<line x1="-830" y1="0" x2="170" y2="1000" />
<line x1="-880" y1="0" x2="120" y2="1000" />
<line x1="-920" y1="0" x2="80" y2="1000" />
<line x1="-950" y1="0" x2="50" y2="1000" />
<line x1="-970" y1="0" x2="30" y2="1000" />
<line x1="-985" y1="0" x2="15" y2="1000" />
<line x1="-995" y1="0" x2="5" y2="1000" />
</svg>
\ No newline at end of file
css/images/bgtr.svg deleted 100644 → 0
View file @ dd20fc4b
<!--
Tessellate 1.0 by HTML5 UP
html5up.net | @n33co
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" viewBox="0 0 1000 1000" zoomAndPan="disable">
<style type="text/css"><![CDATA[
line
{
stroke: rgba(255,255,255,0.1);
stroke-width: 0.85px;
}
]]></style>
<line x1="180" y1="0" x2="1180" y2="1000" />
<line x1="380" y1="0" x2="1380" y2="1000" />
<line x1="530" y1="0" x2="1530" y2="1000" />
<line x1="655" y1="0" x2="1655" y2="1000" />
<line x1="755" y1="0" x2="1775" y2="1000" />
<line x1="830" y1="0" x2="1830" y2="1000" />
<line x1="880" y1="0" x2="1880" y2="1000" />
<line x1="920" y1="0" x2="1920" y2="1000" />
<line x1="950" y1="0" x2="1970" y2="1000" />
<line x1="970" y1="0" x2="1970" y2="1000" />
<line x1="985" y1="0" x2="1985" y2="1000" />
<line x1="995" y1="0" x2="1995" y2="1000" />
</svg>
\ No newline at end of file
css/images/dark-arrow.svg deleted 100644 → 0
View file @ dd20fc4b
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="12px" viewBox="0 0 24 12" zoomAndPan="disable">
<line x1="0" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
<line x1="24" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
</svg>
\ No newline at end of file
css/images/user.svg deleted 100644 → 0
View file @ dd20fc4b
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
<rect width="128" height="128" fill="#555"/>
<circle cx="64" cy="41" r="24" fill="#fff"/>
<path d="m28.5 112 v-12 c0-12 10-24 24-24 h23 c14 0 24 12 24 24 v12" fill="#fff"/>
</svg>
css/jasmine.css deleted 100644 → 0
View file @ dd20fc4b
body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: goldenrod; }
#HTMLReporter a { text-decoration: none; }
#HTMLReporter a:hover { text-decoration: underline; }
#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
#HTMLReporter .version { color: #aaaaaa; }
#HTMLReporter .banner { margin-top: 14px; }
#HTMLReporter .duration { color: #aaaaaa; float: right; }
#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
#HTMLReporter .symbolSummary li.passed:before { color: lightgreen; content: "\02022"; }
#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; }
#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
#HTMLReporter .runningAlert { background-color: #666666; }
#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
#HTMLReporter .passingAlert { background-color: #a6b779; }
#HTMLReporter .passingAlert:first-child { background-color: lightgreen; }
#HTMLReporter .failingAlert { background-color: #cf867e; }
#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
#HTMLReporter .results { margin-top: 14px; }
#HTMLReporter #details { display: none; }
#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: goldenrod; }
#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
#HTMLReporter.showDetails .summary { display: none; }
#HTMLReporter.showDetails #details { display: block; }
#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
#HTMLReporter .summary { margin-top: 14px; }
#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
#HTMLReporter .summary .specSummary.passed a { color: lightgreen; }
#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
#HTMLReporter .description + .suite { margin-top: 0; }
#HTMLReporter .suite { margin-top: 14px; }
#HTMLReporter .suite a { color: goldenrod; }
#HTMLReporter #details .specDetail { margin-bottom: 28px; }
#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
#HTMLReporter .resultMessage { padding-top: 14px; color: goldenrod; }
#HTMLReporter .resultMessage span.result { display: block; }
#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
#TrivialReporter .runner.running { background-color: yellow; }
#TrivialReporter .options { text-align: right; font-size: .8em; }
#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
#TrivialReporter .suite .suite { margin: 5px; }
#TrivialReporter .suite.passed { background-color: #dfd; }
#TrivialReporter .suite.failed { background-color: #fdd; }
#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
#TrivialReporter .spec.skipped { background-color: #bbb; }
#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
#TrivialReporter .passed { background-color: #cfc; display: none; }
#TrivialReporter .failed { background-color: #fbb; }
#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
#TrivialReporter .resultMessage .mismatch { color: black; }
#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }
css/website.css deleted 100644 → 0
View file @ dd20fc4b
This diff is collapsed.
dist/converse.js deleted 100644 → 0
View file @ dd20fc4b
This diff is collapsed.
fonts/fontawesome-webfont.svg deleted 100644 → 0
View file @ dd20fc4b
This diff is collapsed.
package-lock.json
View file @ c2a09996
This diff is collapsed.
package.json
View file @ c2a09996
{ {
"name": "converse.js", "name": "converse.js",
"version": "4.2.0", "version": "4.2.0",
"description": "Browser based XMPP chat client", "description": "Browser based XMPP chat client",
"main": "dist/converse.js", "main": "dist/converse.js",
"directories": { "directories": {
"doc": "docs", "doc": "docs",
"locale": "locale", "locale": "locale",
"src": "src" "src": "src"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/conversejs/converse.js.git" "url": "git://github.com/conversejs/converse.js.git"
}, },
"keywords": [ "keywords": [
"XMPP", "XMPP",
"Jabber", "Jabber",
"chat", "chat",
"messaging", "messaging",
"chatrooms", "chatrooms",
"webchat" "webchat"
], ],
"author": { "author": {
"name": "JC Brand", "name": "JC Brand",
"email": "jc@opkode.com" "email": "jc@opkode.com"
}, },
"license": "MPL-2.0", "license": "MPL-2.0",
"bugs": { "bugs": {
"url": "https://github.com/conversejs/converse.js/issues" "url": "https://github.com/conversejs/converse.js/issues"
}, },
"engines": { "engines": {
"browser": "*" "browser": "*"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.2.2", "@babel/cli": "^7.2.2",
"@babel/core": "^7.2.2", "@babel/core": "^7.2.2",
"@babel/preset-env": "^7.2.3", "@babel/preset-env": "^7.2.3",
"@converse/headless": "^4.0.2", "@converse/headless": "^4.0.2",
"@fortawesome/fontawesome-free": "5.3.1", "@fortawesome/fontawesome-free": "5.3.1",
"babel-loader": "^8.0.4", "babel-loader": "^8.0.4",
"backbone.nativeview": "conversejs/Backbone.NativeView#5997c8197ca594e6b8469447f28310c78bd1d95e", "backbone.nativeview": "conversejs/Backbone.NativeView#5997c8197ca594e6b8469447f28310c78bd1d95e",
"backbone.overview": "^1.0.2", "backbone.overview": "^1.0.2",
"backbone.vdomview": "^1.0.1", "backbone.vdomview": "^1.0.1",
"bootstrap": "^4.0.0", "bootstrap": "^4.0.0",
"bootstrap.native": "^2.0.26", "bootstrap.native": "^2.0.26",
"bootstrap.native-loader": "conversejs/bootstrap.native-loader#d8fcbc059562136ffd50b305fdc6eb2bde90f006", "bootstrap.native-loader": "conversejs/bootstrap.native-loader#d8fcbc059562136ffd50b305fdc6eb2bde90f006",
"bourbon": "^4.3.2", "bourbon": "^4.3.2",
"bytebuffer": "^3.5.5", "bytebuffer": "^3.5.5",
"clean-css-cli": "^4.0.10", "clean-css-cli": "^4.0.10",
"css-loader": "^1.0.1", "css-loader": "^1.0.1",
"dayjs": "^1.8.13", "dayjs": "^1.8.13",
"es6-promise": "^4.1.0", "es6-promise": "^4.1.0",
"eslint": "^5.10.0", "eslint": "^5.10.0",
"eslint-plugin-lodash": "^2.7.0", "eslint-plugin-lodash": "^2.7.0",
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"fast-text-encoding": "^1.0.0", "fast-text-encoding": "^1.0.0",
"file-loader": "^3.0.1", "file-loader": "^3.0.1",
"filesize": "^3.6.1", "filesize": "^3.6.1",
"formdata-polyfill": "^3.0.12", "formdata-polyfill": "^3.0.12",
"hellojs": "^1.16.1", "hellojs": "^1.16.1",
"http-server": "^0.10.0", "http-server": "^0.10.0",
"imports-loader": "^0.8.0", "imports-loader": "^0.8.0",
"install": "^0.9.5", "install": "^0.9.5",
"jasmine-core": "2.99.1", "jasmine-core": "2.99.1",
"jed": "1.1.1", "jed": "1.1.1",
"jsdoc": "^3.5.5", "jsdoc": "^3.5.5",
"lerna": "^3.13.4", "lerna": "^3.13.4",
"lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader", "lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
"long": "^3.1.0", "long": "^3.1.0",
"mini-css-extract-plugin": "^0.5.0", "mini-css-extract-plugin": "^0.5.0",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"node-sass": "^4.11.0", "node-sass": "^4.11.0",
"npm": "^6.4.1", "npm": "^6.4.1",
"pluggable.js": "2.0.0", "pluggable.js": "2.0.0",
"po2json": "^0.4.4", "po2json": "^0.4.4",
"requirejs": "2.3.5", "requirejs": "2.3.5",
"run-headless-chromium": "^0.1.1", "run-headless-chromium": "^0.1.1",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"sinon": "^2.1.0", "sinon": "^2.1.0",
"sizzle": "^2.3.3", "sizzle": "^2.3.3",
"snabbdom": "0.7.2", "snabbdom": "0.7.2",
"strophejs-plugin-register": "0.0.1", "strophejs-plugin-register": "0.0.1",
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"uglify-es": "^3.0.24", "uglify-es": "^3.0.24",
"urijs": "^1.19.1", "urijs": "^1.19.1",
"wait-until-promise": "^1.0.0", "wait-until-promise": "^1.0.0",
"webpack": "^4.28.1", "webpack": "^4.28.1",
"webpack-cli": "^3.1.2", "webpack-cli": "^3.1.2",
"xss": "^0.3.3" "xss": "^0.3.3"
}, }
"dependencies": {
"backbone": "1.4",
"backbone.browserStorage": "0.0.5",
"lodash": "^4.17.11",
"strophe.js": "1.3.2",
"strophejs-plugin-ping": "0.0.3",
"strophejs-plugin-rsm": "0.0.2",
"twemoji": "^11.0.1"
}
} }
sass/font-awesome.scss
View file @ c2a09996
...@@ -2,38 +2,38 @@ ...@@ -2,38 +2,38 @@
font-family: 'Baumans'; font-family: 'Baumans';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Baumans Regular'), local('Baumans-Regular'), url('../css/webfonts/baumans.ttf') format('truetype'); src: local('Baumans Regular'), local('Baumans-Regular'), url('../webfonts/baumans.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'Muli'; font-family: 'Muli';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: local('Muli Regular'), local('Muli-Regular'), url('../css/webfonts/muli.ttf') format('truetype'); src: local('Muli Regular'), local('Muli-Regular'), url('../webfonts/muli.ttf') format('truetype');
} }
@font-face { @font-face {
font-family: 'ConverseFontAwesomeBrands'; font-family: 'ConverseFontAwesomeBrands';
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
src: url('../css/webfonts/fa-brands-400.eot'); src: url('../webfonts/fa-brands-400.eot');
src: url('../css/webfonts/fa-brands-400.eot?#iefix') format('embedded-opentype'), src: url('../webfonts/fa-brands-400.eot?#iefix') format('embedded-opentype'),
url('../css/webfonts/fa-brands-400.woff2') format('woff2'), url('../webfonts/fa-brands-400.woff2') format('woff2'),
url('../css/webfonts/fa-brands-400.woff') format('woff'), url('../webfonts/fa-brands-400.woff') format('woff'),
url('../css/webfonts/fa-brands-400.ttf') format('truetype'), url('../webfonts/fa-brands-400.ttf') format('truetype'),
url('../css/webfonts/fa-brands-400.svg#fontawesome') format('svg'); url('../webfonts/fa-brands-400.svg#fontawesome') format('svg');
} }
@font-face { @font-face {
font-family: 'ConverseFontAwesomeRegular'; font-family: 'ConverseFontAwesomeRegular';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url('../css/webfonts/fa-regular-400.eot'); src: url('../webfonts/fa-regular-400.eot');
src: url('../css/webfonts/fa-regular-400.eot?#iefix') format('embedded-opentype'), src: url('../webfonts/fa-regular-400.eot?#iefix') format('embedded-opentype'),
url('../css/webfonts/fa-regular-400.woff2') format('woff2'), url('../webfonts/fa-regular-400.woff2') format('woff2'),
url('../css/webfonts/fa-regular-400.woff') format('woff'), url('../webfonts/fa-regular-400.woff') format('woff'),
url('../css/webfonts/fa-regular-400.ttf') format('truetype'), url('../webfonts/fa-regular-400.ttf') format('truetype'),
url('../css/webfonts/fa-regular-400.svg#fontawesome') format('svg'); url('../webfonts/fa-regular-400.svg#fontawesome') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
font-family: 'ConverseFontAwesomeSolid'; font-family: 'ConverseFontAwesomeSolid';
font-style: normal; font-style: normal;
font-weight: 900; font-weight: 900;
src: url('../css/webfonts/fa-solid-900.eot'); src: url('../webfonts/fa-solid-900.eot');
src: url('../css/webfonts/fa-solid-900.eot?#iefix') format('embedded-opentype'), src: url('../webfonts/fa-solid-900.eot?#iefix') format('embedded-opentype'),
url('../css/webfonts/fa-solid-900.svg#fontawesome') format('svg'), url('../webfonts/fa-solid-900.svg#fontawesome') format('svg'),
url('../css/webfonts/fa-solid-900.woff2') format('woff2'), url('../webfonts/fa-solid-900.woff2') format('woff2'),
url('../css/webfonts/fa-solid-900.woff') format('woff'), url('../webfonts/fa-solid-900.woff') format('woff'),
url('../css/webfonts/fa-solid-900.ttf') format('truetype'); url('../webfonts/fa-solid-900.ttf') format('truetype');
} }
@import "@fortawesome/fontawesome-free/scss/variables"; @import "@fortawesome/fontawesome-free/scss/variables";
......
tests/index.html
View file @ c2a09996
...@@ -5,15 +5,11 @@ ...@@ -5,15 +5,11 @@
<title>Converse Tests</title> <title>Converse Tests</title>
<meta name="description" content="Converse XMPP Chat" /> <meta name="description" content="Converse XMPP Chat" />
<link rel="shortcut icon" type="image/png" href="../node_modules/jasmine-core/images/jasmine_favicon.png"> <link rel="shortcut icon" type="image/png" href="../node_modules/jasmine-core/images/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" media="screen" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css"> <link rel="stylesheet" type="text/css" media="screen" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
<link rel="stylesheet" type="text/css" media="screen" href="../css/jasmine.css"> <link type="text/css" rel="stylesheet" media="screen" href="../dist/website.css" />
<link type="text/css" rel="stylesheet" media="screen" href="../css/website.css" /> <link type="text/css" rel="stylesheet" media="screen" href="../dist/converse.css" />
<link type="text/css" rel="stylesheet" media="screen" href="../css/converse.css" />
<script src="../dist/converse.js"></script> <script src="../dist/converse.js"></script>
<script data-main="runner" src="../node_modules/requirejs/require.js"></script> <script data-main="runner" src="../node_modules/requirejs/require.js"></script>
<style> <style>
.tests-brand-heading { .tests-brand-heading {
margin-top: 1em; margin-top: 1em;
......
webpack.config.js
View file @ c2a09996
...@@ -15,7 +15,7 @@ const config = { ...@@ -15,7 +15,7 @@ const config = {
filename: 'converse.js' filename: 'converse.js'
}, },
devtool: 'source-map', devtool: 'source-map',
plugins: [new MiniCssExtractPlugin({filename: '../css/converse.css'})], plugins: [new MiniCssExtractPlugin({filename: './converse.css'})],
module: { module: {
rules: [ rules: [
{ {
...@@ -60,7 +60,7 @@ const config = { ...@@ -60,7 +60,7 @@ const config = {
loader: 'file-loader', loader: 'file-loader',
options: { options: {
name: '[path][name].[ext]', name: '[path][name].[ext]',
outputPath: '../' outputPath: './'
} }
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7