From 10d74eabd74316d9ab5e0474052b96c7671171c0 Mon Sep 17 00:00:00 2001 From: Yogi_Wang Date: Sat, 29 Dec 2018 17:01:43 +0800 Subject: [PATCH] upgrade clarity components to 1.0 and fix issue Signed-off-by: Yogi_Wang --- .../create-edit-endpoint.component.html | 9 ++-- .../create-edit-rule.component.html | 4 +- .../create-edit-rule.component.scss | 2 +- .../replication/replication.component.scss | 2 +- .../lib/src/tag/tag-detail.component.html | 52 +++++++++++-------- src/portal/lib/src/tag/tag.component.html | 2 +- src/portal/lib/src/tag/tag.component.scss | 15 +++--- .../src/app/log/audit-log.component.html | 2 +- .../src/app/log/audit-log.component.scss | 4 ++ .../statictics/statistics.component.scss | 2 + src/portal/src/styles.css | 4 ++ .../Harbor-Pages/Replication_Elements.robot | 4 +- 12 files changed, 59 insertions(+), 43 deletions(-) diff --git a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html index 35bcba3d8..36a44b982 100644 --- a/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html +++ b/src/portal/lib/src/create-edit-endpoint/create-edit-endpoint.component.html @@ -48,11 +48,10 @@ [(ngModel)]="target.password" size="20" name="password" #password="ngModel">
- - - - + + diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html index c8ba35892..565de259c 100644 --- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html +++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.html @@ -140,13 +140,13 @@
- +
- diff --git a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss index b6e4eaebc..c1163e44f 100644 --- a/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss +++ b/src/portal/lib/src/create-edit-rule/create-edit-rule.component.scss @@ -155,7 +155,7 @@ h4 { } .form-select { - margin-right: 30px; + margin-right: 120px; } .goLink { diff --git a/src/portal/lib/src/replication/replication.component.scss b/src/portal/lib/src/replication/replication.component.scss index 4ff9a81c9..c7664c936 100644 --- a/src/portal/lib/src/replication/replication.component.scss +++ b/src/portal/lib/src/replication/replication.component.scss @@ -39,9 +39,9 @@ padding-left: 0; .jobsRow { height: 60px; + display: flex; .option-left-down { margin-top: 36px; - margin-left: 14px; } .option-right-down { padding-right: 16px; diff --git a/src/portal/lib/src/tag/tag-detail.component.html b/src/portal/lib/src/tag/tag-detail.component.html index c94920705..70929ddd8 100644 --- a/src/portal/lib/src/tag/tag-detail.component.html +++ b/src/portal/lib/src/tag/tag-detail.component.html @@ -49,25 +49,33 @@
- {{highCount}} {{packageText(highCount) | translate}} {{haveText(highCount) | translate}} {{'VULNERABILITY.SEVERITY.HIGH' | translate }} {{suffixForHigh | translate }} + {{highCount}} {{packageText(highCount) | translate}} + {{haveText(highCount) | translate}} {{'VULNERABILITY.SEVERITY.HIGH' | translate }} + {{suffixForHigh | translate }}
- {{mediumCount}} {{packageText(mediumCount) | translate}} {{haveText(mediumCount) | translate}} {{'VULNERABILITY.SEVERITY.MEDIUM' | translate }} {{suffixForMedium | translate }} + {{mediumCount}} {{packageText(mediumCount) | translate}} + {{haveText(mediumCount) | translate}} {{'VULNERABILITY.SEVERITY.MEDIUM' | translate }} + {{suffixForMedium | translate }}
- {{lowCount}} {{packageText(lowCount) | translate}} {{haveText(lowCount) | translate}} {{'VULNERABILITY.SEVERITY.LOW' | translate }} {{suffixForLow | translate }} + {{lowCount}} {{packageText(lowCount) | translate}} + {{haveText(lowCount) | translate}} {{'VULNERABILITY.SEVERITY.LOW' | translate }} + {{suffixForLow | translate }}
- {{unknownCount}} {{packageText(unknownCount) | translate}} {{haveText(unknownCount) | translate}} {{'VULNERABILITY.SEVERITY.UNKNOWN' | translate }} {{suffixForUnknown | translate }} + {{unknownCount}} {{packageText(unknownCount) | + translate}} {{haveText(unknownCount) | translate}} {{'VULNERABILITY.SEVERITY.UNKNOWN' | + translate }} {{suffixForUnknown | translate }}
@@ -82,23 +90,21 @@ - -
-
- -
-
- -
-
-
- -
+ + + + + + + + + + + {{ 'REPOSITORY.BUILD_HISTORY' | + translate }} + + + \ No newline at end of file diff --git a/src/portal/lib/src/tag/tag.component.html b/src/portal/lib/src/tag/tag.component.html index 1c35152a0..95ea0cd94 100644 --- a/src/portal/lib/src/tag/tag.component.html +++ b/src/portal/lib/src/tag/tag.component.html @@ -55,7 +55,7 @@
- + diff --git a/src/portal/lib/src/tag/tag.component.scss b/src/portal/lib/src/tag/tag.component.scss index 19839ab07..31b0a7394 100644 --- a/src/portal/lib/src/tag/tag.component.scss +++ b/src/portal/lib/src/tag/tag.component.scss @@ -239,13 +239,14 @@ hbr-image-name-input { width: 160px; } -.flex-width { - min-width: 100px; - max-width: 220px; -} - -.flex-min-width { - min-width: 130px; +.datagrid-top { + .flex-width { + min-width: 100px; + max-width: 220px; + } + .flex-min-width { + min-width: 130px; + } } .color-green { diff --git a/src/portal/src/app/log/audit-log.component.html b/src/portal/src/app/log/audit-log.component.html index b1499bb27..b8cee16bc 100644 --- a/src/portal/src/app/log/audit-log.component.html +++ b/src/portal/src/app/log/audit-log.component.html @@ -1,6 +1,6 @@
-
+
diff --git a/src/portal/src/app/log/audit-log.component.scss b/src/portal/src/app/log/audit-log.component.scss index 64856dd3c..77c6801bf 100644 --- a/src/portal/src/app/log/audit-log.component.scss +++ b/src/portal/src/app/log/audit-log.component.scss @@ -21,4 +21,8 @@ .check-span { display: inline-block; width: 16px; +} + +.display-f{ + display: flex; } \ No newline at end of file diff --git a/src/portal/src/app/shared/statictics/statistics.component.scss b/src/portal/src/app/shared/statictics/statistics.component.scss index b6406f413..b11060943 100644 --- a/src/portal/src/app/shared/statictics/statistics.component.scss +++ b/src/portal/src/app/shared/statictics/statistics.component.scss @@ -60,6 +60,8 @@ #right_statistic_panel { margin-right: 18px; margin-top: 8px; + display: flex; + justify-content: flex-end; div:nth-of-type(2) { margin-left: 16px; } diff --git a/src/portal/src/styles.css b/src/portal/src/styles.css index 5878a035e..431c0710b 100644 --- a/src/portal/src/styles.css +++ b/src/portal/src/styles.css @@ -74,4 +74,8 @@ body { .custom-h2 { margin-top: 0 !important; line-height: 24px; +} + +.datagrid-header{ + z-index: 1 !important; } \ No newline at end of file diff --git a/tests/resources/Harbor-Pages/Replication_Elements.robot b/tests/resources/Harbor-Pages/Replication_Elements.robot index d726c4e58..44fbb79b9 100644 --- a/tests/resources/Harbor-Pages/Replication_Elements.robot +++ b/tests/resources/Harbor-Pages/Replication_Elements.robot @@ -27,7 +27,7 @@ ${destination_username_xpath} //*[@id='destination_username'] ${destination_password_xpath} //*[@id='destination_password'] ${replication_save_xpath} //button[contains(.,'OK')] ${replication_xpath} //clr-vertical-nav-group-children/a[contains(.,'Replication')] -${destination_insecure_xpath} //clr-checkbox-wrapper[@id="destination_insecure_checkbox"]//label +${destination_insecure_xpath} //label[@id="destination_insecure_checkbox"] ${new_replication-rule_button} //button[contains(.,'New Replication Rule')] ${link_to_registries} //clr-modal//span[contains(.,'Endpoint')] @@ -42,7 +42,7 @@ ${rule_trigger_select} //select[@id="ruleTrigger"] ${schedule_type_select} //select[@name="scheduleType"] ${schedule_day_select} //select[@name="scheduleDay"] ${shcedule_time} //input[@type="time"] -${destination_insecure_checkbox} //hbr-create-edit-endpoint/clr-modal//clr-checkbox-wrapper/input[@id="clr-checkbox-destination_insecure"] +${destination_insecure_checkbox} //hbr-create-edit-endpoint/clr-modal//input[@id="clr-checkbox-destination_insecure"] ${ping_test_button} //button[contains(.,'Test')] ${nav_to_registries} //clr-vertical-nav//span[contains(.,'Registries')] ${nav_to_replications} //clr-vertical-nav//span[contains(.,'Replications')]