forked from matrix/element-web
Define SCSS variable for resource dir
Adds a `$res` SCSS variable set to the path from the root SCSS file to the `res` directory. This is a different base path than previously used in CSS URLs (it goes up 3 directories instead of 2), because Webpack will now be resolving images relative to the root SCSS file, so the path corresponds to a source tree location, instead of a path in the build output tree. Defining this variable has two main goals: * URLs are a bit easier to read * The path can be overridden, which is needed for riot-web themes like Status
This commit is contained in:
parent
a127077bde
commit
59bedae15e
res/themes/status/css
|
@ -100,7 +100,7 @@ limitations under the License.
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 25px;
|
line-height: 25px;
|
||||||
background-color: $form-bg-color;
|
background-color: $form-bg-color;
|
||||||
background-image: url(../../themes/status/img/dot.svg);
|
background-image: url("$(status)/img/dot.svg");
|
||||||
box-shadow: 0px 5px 16px 0px rgba(25,12,46,0.16);
|
box-shadow: 0px 5px 16px 0px rgba(25,12,46,0.16);
|
||||||
position: relative;
|
position: relative;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
// Path from root SCSS file (such as `status.scss`) to `res` dir in `matrix-react-sdk`
|
||||||
|
$res: ../../../../node_modules/matrix-react-sdk/res;
|
||||||
|
|
||||||
|
// Path from root SCSS file (such as `status.scss`) to `status` dir in `riot-web`
|
||||||
|
$status: ..;
|
|
@ -187,8 +187,8 @@ $event-redacted-border-color: #cccccc;
|
||||||
// event timestamp
|
// event timestamp
|
||||||
$event-timestamp-color: #acacac;
|
$event-timestamp-color: #acacac;
|
||||||
|
|
||||||
$edit-button-url: "../../img/icon_context_message.svg";
|
$edit-button-url: "$(res)/img/icon_context_message.svg";
|
||||||
$copy-button-url: "../../img/icon_copy_message.svg";
|
$copy-button-url: "$(res)/img/icon_copy_message.svg";
|
||||||
|
|
||||||
// e2e
|
// e2e
|
||||||
$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
|
$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
@import "_paths.scss";
|
||||||
@import "_fonts.scss";
|
@import "_fonts.scss";
|
||||||
@import "../../../../node_modules/matrix-react-sdk/res/themes/light/css/_base.scss";
|
@import "../../../../node_modules/matrix-react-sdk/res/themes/light/css/_base.scss";
|
||||||
@import "_status.scss";
|
@import "_status.scss";
|
||||||
|
|
Loading…
Reference in New Issue