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/11/28 11:30:20 UTC
[incubator-dlab] branch develop updated: [DLAB-1323] Fixed data
labels delay on modal dialogs
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 237bd26 [DLAB-1323] Fixed data labels delay on modal dialogs
new 9f55038 Merge pull request #457 from DG1202/DLAB-1323
237bd26 is described below
commit 237bd26e1dcd48357898703be27cb08a20cabd2f
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Nov 28 13:25:39 2019 +0200
[DLAB-1323] Fixed data labels delay on modal dialogs
---
.../detail-dialog/detail-dialog.component.html | 20 ++++++++++----------
.../detail-dialog/detail-dialog.component.scss | 21 +++++++++++++++++++++
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 4aee5fa..4e33a8f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -47,7 +47,7 @@
<p>Open following URL(s) in your browser to access this box:</p>
<div class="links_block">
<p *ngFor="let item of notebook.url">
- <strong class="description">{{item.description}}: </strong>
+ <span class="description">{{item.description}}: </span>
<a
class="ellipsis"
matTooltip="{{item.url}}"
@@ -60,30 +60,30 @@
</a>
</p>
</div>
- <p *ngIf="notebook.username">Node User: <strong>{{ notebook.username }}</strong></p>
- <p *ngIf="notebook.password">Password: <strong>{{ notebook.password }}</strong></p>
+ <p *ngIf="notebook.username">Node User: <span class="strong">{{ notebook.username }}</span></p>
+ <p *ngIf="notebook.password">Password: <span class="strong">{{ notebook.password }}</span></p>
<p class="m-top-30">{{ DICTIONARY.personal_storage }}: </p>
<div class="links_block">
<p *ngIf="DICTIONARY.cloud_provider === 'azure' && notebook.account_name">{{ DICTIONARY.account }}
- <strong>{{ notebook.account_name}}</strong></p>
- <p *ngIf="notebook.bucket_name">{{ DICTIONARY.container }} <strong>{{ notebook.bucket_name }}</strong></p>
+ <span class="bucket-info">{{ notebook.account_name}}</span></p>
+ <p *ngIf="notebook.bucket_name">{{ DICTIONARY.container }} <span class="bucket-info">{{ notebook.bucket_name }}</span></p>
</div>
<p>{{ DICTIONARY.collaboration_storage }}: </p>
<div class="links_block">
<p *ngIf="DICTIONARY.cloud_provider === 'azure' && notebook.shared_account_name">{{ DICTIONARY.account }}
- <strong>{{ notebook.shared_account_name}}</strong></p>
+ <span class="bucket-info">{{ notebook.shared_account_name}}</span></p>
<p *ngIf="notebook.shared_bucket_name">{{ DICTIONARY.container }}
- <strong>{{ notebook.shared_bucket_name }}</strong></p>
+ <span class="bucket-info">{{ notebook.shared_bucket_name }}</span></p>
</div>
<br />
<div *ngIf="DICTIONARY.cloud_provider === 'azure' && notebook.datalake_name">
<p>Data Lake Store: </p>
<div class="links_block">
- <p>Data Lake Store Account: <strong>{{ notebook.datalake_name }}</strong></p>
- <p>Personal folder: <strong>{{ notebook.datalake_directory }}</strong></p>
- <p>Collaboration folder: <strong>{{ notebook.datalake_shared_directory }}</strong></p>
+ <p>Data Lake Store Account: <span class="bucket-info">{{ notebook.datalake_name }}</span></p>
+ <p>Personal folder: <span class="bucket-info">{{ notebook.datalake_directory }}</span></p>
+ <p>Collaboration folder: <span class="bucket-info">{{ notebook.datalake_shared_directory }}</span></p>
</div>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index d28993f..a858e05 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -24,11 +24,14 @@
}
.links_block {
+
> p {
display: flex;
+
.description {
white-space: nowrap;
padding-right: 5px;
+ font-weight: 600;
}
}
}
@@ -36,12 +39,14 @@
.checkbox-group {
position: relative;
padding: 5px;
+
label {
input[type="checkbox"] {
margin: 10px 0;
}
}
span {
+
&.danger_color {
position: absolute;
bottom: -20px;
@@ -49,10 +54,12 @@
}
}
}
+
.config-details {
text-align: left;
position: relative;
height: 280px;
+
textarea {
height: 100%;
resize: none;
@@ -60,11 +67,25 @@
line-height: 1.5;
font-family: Consolas, monospace;
}
+
span {
+
.danger_color {
position: absolute;
bottom: -16px;
right: 0;
}
+
+ .bucket-info{
+ padding-left: 7px;
+ font-weight: 600;
+ }
+
+ .strong{
+ font-weight: 600;
+ }
}
}
+
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org