...
 
Commits (3)
m-date__dropdowns {
display: flex;
justify-content: space-between;
select {
display: inline-block;
......@@ -23,5 +24,20 @@ m-date__dropdowns {
background-color: themed($m-white);
border: 1px solid #e2e2e2;
}
// month
&:nth-child(1) {
min-width: 120px;
}
// day
&:nth-child(2) {
min-width: 59px;
}
// year
&:nth-child(3) {
min-width: 77px;
}
}
}
......@@ -132,14 +132,16 @@ m-register {
&:active,
&:focus {
outline: none;
@include m-theme() {
outline: 1px solid themed($m-blue);
border: 1px solid themed($m-blue);
}
}
&.ng-invalid.ng-touched:not(.ng-pristine) {
outline: none;
@include m-theme() {
outline: 1px solid themed($m-red);
border: 1px solid themed($m-red);
}
}
}
......
......@@ -245,14 +245,16 @@ m-homepage__v2 {
&:active,
&:focus {
outline: none;
@include m-theme() {
outline: 1px solid themed($m-blue);
border: 1px solid themed($m-blue);
}
}
&.ng-invalid.ng-touched:not(.ng-pristine) {
outline: none;
@include m-theme() {
outline: 1px solid themed($m-red);
border: 1px solid themed($m-red);
}
}
}
......
......@@ -65,6 +65,7 @@ m-onboarding {
.m-onboarding__description {
margin: 35px 0;
font-size: 16px;
font-weight: 500;
line-height: 25px;
color: #9b9b9b;
......@@ -78,6 +79,7 @@ m-onboarding {
h1.m-onboarding__noticeTitle {
font-size: 20px;
line-height: 35px;
font-weight: 500;
margin-bottom: 0;
}
......@@ -270,7 +272,8 @@ m-onboarding {
width: 100%;
height: 36px;
border: 1px solid #e8e8e8;
font-size: 14px;
font-size: 16px;
line-height: 21px;
padding-left: 8px;
margin-bottom: 8px;
......@@ -292,6 +295,7 @@ m-onboarding {
position: relative;
m-phone-input {
flex-grow: 1;
display: flex;
margin-bottom: 8px;
......@@ -306,7 +310,8 @@ m-onboarding {
width: 100%;
padding-left: 8px;
font-size: 14px;
font-size: 16px;
line-height: 21px;
@include m-theme() {
color: themed($m-grey-800);
......@@ -314,27 +319,46 @@ m-onboarding {
&:active,
&:focus {
outline: 1px solid #4a90e2;
outline: none;
@include m-theme() {
border: 1px solid themed($m-blue);
}
}
&.m-onboardingInput__error {
outline: 1px solid #d0021b;
outline: none;
@include m-theme() {
border: 1px solid themed($m-red);
}
}
}
}
}
}
.mdl-spinner {
position: absolute;
top: 5px;
right: 5px;
m-date__dropdowns {
max-width: 294px;
}
.m-onboarding__spinnerWrapper {
display: flex;
align-items: center;
justify-content: center;
width: 40px;
height: 36px;
margin-left: 8px;
}
.m-onboarding__input {
display: flex;
}
.m-onboardingInput__saveButton {
position: absolute;
right: 5px;
top: 6px;
height: 36px !important;
font-size: 16px !important;
padding: 4px 20px;
margin-left: 8px;
cursor: pointer;
@include m-theme() {
......
m-onboarding__hashtagsStep {
.m-onboarding__description {
margin: 0 0 35px !important;
font-weight: normal !important;
line-height: 21px !important;
color: #4a4a4a !important;
}
......
......@@ -16,25 +16,23 @@
<div class="m-onboarding__phoneInput">
<div class="m-onboarding__input">
<m-phone-input [(ngModel)]="number" ngDefaultControl></m-phone-input>
<div class="m-onboarding__error" *ngIf="numberError">
{{ numberError }}
</div>
</div>
<div
*ngIf="inProgress"
class="mdl-spinner mdl-js-spinner is-active"
[mdl]
></div>
<div class="m-onboarding__spinnerWrapper" *ngIf="inProgress">
<div class="mdl-spinner mdl-js-spinner is-active" [mdl]></div>
</div>
<div
class="m-onboardingInput__saveButton"
[class.disabled]="!number || number.length < 13"
(click)="savePhoneNumber()"
*ngIf="!inProgress"
i18n
>
<i class="material-icons">check</i>
<button
class="mf-button mf-button--alt m-onboardingInput__saveButton"
[class.disabled]="!number || number.length < 13"
(click)="savePhoneNumber()"
*ngIf="!inProgress"
i18n
>
Verify
</button>
</div>
<div class="m-onboarding__error" *ngIf="numberError">
{{ numberError }}
</div>
</div>
</ng-container>
......