Skip to content

Commit 40000a6

Browse files
authored
fix: OPTIC-2016: Removing AntD reset to aid in UI consistency between page navigations (#7420)
1 parent 15d3331 commit 40000a6

File tree

17 files changed

+26535
-23
lines changed

17 files changed

+26535
-23
lines changed

web/.stylelintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libs/editor/src/assets/styles/antd-no-reset.css

web/libs/editor/project.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"webpackConfig": "webpack.config.js",
1414
"index": "libs/editor/public/index.html",
1515
"tsConfig": "libs/editor/tsconfig.lib.json",
16-
"main": "libs/editor/src/index.js",
16+
"main": "libs/editor/src/standalone.js",
1717
"outputPath": "dist/libs/editor",
1818
"isolatedConfig": true,
1919
"generatePackageJson": true,
@@ -92,6 +92,13 @@
9292
"cwd": "libs/editor",
9393
"command": "node scripts/create-docs.js ../../../docs/source/tags"
9494
}
95+
},
96+
"extract-antd-no-reset": {
97+
"executor": "nx:run-commands",
98+
"options": {
99+
"command": "node ../../tools/extract-antd-no-reset/extract-antd-no-reset.mjs",
100+
"cwd": "libs/editor"
101+
}
95102
}
96103
}
97104
}

web/libs/editor/public/index.html

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<link rel="shortcut icon" href="./public/favicon.ico" />
6-
<link rel="preconnect" href="https://fonts.gstatic.com">
7-
<link href="//fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet">
8-
<link href="//fonts.googleapis.com/css2?family=Roboto+Mono:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
96
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
10-
<meta name="theme-color" content="#000000">
117
<!--
128
Notice the use of %PUBLIC_URL% in the tags above.
139
It will be replaced with the URL of the `public` folder during the build.
@@ -42,17 +38,15 @@
4238
<ul id="nav">
4339
<li><a href="https://labelstud.io/guide">Docs</a></li>
4440
<li><a class="github-button" href="https://github.com/HumanSignal/label-studio"
45-
data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star humansignal/label-studio on GitHub"><img src="./public/images/GitHub-Mark-64px.png" height="25" /></a></li>
41+
data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star humansignal/label-studio on GitHub"><img style="width:25px;height:25px;" src="./public/images/GitHub-Mark-64px.png" height="25" /></a></li>
4642
</ul>
4743
</div>
4844

4945
<div id="ls-container">
5046
<div id="label-studio"></div>
5147
</div>
5248
<footer class="footer">
53-
<span>
54-
Made with <img src="./public/images/3nowhite.svg" height="16" /> by <a target="_blank" href="https://heartex.net">Heartex</a> in San Francisco
55-
</span>
49+
Made with <img style="height:16px; width:auto; display: inline-block;" src="./public/images/3nowhite.svg" height="16" /> by <a target="_blank" style="line-height: 24px;" href="https://heartex.net">Heartex</a> in San Francisco
5650
</footer>
5751

5852
<script>

web/libs/editor/public/styles/main.css

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@ body {
5757
display: flex;
5858
align-items: center;
5959
justify-content: center;
60+
gap: 2px;
61+
}
62+
.footer a {
63+
line-height: 24px;
64+
color: var(--color-primary-content);
65+
text-decoration: inherit;
66+
}
67+
.footer a:hover {
68+
color: var(--color-primary-content-hover);
6069
}
6170

6271
#header {

0 commit comments

Comments
 (0)