Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2966 from vector-im/rav/move_bundle_again

Browse Source 
Add another layer of directory to webpack chunks
This commit is contained in:
David Baker 2017-01-17 12:04:28 +00:00 committed by GitHub
commit ebc2ad54d6
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css
View File

@ -46,7 +46,7 @@ input[type=text].mx_DirectorySearchBox_input:focus {
padding-right: 10px;
background-color: #efefef;
border-radius: 3px;
background-image: url('../img/icon-return.svg');
background-image: url('../../img/icon-return.svg');
background-position: 8px 70%;
background-repeat: no-repeat;
text-indent: 18px;
@ -63,7 +63,7 @@ input[type=text].mx_DirectorySearchBox_input:focus {
.mx_DirectorySearchBox_clear {
display: inline-block;
vertical-align: middle;
background: url('../img/icon_context_delete.svg');
background: url('../../img/icon_context_delete.svg');
background-position: 0 50%;
background-repeat: no-repeat;
width: 15px;

2
src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css
View File

@ -65,7 +65,7 @@ limitations under the License.
position: absolute;
content: "";
border-radius: 40px;
background-image: url("../img/icons_ellipsis.svg");
background-image: url("../../img/icons_ellipsis.svg");
background-size: 25px;
width: 24px;
height: 24px;

16
src/skins/vector/css/vector-web/fonts.css
View File

@ -7,42 +7,42 @@
*/
@font-face {
font-family: 'Open Sans';
src: url('../fonts/Open_Sans/OpenSans-Regular.ttf') format('truetype');
src: url('../../fonts/Open_Sans/OpenSans-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/Open_Sans/OpenSans-Italic.ttf') format('truetype');
src: url('../../fonts/Open_Sans/OpenSans-Italic.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/Open_Sans/OpenSans-Semibold.ttf') format('truetype');
src: url('../../fonts/Open_Sans/OpenSans-Semibold.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/Open_Sans/OpenSans-SemiboldItalic.ttf') format('truetype');
src: url('../../fonts/Open_Sans/OpenSans-SemiboldItalic.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/Open_Sans/OpenSans-Bold.ttf') format('truetype');
src: url('../../fonts/Open_Sans/OpenSans-Bold.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../fonts/Open_Sans/OpenSans-BoldItalic.ttf') format('truetype');
src: url('../../fonts/Open_Sans/OpenSans-BoldItalic.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}
@ -54,14 +54,14 @@
@font-face {
font-family: 'Fira Mono';
src: url('../fonts/Fira_Mono/FiraMono-Regular.ttf') format('truetype');
src: url('../../fonts/Fira_Mono/FiraMono-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}
@font-face {
font-family: 'Fira Mono';
src: url('../fonts/Fira_Mono/FiraMono-Bold.ttf') format('truetype');
src: url('../../fonts/Fira_Mono/FiraMono-Bold.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}

2
src/skins/vector/css/vector-web/views/elements/ImageView.css
View File

@ -62,7 +62,7 @@ limitations under the License.
max-height: 100%;
/* object-fit hack needed for Chrome due to Chrome not re-laying-out until you refresh */
object-fit: contain;
/* background-image: url('../img/trans.png'); */
/* background-image: url('../../img/trans.png'); */
pointer-events: all;
}

15
webpack.config.js
View File

@ -40,8 +40,17 @@ module.exports = {
},
output: {
path: path.join(__dirname, "webapp"),
filename: "[hash]/[name].js",
chunkFilename: "[hash]/[name].js",
// the generated js (and CSS, from the ExtractTextPlugin) are put in a
// unique subdirectory for the build. There will only be one such
// 'bundle' directory in the generated tarball; however, hosting
// servers can collect 'bundles' from multiple versions into one
// directory and symlink it into place - this allows users who loaded
// an older version of the application to continue to access webpack
// chunks even after the app is redeployed.
//
filename: "bundles/[hash]/[name].js",
chunkFilename: "bundles/[hash]/[name].js",
devtoolModuleFilenameTemplate: function(info) {
// Reading input source maps gives only relative paths here for
// everything. Until I figure out how to fix this, this is a
@ -80,7 +89,7 @@ module.exports = {
}),
new ExtractTextPlugin(
"[hash]/[name].css",
"bundles/[hash]/[name].css",
{
allChunks: true
}