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/08/09 13:14:54 UTC
[incubator-dlab] branch DLAB-847 created (now a08dffa)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-847
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at a08dffa [DLAB-847]: Removed extra scrollbar from time scheduler; controls style fixes
This branch includes the following new commits:
new a08dffa [DLAB-847]: Removed extra scrollbar from time scheduler; controls style fixes
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-847]: Removed extra scrollbar from
time scheduler; controls style fixes
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-847
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a08dffa6ccfb90df11e91af069332eb919328097
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Aug 9 15:14:39 2019 +0200
[DLAB-847]: Removed extra scrollbar from time scheduler; controls style fixes
---
.../shared/time-picker/time-picker.component.scss | 50 +++++++++++++++++-----
.../webapp/src/assets/styles/_dialogs.scss | 1 +
2 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss
index 91ea5e3..f5e7b58 100755
--- a/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/time-picker/time-picker.component.scss
@@ -17,6 +17,8 @@
* under the License.
*/
+@import '_variables.scss';
+
@-webkit-keyframes bounce {
from {
opacity: 0;
@@ -56,16 +58,18 @@
}
.time-picker {
- .time-select{
+ .time-select {
.not-allowed {
pointer-events: none;
}
}
+
.button {
padding: 0;
margin: 0;
min-width: 44px;
}
+
mat-icon {
cursor: pointer;
color: #757575;
@@ -78,53 +82,72 @@
margin: -24px;
padding: 0;
}
+
.timepicker-dialog .mat-button-ripple.mat-button-ripple-round.mat-ripple {
border-radius: 50%;
}
.time-cover {
max-height: 100%;
- min-height: 350px;
+ width: 300px;
+ display: flex;
+ flex-direction: column;
+
.container {
padding: 15px;
min-width: 160px;
width: 160px;
+
&.mat-toolbar-single-row {
+ background: $modal-header-color;
width: 100%;
}
}
+
.selected-time {
font-size: 3.5rem;
font-weight: 400;
display: flex;
+
+ .active {
+ color: #36afd5;
+ }
}
+
.selected-meridiem {
font-size: 1rem;
line-height: 1.3rem;
padding-top: 2rem;
+
+ .active {
+ color: #36afd5;
+ }
}
+
.cover-block {
width: 100%;
padding: 6px;
+
.actions {
- padding: 40px 40px 0;
+ padding: 10px 10px 30px;
+ text-align: center;
}
}
}
-.selected-time > span,
-.selected-meridiem > span {
+.selected-time>span,
+.selected-meridiem>span {
outline: 0;
opacity: 0.5;
}
-.selected-time > span:not(.active),
-.selected-meridiem > span:not(.active) {
+.selected-time>span:not(.active),
+.selected-meridiem>span:not(.active) {
cursor: pointer;
}
-.selected-time > span.active,
-.selected-meridiem > span.active {
+.selected-time>span.active,
+.selected-meridiem>span.active {
opacity: 1;
}
@@ -139,7 +162,7 @@
.ticker-wrap {
height: 100%;
- padding: 0 24px;
+
.ticker {
width: 200px;
height: 200px;
@@ -147,12 +170,15 @@
cursor: pointer;
padding: 24px;
background: #ededed;
+ margin: 30px auto;
+
.ticker-container {
width: 100%;
height: 100%;
position: relative;
display: block;
}
+
.ticker-center {
height: 6px;
width: 6px;
@@ -164,6 +190,7 @@
margin: auto;
border-radius: 50%;
}
+
.pointer {
box-shadow: none;
width: 1px;
@@ -179,16 +206,19 @@
z-index: 0;
pointer-events: none;
}
+
.ticker-step {
display: block;
position: absolute;
transform: translate(-50%, -50%);
transition: transform 200ms;
+
.mat-mini-fab {
box-shadow: none;
background-color: transparent;
}
}
+
.ticker-selected {
position: absolute;
bottom: -19px;
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 46aef3b..19ee9e1 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
@@ -58,6 +58,7 @@ mat-dialog-container {
&.mat-dialog-container {
padding: 0;
border-radius: 0;
+ overflow-x: hidden;
#dialog-box {
color: $modal-text-color;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org