From 55e14c59cfd1ffdc8c2932d9100621212e830b19 Mon Sep 17 00:00:00 2001 From: Lukas Haase <lukas.haase@mni.thm.de> Date: Tue, 28 Jul 2020 14:30:38 +0200 Subject: [PATCH] remove changes in ars-lib. center questionwall votes --- .../material-btn/material-btn.component.scss | 72 +++++++++---------- .../question-wall.component.html | 18 +++-- 2 files changed, 50 insertions(+), 40 deletions(-) diff --git a/projects/ars/src/lib/components/style/menu/material-btn/material-btn.component.scss b/projects/ars/src/lib/components/style/menu/material-btn/material-btn.component.scss index 279d3d0e5..cc483305c 100644 --- a/projects/ars/src/lib/components/style/menu/material-btn/material-btn.component.scss +++ b/projects/ars/src/lib/components/style/menu/material-btn/material-btn.component.scss @@ -4,58 +4,58 @@ p, h1, h2, h3, h4, h5 { padding: 0; margin: 0; - font-family: Roboto, 'sans-serif'; + font-family:Roboto, 'sans-serif'; } - button { - background-color: transparent; - border: none; - outline: none; - cursor: pointer; - float: left; + button{ + background-color:transparent; + border:none; + outline:none; + cursor:pointer; + float:left; } - button > * { - float: left; - cursor: pointer; + button > *{ + float:left; + cursor:pointer; } - button:focus-visible > *:first-child { - outline: red 2px solid; - outline-offset: 2px; + button:focus-visible > *:first-child{ + outline:red 2px solid; + outline-offset:2px; } - ars-col > button > p { - font-weight: 500; - font-size: 14px; - line-height: 18px; - padding-top: 1px; - padding-bottom: 3px; - color: var(--ars-button-color); + ars-col > button > p{ + font-weight:500; + font-size:14px; + line-height:18px; + padding-top:1px; + padding-bottom:3px; + color:var(--ars-button-color); } - ars-row > button > p { - font-weight: 500; - font-size: 14px; - line-height: 14px; - color: var(--ars-button-color); + ars-row > button > p{ + font-weight:500; + font-size:14px; + line-height:14px; + color:var(--ars-button-color); } - ars-row > button > *:nth-child(2) { - float: right; + ars-row > button > *:nth-child(2){ + float:right; } - button > *:nth-child(2) { - margin-left: 30px; + button > *:nth-child(2){ + margin-left:12px; } - button > i { - font-family: 'Material Icons', serif; - font-weight: normal; - font-style: normal; - font-size: 18px; - line-height: 18px; - color: var(--ars-button-color); + button > i{ + font-family:'Material Icons', serif; + font-weight:normal; + font-style:normal; + font-size:18px; + line-height:18px; + color:var(--ars-button-color); } } diff --git a/src/app/components/shared/questionwall/question-wall/question-wall.component.html b/src/app/components/shared/questionwall/question-wall/question-wall.component.html index 0b0087d61..d51e3dbc5 100644 --- a/src/app/components/shared/questionwall/question-wall/question-wall.component.html +++ b/src/app/components/shared/questionwall/question-wall/question-wall.component.html @@ -76,8 +76,13 @@ <ars-row [height]="50"> <ars-style-btn-material style="width:100%;height:100%;" ars-flex-box> <ars-col ars-btn-wrp [xp]="32" [extra]="true" class="questionwall-comment-btn"> - <button ars-btn (click)="likeComment(commentFocus)" matRipple><i>thumb_up</i><p>{{commentFocus.comment.score}}</p></button> - <button ars-btn (click)="dislikeComment(commentFocus)" matRipple><i>thumb_down</i></button> + <button ars-btn (click)="likeComment(commentFocus)" matRipple> + <i>thumb_up</i> + <p style="padding-left:22px;">{{commentFocus.comment.score}}</p> + </button> + <button ars-btn (click)="dislikeComment(commentFocus)" matRipple> + <i>thumb_down</i> + </button> </ars-col> <ars-fill></ars-fill> <ars-col ars-btn-wrp [xp]="32" [extra]="true" *ngIf="commentFocus.comment.tag"> @@ -173,8 +178,13 @@ <ars-row [height]="50"> <ars-style-btn-material style="width:100%;height:100%;" ars-flex-box> <ars-col ars-btn-wrp [xp]="16" [extra]="true" class="questionwall-comment-btn"> - <button ars-btn (click)="likeComment(comment)" matRipple><i>thumb_up</i><p>{{comment.comment.score}}</p></button> - <button ars-btn (click)="dislikeComment(comment)" matRipple><i>thumb_down</i></button> + <button ars-btn (click)="likeComment(comment)" matRipple> + <i>thumb_up</i> + <p style="padding-left:4px;">{{comment.comment.score}}</p> + </button> + <button ars-btn (click)="dislikeComment(comment)" matRipple> + <i>thumb_down</i> + </button> </ars-col> <ars-fill (click)="focusComment(comment)" style="cursor:pointer"></ars-fill> <ars-col ars-btn-wrp [xp]="16" [extra]="true"*ngIf="comment.comment.tag"> -- GitLab