You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/25 14:48:54 UTC
[incubator-dlab] 03/08: [DLAB-472]: generate key controls fixes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 54416cd7ad6f968ad88345e576f73fb16fbb29a9
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Sep 25 15:42:48 2019 +0300
[DLAB-472]: generate key controls fixes
---
.../src/app/shared/navbar/navbar.component.html | 2 +-
.../src/app/shared/navbar/navbar.component.scss | 5 +++
.../webapp/src/assets/styles/_dialogs.scss | 5 ---
.../resources/webapp/src/assets/styles/_theme.scss | 42 ++++++++++++++--------
4 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index fa054af..57e9a8a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -59,7 +59,7 @@
</p>
</div>
</bubble-up>
- <button class="btn btn-logout" (click)="logout_btnClick()">Log out <span
+ <button class="btn btn-logout ani" (click)="logout_btnClick()">Log out <span
class="user-name">{{currentUserName}}</span></button>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index 7643a26..49b8ffc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -105,6 +105,7 @@
border: 0;
border-radius: 0;
font-size: 14px;
+ cursor: pointer;
.user-name {
color: #36afd5;
@@ -113,6 +114,10 @@
&:hover .user-name {
color: #3392b0;
}
+
+ &:hover {
+ background: #323030;
+ }
}
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 19ee9e1..6943d3d 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -121,11 +121,6 @@ mat-dialog-container {
&>div>div {
margin-top: 5px;
}
-
- .butt-generate {
- color: #35afd5;
- width: 170px;
- }
}
.btn-success {
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 3d4ee1b..956f606 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -74,6 +74,15 @@
cursor: not-allowed;
opacity: 0.6;
}
+
+ &.butt-generate {
+ color: #35afd5;
+ width: 170px;
+
+ &:active {
+ box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+ }
+ }
}
}
@@ -557,25 +566,28 @@ mat-horizontal-stepper {
}
.mat-table {
- th.mat-header-cell {
- font-size: 15px;
- font-family: 'Open Sans', sans-serif;
- font-weight: 600;
- color: #607D8B;
- }
+ .header-row {
- .mat-cell {
- word-break: break-all;
- vertical-align: top;
- padding: 15px 5px 10px 5px;
+ th.mat-header-cell {
+ font-size: 15px;
+ font-family: 'Open Sans', sans-serif;
+ font-weight: 600;
+ color: #607D8B;
+ }
- td {
- vertical-align: baseline;
+ .mat-cell {
+ word-break: break-all;
+ vertical-align: top;
+ padding: 15px 5px 10px 5px;
+
+ td {
+ vertical-align: baseline;
+ }
}
- }
- tr.mat-footer-row {
- font-weight: bold;
+ tr.mat-footer-row {
+ font-weight: bold;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org