Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fixed pr comments

Browse source
This commit is contained in:
Sergey Filinsky 2020-10-08 19:24:22 +03:00
parent b72fb30dd1
commit 86357d558f
7 changed files with 56 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/app/shared/components/download-admin/download-admin.component.scss
View file

@ -9,7 +9,6 @@
@include nb-install-component() { @include nb-install-component() {
.btn { .btn {
display: block;
font-family: nb-theme(font-main), sans-serif; font-family: nb-theme(font-main), sans-serif;
border-radius: 3px; border-radius: 3px;
border: none; border: none;

5
docs/app/shared/components/download-form/download-form.component.html
View file

@ -1,12 +1,11 @@
<nb-card> <nb-card>
<nb-card-header> <nb-card-header>
<span>Download</span> <span>Download</span>
<div class="close-icon" (click)="closeDialog()"> <button nbButton status="basic" appearance="ghost" class="close-icon" (click)="closeDialog()">
<i [innerHTML]="'close' | eva: { width: 26, height: 26, fill: '#222b45' }"></i> <i [innerHTML]="'close' | eva: { width: 26, height: 26, fill: '#222b45' }"></i>
</div> </button>
</nb-card-header> </nb-card-header>
<nb-card-body> <nb-card-body>
<div id="hubspotForm"></div> <div id="hubspotForm"></div>
</nb-card-body> </nb-card-body>
</nb-card> </nb-card>

37
docs/app/shared/components/download-form/download-form.component.scss
View file

@ -17,14 +17,12 @@
nb-card-header { nb-card-header {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end;
} }
.close-icon { .close-icon {
cursor: pointer;
margin-left: auto; margin-left: auto;
right: 0.1rem; padding: 0;
top: 0.1rem;
width: fit-content;
} }
::ng-deep .custom-form { ::ng-deep .custom-form {
@ -43,23 +41,35 @@
input.hs-input { input.hs-input {
width: 100%; width: 100%;
font-size: nb-theme(font-size-sm); color: nb-theme(input-basic-text-color);
padding: 0.75rem 1rem !important; font-size: nb-theme(input-medium-text-font-size);
border: 1px solid #e4e9f2; font-weight: nb-theme(input-medium-text-font-weight);
box-shadow: nb-theme(shadow-default); line-height: nb-theme(input-medium-text-line-height);
border-radius: 0.25rem; padding: nb-theme(input-medium-padding) !important;
border: nb-theme(input-border-width) nb-theme(input-border-style) nb-theme(input-basic-border-color);
border-radius: nb-theme(input-rectangle-border-radius);
background-color: nb-theme(input-basic-background-color);
&.hover {
background-color: nb-theme(input-basic-hover-background-color);
border-color: nb-theme(input-basic-hover-border-color);
}
&.invalid { &.invalid {
box-shadow: 0 0 1.25rem 0 rgba(210, 45, 45, 0.6); box-shadow: 0 0 1.25rem 0 rgba(210, 45, 45, 0.6);
} }
&::placeholder { &::placeholder {
color: #434a59; color: nb-theme(input-basic-placeholder-text-color);
opacity: 0.24; font-size: nb-theme(input-medium-placeholder-text-font-size);
font-weight: nb-theme(input-medium-placeholder-text-font-weight);
line-height: nb-theme(input-medium-placeholder-text-line-height);
} }
&:focus { &:focus {
outline: none; outline: none;
background-color: nb-theme(input-basic-focus-background-color);
border-color: nb-theme(input-basic-focus-border-color);
} }
} }
@ -68,7 +78,7 @@
margin-bottom: 1rem; margin-bottom: 1rem;
p { p {
margin-bottom: 0; margin-bottom: 0;
text-align: left ! important; text-align: left !important;
height: auto; height: auto;
} }
} }
@ -83,7 +93,8 @@
} }
.hs-form-required, .hs-error-msg { .hs-form-required, .hs-error-msg {
color: #f2545b; margin-top: 0.5rem;
color: nb-theme(text-danger-color);
} }
.hs_error_rollup { .hs_error_rollup {

6
docs/app/shared/components/premium-form/premium-form.component.html
View file

@ -1,9 +1,9 @@
<nb-card> <nb-card>
<nb-card-header> <nb-card-header>
<span>Download</span> <span>Premium</span>
<div class="close-icon" (click)="closeDialog()"> <button nbButton status="basic" appearance="ghost" class="close-icon" (click)="closeDialog()">
<i [innerHTML]="'close' | eva: { width: 26, height: 26, fill: '#222b45' }"></i> <i [innerHTML]="'close' | eva: { width: 26, height: 26, fill: '#222b45' }"></i>
</div> </button>
</nb-card-header> </nb-card-header>
<nb-card-body> <nb-card-body>
<div id="hubspotForm"></div> <div id="hubspotForm"></div>

39
docs/app/shared/components/premium-form/premium-form.component.scss
View file

@ -17,14 +17,12 @@
nb-card-header { nb-card-header {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end;
} }
.close-icon { .close-icon {
cursor: pointer;
margin-left: auto; margin-left: auto;
right: 0.1rem; padding: 0;
top: 0.1rem;
width: fit-content;
} }
::ng-deep .custom-form { ::ng-deep .custom-form {
@ -43,23 +41,35 @@
input.hs-input { input.hs-input {
width: 100%; width: 100%;
font-size: nb-theme(font-size-sm); color: nb-theme(input-basic-text-color);
padding: 0.75rem 1rem !important; font-size: nb-theme(input-medium-text-font-size);
border: 1px solid #e4e9f2; font-weight: nb-theme(input-medium-text-font-weight);
box-shadow: nb-theme(shadow-default); line-height: nb-theme(input-medium-text-line-height);
border-radius: 0.25rem; padding: nb-theme(input-medium-padding) !important;
border: nb-theme(input-border-width) nb-theme(input-border-style) nb-theme(input-basic-border-color);
border-radius: nb-theme(input-rectangle-border-radius);
background-color: nb-theme(input-basic-background-color);
&.hover {
background-color: nb-theme(input-basic-hover-background-color);
border-color: nb-theme(input-basic-hover-border-color);
}
&.invalid { &.invalid {
box-shadow: 0 0 1.25rem 0 rgba(210, 45, 45, 0.6); box-shadow: 0 0 1.25rem 0 rgba(210, 45, 45, 0.6);
} }
&::placeholder { &::placeholder {
color: #434a59; color: nb-theme(input-basic-placeholder-text-color);
opacity: 0.24; font-size: nb-theme(input-medium-placeholder-text-font-size);
font-weight: nb-theme(input-medium-placeholder-text-font-weight);
line-height: nb-theme(input-medium-placeholder-text-line-height);
} }
&:focus { &:focus {
outline: none; outline: none;
background-color: nb-theme(input-basic-focus-background-color);
border-color: nb-theme(input-basic-focus-border-color);
} }
} }
@ -68,7 +78,8 @@
margin-bottom: 1rem; margin-bottom: 1rem;
p { p {
margin-bottom: 0; margin-bottom: 0;
text-align: left ! important; text-align: left !important;
height: auto;
} }
} }
@ -82,7 +93,8 @@
} }
.hs-form-required, .hs-error-msg { .hs-form-required, .hs-error-msg {
color: #f2545b; margin-top: 0.5rem;
color: nb-theme(text-danger-color);
} }
.hs_error_rollup { .hs_error_rollup {
@ -90,7 +102,6 @@
} }
.btn { .btn {
margin-top: 2rem;
font-family: nb-theme(font-main), sans-serif; font-family: nb-theme(font-main), sans-serif;
border-radius: 3px; border-radius: 3px;
border: none; border: none;

1
docs/app/shared/components/premium/premium.component.scss
View file

@ -9,7 +9,6 @@
@include nb-install-component() { @include nb-install-component() {
.btn { .btn {
display: block;
font-family: nb-theme(font-main), sans-serif; font-family: nb-theme(font-main), sans-serif;
border-radius: 3px; border-radius: 3px;
border: none; border: none;

7
docs/app/shared/landing-shared.module.ts
View file

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { NbBadgeModule, NbCardModule, NbDialogModule, NbPopoverModule } from '@nebular/theme'; import {NbBadgeModule, NbButtonModule, NbCardModule, NbDialogModule, NbPopoverModule} from '@nebular/theme';
import { MaterialThemeLinkComponent } from './components/material-theme-link/material-theme-link.component'; import { MaterialThemeLinkComponent } from './components/material-theme-link/material-theme-link.component';
import { CapitalizePipe } from './pipes/capitalize.pipe'; import { CapitalizePipe } from './pipes/capitalize.pipe';
import { EvaIconsPipe } from './pipes/eva-icons.pipe'; import { EvaIconsPipe } from './pipes/eva-icons.pipe';
@ -28,15 +28,12 @@ const pipes = [
NbBadgeModule, NbBadgeModule,
NbCardModule, NbCardModule,
NbDialogModule.forChild(), NbDialogModule.forChild(),
NbButtonModule,
], ],
declarations: [ declarations: [
...component, ...component,
...pipes, ...pipes,
], ],
entryComponents: [
DownloadFormComponent,
PremiumFormComponent,
],
exports: [ exports: [
NbPopoverModule, NbPopoverModule,
...component, ...component,