Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/small css fixes #1225

Merged
merged 3 commits into from
Apr 1, 2019
Merged

Fix/small css fixes #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87aa706
fix(stark-ui): change background-color of `.search-field .mat-form-fi…
carlo-nomes Mar 28, 2019
3bd81e4
fix(stark-demo): fix reference border
carlo-nomes Mar 28, 2019
1d39083
fix(stark-demo): fix `route-search-component` tests failing with ` Un…
carlo-nomes Mar 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions packages/stark-ui/src/modules/route-search/components/_route-search-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.search-field {
.mat-form-field-wrapper {
border: 1px solid mat-color($grey-palette, 400);
background-color: #ffff;
background-color: #fff;
color: mat-color($grey-palette, 900);
}
}
Expand All @@ -16,14 +16,4 @@ button.search-button {
color: mat-color($grey-palette, A100);
}

@media #{$mobile-only-query} {
.search-field {
.mat-form-field-wrapper {
border: 1px solid mat-color($grey-palette, 400);
background-color: #ffff;
color: mat-color($grey-palette, 900);
}
}
}

/* END stark-ui: src/modules/route-search/components/route-search-theme.scss */
54 changes: 30 additions & 24 deletions packages/stark-ui/src/modules/route-search/components/_route-search.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,42 @@
vertical-align: bottom;
}

.search-field {
.mat-form-field-wrapper {
margin-left: 5px;
margin-right: 5px;
width: 210px;
border-radius: 10px;
height: 40px;
padding-bottom: 0;
.route-search-input-wrapper {
&.hide {
display: none;
}

.mat-form-field-label {
line-height: 18px;
.search-field {
.mat-form-field-wrapper {
margin-left: 5px;
margin-right: 5px;
width: 210px;
border-radius: 10px;
height: 40px;
padding-bottom: 0;

.mat-form-field-label {
line-height: 18px;
}
}
}

.mat-form-field-label {
font-size: 15px;
}
.mat-form-field-label {
font-size: 15px;
}

.mat-input-element {
width: 200px;
}
.mat-input-element {
width: 200px;
}

.mat-form-field-infix {
border: 0;
text-indent: 5px;
margin-top: 4px;
}
.mat-form-field-infix {
border: 0;
text-indent: 5px;
margin-top: 4px;
}

.mat-form-field-underline {
display: none;
.mat-form-field-underline {
display: none;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/stark-ui/src/modules/route-search/components/route-search.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
>
<mat-icon [svgIcon]="icon" starkSvgViewBox></mat-icon>
</button>
<div *ngIf="!hide">
<div [ngClass]="{ hide: hide }" class="route-search-input-wrapper">
<mat-form-field floatLabel="never" class="search-field">
<input
class="search-field-input"
Expand Down
2 changes: 1 addition & 1 deletion packages/stark-ui/src/modules/route-search/components/route-search.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ export class StarkRouteSearchComponent extends AbstractStarkUiComponent implemen
setTimeout(() => {
const inputField: HTMLElement = this.elementRef.nativeElement.querySelector(".search-field-input");
inputField.focus();
}, 80);
});
}
}

Expand Down
6 changes: 3 additions & 3 deletions showcase/src/app/shared/components/reference-block/_reference-block.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
/* stark-ui: src/modules/reference-block/components/reference-block.component.scss */
.stark-reference-block div {
background-color: #fff;
border: solid 1px color(mat-color($grey-palette, 400));
border: solid 1px mat-color($grey-palette, 400);
padding: 10px 10px 10px 50px;
border-radius: 5px;
box-shadow: color(mat-color($grey-palette, 300));
box-shadow: mat-color($grey-palette, 300);
position: relative;

& mat-icon {
position: absolute;
left: 15px;
top: 14px;
color: color(mat-color($grey-palette, 700));
color: mat-color($grey-palette, 700);
}

& ul {
Expand Down