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

Jump to bottom

Add Tab view on settings page #3551

Merged
merged 14 commits into from
Aug 13, 2021
Merged

Add Tab view on settings page #3551

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
50ca85b
add tab view to settings tab
gautamjajoo Jul 26, 2021
955f5b7
fix worker title
gautamjajoo Jul 26, 2021
0b1154e
change tab-heading
gautamjajoo Jul 26, 2021
ef4012e
add :host -> does not change styles when coming from other compoenent
gautamjajoo Jul 27, 2021
3575f94
merge phase and leaderboard tab
gautamjajoo Jul 30, 2021
8f23463
show defauly options in select phase
gautamjajoo Aug 3, 2021
3db3413
add comments
gautamjajoo Aug 3, 2021
423049d
fix private label for small screen size
gautamjajoo Aug 5, 2021
a8cc232
fix spacing issues
gautamjajoo Aug 6, 2021
0a56b59
add evaluation script heading
gautamjajoo Aug 9, 2021
9514da6
Merge branch 'master' of https://github.com/Cloud-CV/EvalAI into sett…
gautamjajoo Aug 10, 2021
4c38efe
add check for empty arrays
gautamjajoo Aug 12, 2021
8558f63
make phase splits private when phase is private
gautamjajoo Aug 13, 2021
ccc1cf6
Merge branch 'master' into settings-tab-view
RishabhJain2018 Aug 13, 2021
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
14 changes: 4 additions & 10 deletions frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ input {
text-align:center;
}

@include screen-medium {
@media (max-width: 992px) {
.settings-section {
padding: 10px 20px !important;
padding: 50px !important;
}
}

Expand All @@ -54,15 +54,9 @@ input {
}
}

@include screen-small-medium {
@media (max-width: 600px) {
.settings-section {
padding: 10px 10px !important;
}
}

@include screen-small {
.settings-section {
padding: 10px 5px !important;
padding: 25px !important;
}
}

Expand Down
8 changes: 4 additions & 4 deletions frontend_v2/src/app/components/utility/selectphase/selectphase.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<mat-label class="fs-16 phase-placeholder" [ngClass]="{ 'hide-label': phaseName !== '' }">Select phase</mat-label>
<mat-select class="rm-margin" [(value)]="selectedPhase">
<mat-select-trigger>
<span class="col-lg-9 col-md-9 col-sm-8 col-xs-7">{{ phaseName }}
<span class="col-lg-9 col-md-9 col-sm-8">{{ phaseName }}
</span>
<span class="col-lg-3 col-md-3 col-sm-4 col-xs-5">
<span class="col-lg-3 col-md-3 col-sm-4 col-xs-12">
<mat-chip-list *ngIf="phaseVisibility">
<mat-chip>Private</mat-chip>
</mat-chip-list>
Expand Down Expand Up @@ -71,7 +71,7 @@
<span class="fw-light">Phase:&nbsp;</span>{{ phaseName }}, <span class="fw-light">Split:&nbsp; </span
>{{ settingsSplitName }} &nbsp;
</span>
<span class="col-lg-3 col-md-3 col-sm-4 col-xs-5">
<span class="col-lg-3 col-md-3 col-sm-4 col-xs-12">
<span class="private-badge">
<mat-chip-list *ngIf="phaseVisibility">
<mat-chip>Private</mat-chip>
Expand Down Expand Up @@ -103,7 +103,7 @@
<span class="fw-light">Phase:&nbsp;</span>{{ phaseName }}, <span class="fw-light">Split:&nbsp; </span
>{{ splitName }} &nbsp;
</span>
<span class="col-lg-3 col-md-3 col-sm-4 col-xs-5">
<span class="col-lg-3 col-md-3 col-sm-4 col-xs-12">
<mat-chip-list *ngIf="phaseVisibility">
<mat-chip>Private</mat-chip>
</mat-chip-list>
Expand Down
11 changes: 11 additions & 0 deletions frontend_v2/src/app/components/utility/selectphase/selectphase.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
padding-right: 0px;
}

@media (max-width: 400px) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep it till 800px as the private-tag issue is for ipad sized screens as well

.mat-form-field {
margin-right: 40px;
display: block;
}
.col-xs-12 {
padding-bottom: 5px;
width: 80%;
}
}

::ng-deep .mat-select-placeholder {
padding-bottom: 10px;
}
Expand Down