Skip to content

Commit

Permalink
Merge pull request #87 from InkApplications/local-files
Browse files Browse the repository at this point in the history 
Add namespacing to CSS resources and import local font files.
  • Loading branch information
@ReneeVandervelde
ReneeVandervelde authored Nov 2, 2024
2 parents 27270d4 + 699e5a4 commit 6c3c308
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 3 deletions.
2 changes: 1 addition & 1 deletion render-static-html/src/jvmMain/kotlin/ink/ui/render/statichtml/InkUiScript.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ abstract class InkUiScript(

private fun getStyles(): List<String> {
return listOf(
resource("css/main-2.0.css"),
resource("css/inkui-1.0.css"),
) + styles
}

Expand Down
4 changes: 2 additions & 2 deletions ...monMain/composeResources/css/main-2.0.css → ...onMain/composeResources/css/inkui-1.0.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import url("reset.css");
@import url("https://fonts.googleapis.com/css?family=Roboto+Mono:300,300i,500,500i");
@import url("meyerweb-reset-2.0.css");
@import url("roboto-mono-v23.css");
@import url("atom-one-light.css") (prefers-color-scheme:light);
@import url("atom-one-dark.css") (prefers-color-scheme:dark);

Expand Down
0 ...commonMain/composeResources/css/reset.css → ...mposeResources/css/meyerweb-reset-2.0.css
View file
File renamed without changes.
58 changes: 58 additions & 0 deletions render-web-common/src/commonMain/composeResources/css/roboto-mono-v23.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/* latin-ext */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 300;
src: url(../font/roboto-mono-normal-latin-ext.woff2) format('woff2');
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
@font-face {
font-family: 'Roboto Mono';
font-style: italic;
font-weight: 300;
src: url(../font/roboto-mono-italic-latin-ext.woff2) format('woff2');
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 500;
src: url(../font/roboto-mono-normal-latin-ext.woff2) format('woff2');
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
@font-face {
font-family: 'Roboto Mono';
font-style: italic;
font-weight: 500;
src: url(../font/roboto-mono-italic-latin-ext.woff2) format('woff2');
unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
/* latin */
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 300;
src: url(../font/roboto-mono-normal-latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Roboto Mono';
font-style: italic;
font-weight: 300;
src: url(../font/roboto-mono-italic-latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 500;
src: url(../font/roboto-mono-normal-latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@font-face {
font-family: 'Roboto Mono';
font-style: italic;
font-weight: 500;
src: url(../font/roboto-mono-italic-latin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
Binary file added render-web-common/src/commonMain/composeResources/font/roboto-mono-italic-latin-ext.woff2
View file
Binary file not shown.
Binary file added render-web-common/src/commonMain/composeResources/font/roboto-mono-italic-latin.woff2
View file
Binary file not shown.
Binary file added render-web-common/src/commonMain/composeResources/font/roboto-mono-normal-latin-ext.woff2
View file
Binary file not shown.
Binary file added render-web-common/src/commonMain/composeResources/font/roboto-mono-normal-latin.woff2
View file
Binary file not shown.

0 comments on commit 6c3c308

Please sign in to comment.