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

Style changes #476

Merged
merged 4 commits into from
Oct 28, 2023
Merged

Style changes #476

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a81d3f8
CSS changed+DownloadProject+style_step_deactivated
nkarmazina Oct 6, 2023
628fed6
scenario status in dark mode
nkarmazina Oct 10, 2023
4318931
a few more changes for darkTheme
nkarmazina Oct 11, 2023
aa927f8
Merge branch 'dev' into StyleChanges
nkarmazina Oct 28, 2023
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
69 changes: 24 additions & 45 deletions frontend/src/app/account-management/account-management.component.css
View file
Open in desktop
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
48 changes: 26 additions & 22 deletions frontend/src/app/account-management/account-management.component.html
View file
Open in desktop
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
View file
Open in desktop
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
109 changes: 30 additions & 79 deletions frontend/src/app/base-editor/base-editor.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@
:host ::ng-deep .stepsListContainer em{
color: var(--ocean-blue);
}

:host ::ng-deep .stepsListContainer .disabled em{
color: gray !important;
}



:host ::ng-deep .stepsListContainer button{
border: none;
background: none;
Expand Down Expand Up @@ -94,6 +89,10 @@ em.dragIcon{
margin: 0 5px;
}

:host ::ng-deep .mat-mdc-form-field.exampleList .mat-mdc-select-value-text {
font-size: 16px;
}

.uk-card-title {
font-size: medium;
}
Expand All @@ -113,15 +112,15 @@ em.addStep{
padding-left: 12px;
}

:host ::ng-deep .disabled {
color: gray !important;
/* background: var(--white) !important; */
.deactivated,
.deactivated input{
color: gray;
font-style: italic;
text-decoration: line-through;
}

:host ::ng-deep .darkTheme .disabled {
color: var(--buttonDisabled) !important;
.deactivated .scenarioTitle{
display: none;
}

.checkboxDropdown{
Expand Down Expand Up @@ -165,21 +164,9 @@ input[type="text"]{
height: 40px;
}

/* :host ::ng-deep .scenarioTitle{
background: transparent;
border: none;
margin-right: 2px;
} */

/* .scenarioTitle {
background: transparent;
} */

/* :host ::ng-deep .scenarioTitle > em {
color: var(--ocean-blue);
font-size: 24px;
transform: translate(0px, 3px)
} */
.scenarioTitle {
height: 25px;
}

:host ::ng-deep .scenarioTitle{
/* background: var(--white); */
Expand All @@ -188,11 +175,6 @@ input[type="text"]{
margin-right: 2px;
}

/* :host ::ng-deep .darkTheme, .scenarioTitle {
background: transparent;
} */


:host ::ng-deep .scenarioTitle > em{
color: var(--ocean-blue);
font-size: 24px;
Expand Down Expand Up @@ -239,16 +221,6 @@ input[type="text"]{
color: var(--white);
}

:host ::ng-deep .disabled input{
color: gray;
border-bottom: 1px solid gray;
}

:host ::ng-deep .darkTheme .disabled input {
color: var(--buttonDisabled) !important;
border-color: var(--border);
}

.uk-dropdown{
padding: 15px;
}
Expand All @@ -264,68 +236,47 @@ input[type="text"]{
padding-right: 20px;
}

/* Eventually not in use */
.mat-mdc-form-field + .mat-mdc-form-field {
margin-left: 8px;
}

:host ::ng-deep .scenarioBarContainer .disabled em{
.scenarioBarContainer .disabled em{
color: gray !important;
/* background: #f8f8f8 !important; */
}

:host ::ng-deep .darkTheme .scenarioBarContainer .disabled em {
.darkTheme .scenarioBarContainer .disabled em {
color: var(--buttonDisabled) !important;
}

.exampleList{
width: 100%;
min-width: 100px;
margin-left: 10px;
margin-right: 10px;
}

.exampleList ::ng-deep .mat-mdc-form-field-wrapper{
padding-bottom: 0px !important;
.exampleListContainer{
position: relative;
bottom: 5px;
width: fit-content;
min-width: 150px;
}

.exampleList ::ng-deep .mat-mdc-form-field-underline{
bottom: 0px !important;
}
.exampleList ::ng-deep .mat-mdc-select-value{
color: var(--ocean-blue) !important;
font-weight: bold !important;
max-width: max-content !important;
:host ::ng-deep .exampleListContainer .mat-mdc-form-field-infix {
width: fit-content !important;
}
::ng-deep .mat-mdc-select-panel-above{
width: auto !important;

}
:host::ng-deep .mat-mdc-text-field-wrapper{
height: 26px;
background-color: transparent;
padding: 0;
.exampleList ::ng-deep .mat-mdc-select-value{
color: var(--ocean-blue);
font-weight: bold;
}

::ng-deep .mat-mdc-form-field-subscript-wrapper{
height: 5px;
.deactivated .exampleList ::ng-deep .mat-mdc-select-value{
color:gray;
text-decoration: line-through;
font-weight: normal !important;
}

.exampleListOption {
font-weight: bold !important;
}

.darkTheme ::ng-deep .exampleList .mat-mdc-select-value {
font-weight: 595 !important;
}

::ng-deep .darkTheme .exampleListOption {
font-weight: 595 !important;
}

.exampleList ::ng-deep .mat-mdc-form-field-infix {
width: fit-content !important;
}

.exampleButton{
height: 20px;
width: 20px;
Expand Down
Loading