-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fix the handling of external url reference in files that go into node_modules. flow-frontend is copied directly to node_modules making css-loader try to resolve urls for files that shouldn't be resolved. Fixes #11015 Co-authored-by: caalador <mikael.grankvist@vaadin.com>
- Loading branch information
1 parent
7c47355
commit 56d4bcf
Showing
7 changed files
with
28 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
...t-application-theme/reusable-theme/src/main/java/com/vaadin/reusabletheme/Dependency.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,10 @@ | ||
package com.vaadin.reusabletheme; | ||
|
||
import com.vaadin.flow.component.dependency.CssImport; | ||
import com.vaadin.flow.component.dependency.NpmPackage; | ||
|
||
@NpmPackage(value = "@fortawesome/fontawesome-free", version = "5.15.1") | ||
@CssImport(value = "./css/styles.css") | ||
public class Dependency { | ||
|
||
} |
6 changes: 6 additions & 0 deletions
6
...cation-theme/reusable-theme/src/main/resources/META-INF/resources/frontend/css/styles.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
.css-icon { | ||
/* note that tests use path context fo which reason the image is placed in path/img */ | ||
background-image: url('img/icon.png'); | ||
background-size: 26px 26px; | ||
} | ||
|
Binary file added
BIN
+5.51 KB
...on-theme/reusable-theme/src/main/resources/META-INF/resources/path/img/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions
1
...-tests/test-application-theme/test-theme-live-reload/frontend/themes/app-theme/styles.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/* Import your application global css files here or add the styles directly to this file */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters