This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit b11fa629 authored by Eduard Frankford's avatar Eduard Frankford
Browse files

repaired UI display of types and languages as it was again hidden behind the... 

repaired UI display of types and languages as it was again hidden behind the exercise cards on small screens
parent 460c734a
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
Hide whitespace changes
Inline Side-by-side
src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
+ 37
− 39
View file @ b11fa629
......@@ -7,8 +7,7 @@
<!-- Modal Header -->
<div class="modal-header">
<img class="card-img-top col-3" src="{{exercise.imageURL}}" alt="exercise image"
(error)="correctImageURL($event)"
style="height: auto; float: left;">
(error)="correctImageURL($event)" style="height: auto; float: left;">
<h4 class="modal-title">{{exercise.title}}</h4>
<button type="button" class="close" data-dismiss="modal">&times;</button>
</div>
......@@ -41,7 +40,9 @@
<div *ngIf="exercise.rating"
style="float: left; width: 100%; margin-bottom: 5px; padding-top: 15px;">
<div style="float: left;">
<div><fa-icon icon="eye"></fa-icon></div>
<div>
<fa-icon icon="eye"></fa-icon>
</div>
<!-- <div class="onhoverIconDisplay"><p class="card-text" jhiTranslate="exercise.details.views"></p></div> -->
</div>
......@@ -70,8 +71,11 @@
<div style="float: left;">
<p class="card-text" jhiTranslate="exercise.details.bookmark"></p>
</div>
<div class="form-check" style="float: right; padding-right: 10px;" placement="right">
<input class="form-check-input" type="checkbox" [checked]="isOnCurrentWatchlist(exercise)" (change)="handleForCurrentWatchlist(exercise)" value=""
<div class="form-check" style="float: right; padding-right: 10px;"
placement="right">
<input class="form-check-input" type="checkbox"
[checked]="isOnCurrentWatchlist(exercise)"
(change)="handleForCurrentWatchlist(exercise)" value=""
id="modal-defaultCheck1">
<label class="form-check-label" for="modal-defaultCheck1"></label>
</div>
......@@ -82,53 +86,47 @@
jhiTranslate="exercise.details.hitDetails">
</button> -->
<div [ngbTooltip]="helpComingSoon" placement="bottom">
<button *ngIf="exercise.type == exerciseType.COLLECTION" type="button" class="btn btn-outline-secondary"
style="display: block; margin-bottom: 5px;"
jhiTranslate="exercise.details.allExercises"
disabled>
>
</button></div>
<button *ngIf="exercise.type == exerciseType.COLLECTION" type="button"
class="btn btn-outline-secondary" style="display: block; margin-bottom: 5px;"
jhiTranslate="exercise.details.allExercises" disabled>
>
</button>
</div>
<button type="button" class="btn btn-outline-secondary" style="display: block;"
(click)="openLink(exercise.gitlabURL)"
jhiTranslate="exercise.details.git">
(click)="openLink(exercise.gitlabURL)" jhiTranslate="exercise.details.git">
</button>
<button type="button" class="btn btn-outline-secondary" style="margin-top: 20px;"
data-toggle="modal" data-target="#mdModal" (click)="selectREADME()">README
</button>
<button type="button"
class="btn btn-outline-secondary"
style="margin-top: 20px;"
data-toggle="modal"
data-target="#mdModal"
(click)="selectREADME()"
>README
</button>
</div>
<jhi-exercise-metadata
class="col-12 col-md-8"
[exercise]="exercise">
<jhi-exercise-metadata class="col-12 col-md-8" [exercise]="exercise">
</jhi-exercise-metadata>
<div class="col-6 col-md-4"></div>
<div class="col-12 col-md-8">
<p style="text-align: left; margin-top: 20px;"><strong jhiTranslate="exercise.export.export"></strong>
<p style="text-align: left; margin-top: 20px;"><strong
jhiTranslate="exercise.export.export"></strong>
</p>
<hr>
<a *ngFor="let action of exercise.originalResult.supportedActions" class="btn btn-outline-secondary" role="button" aria-pressed="true"
style="float: left; margin-right: 5px; margin-top: 5px;" (click)="startAction(action, exercise)"
>{{action.commandName}}</a>
<div [ngbTooltip]="helpComingSoon" placement="bottom">
<button *ngIf="exercise.type == exerciseType.COLLECTION" type="button" class="btn btn-outline-secondary"
<a *ngFor="let action of exercise.originalResult.supportedActions"
class="btn btn-outline-secondary" role="button" aria-pressed="true"
style="float: left; margin-right: 5px; margin-top: 5px;"
jhiTranslate="exercise.export.latex" title="{{ 'exercise.comingSoon' | translate}}"
disabled >
</button>
(click)="startAction(action, exercise)">{{action.commandName}}</a>
<div [ngbTooltip]="helpComingSoon" placement="bottom">
<button *ngIf="exercise.type == exerciseType.COLLECTION" type="button"
class="btn btn-outline-secondary"
style="float: left; margin-right: 5px; margin-top: 5px;"
jhiTranslate="exercise.export.latex"
title="{{ 'exercise.comingSoon' | translate}}" disabled>
</button>
</div>
<a class="btn btn-outline-secondary" role="button" aria-pressed="true"
style="float: left; margin-right: 5px; margin-top: 5px;"
(click)="download()"
style="float: left; margin-right: 5px; margin-top: 5px;" (click)="download()"
jhiTranslate="exercise.export.download"></a>
</div>
</div>
......@@ -139,10 +137,10 @@
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-dismiss="modal"
jhiTranslate="exercise.close"></button>
<button class="btn"><fa-icon icon="heart"></fa-icon></button>
</div>
</div>
</div>
</div>
<jhi-markdown-viewer [exercise]="exercise"></jhi-markdown-viewer>
</div>
<jhi-markdown-viewer [exercise]="exercise"></jhi-markdown-viewer>
</div>
\ No newline at end of file
src/main/webapp/app/exercise/exercise-details/exercise-details.component.scss
+ 16
− 0
View file @ b11fa629
......@@ -40,6 +40,22 @@
text-align: left;
}
a {
color: gray;
text-decoration: none !important;
.glyphicon {
transition: all 0.5s;
&.glyphicon-heart {
color: #e74c3c;
}
&.glyphicon-heart-empty {
&:hover {
transform: scale(1.1);
}
}
}
}
// .onhoverIcon:hover ~ .onhoverIconDisplay {
// visibility: visible;
// }
......
src/main/webapp/app/search/search-input/search-input.component.scss
+ 2
− 8
View file @ b11fa629
.searchform-container {
padding: 20px;
position: -webkit-sticky;
// position: sticky;
position: sticky;
top: 0;
z-index: 1;
}
// .dropdown-menu {
// position: relative;
// overflow-y: visible;
// background-color: black;
// z-index: 100000;
// }
src/main/webapp/app/search/search.component.html
+ 1
− 1
View file @ b11fa629
......@@ -8,7 +8,7 @@
class="col-12 col-md-5 col-lg-4 col-xl-3"
(searchInputEvent)="updateSearchInput($event)">
</jhi-search-input>
<div class="col-12 col-md-7 col-lg-8 col-xl-9">
<div class="col-12 col-md-7 col-lg-8 col-xl-9 back">
<div *ngIf="results.length === 0" >
<span jhiTranslate="search.noResults">No results found</span>
<span *ngIf="!accountService.isAuthenticated()" jhiTranslate="search.noResultsAnonymous">Anmelden?</span>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment