Skip to content

Commit

Permalink
Merge pull request #476 from adessoSE/StyleChanges
Browse files Browse the repository at this point in the history
Style changes
  • Loading branch information
nkarmazina authored Oct 28, 2023
2 parents 44fafe6 + aa927f8 commit 89696e9
Show file tree
Hide file tree
Showing 13 changed files with 422 additions and 425 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,38 @@ h2, h1{
width: 14px;
height: 15px;
}

.downloadWrapper {
margin-bottom: 7px;
margin-top: 4px;
display: flex;
flex-direction: column;
height: 100%;
}

.searchAndVersion{
align-items: center;
display: flex;
justify-content: center;
}

.dropDownProject{
padding-left: 25px;
width: 100%;
}
.downloadExportButton{
margin-top: 15px;
margin-left: 25px;
display: flex;
justify-content: space-evenly;
align-items: end;
}

.searchInput, .versionInput{
border: none;
border-bottom: 1px solid var(--brown-grey);
font-weight: normal;
width: 40%;
width: 50%;
max-height: 2em;
margin-top: 1.75em;
}
Expand Down Expand Up @@ -309,51 +332,7 @@ h2, h1{
.flex-end-item {
margin-left: auto;
}

::ng-deep .mat-mdc-focused .mat-mdc-form-field-label {
/*change color of label*/
color: var(--ocean-blue) !important;
}

::ng-deep .mdc-floating-label--float-above {
color: var(--ocean-blue) !important;
}
::ng-deep .mat-mdc-option-active .mdc-list-item__primary-text {
color: var(--ocean-blue) !important;
}

::ng-deep.mat-mdc-form-field-underline {
/*change color of underline*/
background-color: var(--ocean-blue) !important;
}

::ng-deep.mat-mdc-form-field-ripple {
/*change color of underline when focused*/
background-color: var(--ocean-blue) !important;
}
::ng-deep .mat-mdc-option.mat-mdc-selected:not(.mat-mdc-option-disabled){
color: var(--ocean-blue) !important;
}
::ng-deep.mat-mdc-form-field.mat-mdc-focused .mat-mdc-select-arrow{
color: var(--ocean-blue) !important;
width: 20px;
height: 10px;
position: relative;
}
/* ::ng-deep.mat-mdc-option-text:checked{
color: green !important;
} */
::ng-deep .mat-mdc-form-field-infix{
padding-bottom: 0 !important;
min-height: fit-content;
}

:host::ng-deep .mat-mdc-text-field-wrapper{
margin-top: 5px;
background-color: transparent;
padding: 0 !important;
}

.wrongLogin{
background-color: var(--grape);
text-align: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,35 @@ <h2 class="LargeHeadline3">Seed-Test Account</h2>
<div class="repositories" *ngIf="loginService.isLoggedIn()">
<div>
<label>Download Project</label>
<dfn class="def"><span class="infoIcon" uk-icon="info" id="downloadInfo"></span>
<span rel="def">Download all Tests as Feature files of a Project in a zip File</span>
</dfn>
</div>
<div class="uk-flex uk-flex-row uk-search downloadWrapper">
<em class="material-icons" id="searchBarIcons">search</em>
<input class="searchInput" type="text" #searchbar (keyup)="searchRepos()" [(ngModel)]="searchInput" placeholder="Search"/>
<input class="versionInput" type="text" #versionbar [(ngModel)]="versionInput" placeholder="Optional: Version"/>
<div style="width: 10%;"></div>
<mat-form-field appearance="standard" class="filterFormField">
<mat-label>Project</mat-label>
<mat-select #ngSelect [(ngModel)]="downloadRepoID">
<mat-option *ngFor="let repo of searchList" [value]="repo._id">{{repo.value}}</mat-option>
</mat-select>
</mat-form-field>
</div>
<div>
<button (click)="downloadProjectFeatures(downloadRepoID)" class="normalButton">Download</button>
<div class="searchAndVersion">
<em class="material-icons" id="searchBarIcons">search</em>
<input class="searchInput" type="text" #searchbar (keyup)="searchRepos()" [(ngModel)]="searchInput" placeholder="Search"/>
<input class="versionInput" type="text" #versionbar [(ngModel)]="versionInput" placeholder="Optional: Version"/>
</div>
<div class="dropDownProject">
<mat-form-field appearance="standard" style="width: 100%;">
<mat-label>Project</mat-label>
<mat-select #ngSelect [(ngModel)]="downloadRepoID">
<mat-option *ngFor="let repo of searchList" [value]="repo._id">{{repo.value}}</mat-option>
</mat-select>
</mat-form-field>
</div>
</div>
<br>
<div>
<button (click)="exportProject(downloadRepoID)" class="normalButton">Export</button>
<dfn class="def"><span class="infoIcon" uk-icon="info" id="downloadInfo"></span>
<span rel="def">Export Tests in Gherkin: Export your project as a .zip file containing the stories and blocks of a project importable as .json.</span>
</dfn>
<div class="downloadExportButton">
<div>
<button (click)="downloadProjectFeatures(downloadRepoID)" class="normalButton">Download</button>
<dfn class="def"><span class="infoIcon" uk-icon="info" id="downloadInfo"></span>
<span rel="def">Download all Tests as Feature files of a Project in a zip File</span>
</dfn>
</div>
<div>
<button (click)="exportProject(downloadRepoID)" class="normalButton" style="width: 86.76px;" >Export</button>
<dfn class="def"><span class="infoIcon" uk-icon="info" id="downloadInfo"></span>
<span rel="def">Export Tests in Gherkin: Export your project as a .zip file containing the stories and blocks of a project importable as .json.</span>
</dfn>
</div>
</div>
</div>

Expand Down
3 changes: 0 additions & 3 deletions frontend/src/app/app.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
/*Below provides sticky footer*/
min-height: 100vh;
}
/* :host::ng-deep .mat-mdc-form-field{
display: inline-table;
} */

.router{
grid-area: router;
Expand Down
Loading

0 comments on commit 89696e9

Please sign in to comment.