Merge pull request #41 from TeskaLabs/revert-29-refactor/update-icons

Revert 29 refactor/update icons
TeskaLabs · Aug 16, 2023 · 6fb44da · 6fb44da
2 parents 436ee3c + 7df49ad
commit 6fb44da
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,10 @@
 
 ### Features
 
-- ASAB WebUI submodule version bump [[9fc06df](https://github.com/TeskaLabs/asab-webui/commit/9fc06df046dcb114262cfd04506fb0dcef22325b)] commit (INDIGO Sprint 230804, [!29](https://github.com/TeskaLabs/seacat-auth-webui/pull/29))
+- ASAB WebUI submodule version bump [[fdc969f](https://github.com/TeskaLabs/asab-webui/commit/fdc969f8c6eb41a9c96abfa887d9ed54e9a4456f)] commit (INDIGO Sprint 230804, [!41](https://github.com/TeskaLabs/seacat-auth-webui/pull/41))
 
 ### Refactoring
 
-- Changed icons from Coreui.io icons to Atlas icons. (INDIGO Sprint 230804, [!29](https://github.com/TeskaLabs/seacat-auth-webui/pull/29))
-
 - Change visibility of username to readonly and focus on password input field after wrong password. (INDIGO Sprint 230623, [!35](https://github.com/TeskaLabs/seacat-auth-webui/pull/35))
 
 ## v23.29-alpha

diff --git a/asab-webui b/asab-webui
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
 		"window": "^4.2.7"
 	},
 	"dependencies": {
-		"@vectopus/atlas-icons": "^0.0.7",
+		"@coreui/icons": "^1.0.1",
 		"axios": "^0.21.1",
 		"bootstrap": "4.6.0",
 		"core-js": "3",

diff --git a/public/media/flags/cz.svg b/public/media/flags/cz.svg
diff --git a/public/media/flags/gb.svg b/public/media/flags/gb.svg
diff --git a/public/media/flags/placeholder.svg b/public/media/flags/placeholder.svg
diff --git a/src/modules/auth/containers/LoginCard.js b/src/modules/auth/containers/LoginCard.js
@@ -799,7 +799,7 @@ function WebAuthnField(props) {
 		<div className="text-center">
 			<h6>
 				<Label for={props.factor.type} style={{display: "block"}}>
-					<span className="at-shield-star-win pr-1" />{t('LoginCard|You will be prompted to login with FIDO2/WebAuthn')}
+					<span className="cil-shield-alt pr-1" />{t('LoginCard|You will be prompted to login with FIDO2/WebAuthn')}
 				</Label>
 			</h6>
 

diff --git a/src/modules/auth/webauthn/WebAuthnScreen.js b/src/modules/auth/webauthn/WebAuthnScreen.js
@@ -371,7 +371,7 @@ function TableRow (props) {
 					</>
 				:
 					<div className="div-key-wordwrap" title={obj?.name}>
-						<span className="at-shield-star-win pr-1" />{obj?.name}
+						<span className="cil-shield-alt pr-1" />{obj?.name}
 					</div>
 				}
 			</td>
@@ -416,7 +416,7 @@ function TableRow (props) {
 								onClick={(e) => editAuthenticatorName(e, obj?.id)}
 								disabled={props.isSubmitting || (props.globalEditMode == true)}
 							>
-								<span className="at-pencil-box"></span>
+								<span className="cil-color-border"></span>
 							</Button>
 							<Button
 								outline
+0 −2		CHANGELOG.md
+1 −1		README.md
+1 −1		demo/package.json
+0 −1		demo/public/media/flags/cz.svg
+0 −1		demo/public/media/flags/gb.svg
+0 −1		demo/public/media/flags/placeholder.svg
+1 −1		demo/src/modules/home/containers/ErrorHandlerExample.js
+1 −1		demo/src/modules/home/containers/TableCategoriesContainer.js
+8 −8		demo/src/modules/home/containers/TableContainer.js
+4 −4		demo/src/modules/home/index.js
+2 −2		doc/authorization.md
+8 −8		doc/datatable/datatable.md
+8 −8		doc/sidebar.md
+2 −2		doc/styling/buttons-rules.md
+3 −3		doc/styling/card.md
+1 −1		doc/unauthorized-access.md
+2 −2		src/components/Credentials.js
+1 −1		src/components/DataTable/ActionButton.js
+2 −2		src/components/DataTable/Buttons.js
+2 −2		src/components/DataTable/Table.js
+1 −1		src/components/DataTable/table.scss
+2 −2		src/components/DateTime/index.js
+2 −2		src/components/Pagination.js
+1 −1		src/components/TreeMenu/TreeMenuItem.js
+1 −1		src/containers/ErrorHandler/ErrorContainer.js
+2 −2		src/containers/Header/HelpButton.js
+1 −1		src/containers/Header/index.js
+1 −1		src/containers/Sidebar/SidebarBottomItem.js
+1 −1		src/containers/Sidebar/SidebarItem.js
+1 −1		src/containers/Sidebar/index.js
+1 −1		src/modules/about/index.js
+1 −1		src/modules/auth/AccessControlScreen.js
+1 −1		src/modules/auth/components/ButtonWithAuthz.js
+1 −1		src/modules/auth/components/UnauthorizedAccessScreen.js
+1 −1		src/modules/auth/header.js
+6 −6		src/modules/i18n/dropdown.js
+1 −1		src/modules/knowledge/index.js
+2 −2		src/modules/maintenance/ConfigModule/ConfigContainers/ConfigEditor.js
+1 −1		src/modules/maintenance/ConfigModule/ConfigContainers/ConfigImport.js
+3 −3		src/modules/maintenance/ConfigModule/ConfigContainers/ConfigList.js
+4 −4		src/modules/maintenance/ConfigModule/ConfigContainers/TreeViewComponent.js
+3 −3		src/modules/maintenance/ConfigModule/index.js
+7 −8		src/modules/maintenance/ServicesModule/ServicesContainers/ServicesContainer.js
+3 −3		src/modules/maintenance/ServicesModule/index.js
+1 −1		src/modules/tenant/TenantDropdown.js
+1 −1		src/modules/tools/index.js
+18 −18		src/styles/components/button.scss
+1 −1		src/styles/components/card.scss
+13 −13		src/styles/components/dropdown.scss
+2 −2		src/styles/components/header.scss
+1 −1		src/styles/components/sidebar.scss
+3 −3		src/styles/index.scss
+1 −1		src/theme/ThemeButton.js