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 7 commits
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
2 changes: 2 additions & 0 deletions frontend_v2/src/app/components/challenge/challenge.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
MatRadioModule,
MatDialogModule,
MatSliderModule,
MatTabsModule,
} from '@angular/material';

// import components
Expand Down Expand Up @@ -66,6 +67,7 @@ import { ChallengeanalyticsComponent } from './challengeanalytics/challengeanaly
MatRadioModule,
MatDialogModule,
MatSliderModule,
MatTabsModule,
],
exports: [
ChallengeComponent,
Expand Down
2 changes: 1 addition & 1 deletion ..._v2/src/app/components/challenge/challengeleaderboard/challengeleaderboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h5 class="fw-light">Leaderboard</h5>
<div class="row">
<div class="col-sm-6 col-xs-12 col-lg-6 col-lr-pad phase-select-box col-lr-margin">
<app-selectphase
[phases]="filteredPhaseSplits"
[phaseSplits]="filteredPhaseSplits"
[phaseSelectionType]="phaseSelectionType"
[phaseSelectionListType]="phaseSelectionListType"
[selectedPhaseSplitUrlChange]="selectedPhaseSplitUrlChange"
Expand Down
511 changes: 258 additions & 253 deletions frontend_v2/src/app/components/challenge/challengesettings/challengesettings.component.html
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 28 additions & 2 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 @@ -3,14 +3,27 @@

.challenge-card {
.bottom-card-container {
padding-top: 0px;
.settings-section {
padding: 20px 30px;
padding: 50px;
border: 1px solid;
border-radius: 5px;
min-height: 50px;
color: rgb(101, 97, 97);
}
}
.row {
margin: 4% 0px 4% 0px;
}
}

input {
border-bottom: none;
}

:host ::ng-deep .mat-tab-label .mat-tab-label-content{
font-weight: $fw-light !important;
font-size: $fs-16 !important;
}

.phase-card {
Expand All @@ -21,12 +34,26 @@
margin-left: 25px;
}

.worker-title {
margin-bottom: 2%;
}

.upload-container {
text-align:center;
}

@include screen-medium {
.settings-section {
padding: 10px 20px !important;
}
}

@media (min-width: 992px) {
.col-md-12 {
width: auto;
}
}

@include screen-small-medium {
.settings-section {
padding: 10px 10px !important;
Expand All @@ -48,7 +75,6 @@
}

.challenge-detail {
margin-left: 25%;
padding: 8px;
}

Expand Down
Loading