From ef07a6035ed58184f94464abcee035592e666078 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 17 Jan 2017 10:48:38 +0000
Subject: [PATCH] Fix links to fonts and images from CSS
https://github.com/vector-im/riot-web/pull/2961 put the CSS in a subdirectory,
which meant that links from CSS to images and fonts were broken. Fix them up.
---
.../views/elements/DirectorySearchBox.css | 4 ++--
.../matrix-react-sdk/views/rooms/RoomTile.css | 2 +-
src/skins/vector/css/vector-web/fonts.css | 18 ++++++++++--------
.../vector-web/views/elements/ImageView.css | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css b/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css
index 3a0922bc..5686ecd0 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/DirectorySearchBox.css
@@ -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;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css
index 2822d82e..2411d613 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css
@@ -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;
diff --git a/src/skins/vector/css/vector-web/fonts.css b/src/skins/vector/css/vector-web/fonts.css
index 719eeebc..a57d9952 100644
--- a/src/skins/vector/css/vector-web/fonts.css
+++ b/src/skins/vector/css/vector-web/fonts.css
@@ -3,44 +3,46 @@
* Includes extended Latin, Greek, Cyrillic and Vietnamese character sets
*/
+/* the 'src' links are relative to the bundle.css, which is in a subdirectory.
+ */
@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;
}
@@ -52,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;
}
diff --git a/src/skins/vector/css/vector-web/views/elements/ImageView.css b/src/skins/vector/css/vector-web/views/elements/ImageView.css
index 03223f25..0942b593 100644
--- a/src/skins/vector/css/vector-web/views/elements/ImageView.css
+++ b/src/skins/vector/css/vector-web/views/elements/ImageView.css
@@ -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;
}