Commit f5366231 authored by Laury Bueno's avatar Laury Bueno

Revert "Revert "Merge branch 'fix/177-sidebar' into 'master'""

This reverts commit e41abb8c.
parent 51d9d5eb
Pipeline #14863872 passed with stage
in 2 minutes and 39 seconds
......@@ -7629,14 +7629,6 @@
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true
},
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"requires": {
"safe-buffer": "5.1.1"
}
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
......@@ -7648,6 +7640,14 @@
"strip-ansi": "3.0.1"
}
},
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"requires": {
"safe-buffer": "5.1.1"
}
},
"stringstream": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
......
......@@ -107,6 +107,9 @@
}
}
}
span {
margin-left: 7px;
}
}
}
......
......@@ -4,13 +4,13 @@
<li routerLinkActive="active" [routerLinkActiveOptions]="{exact: true}">
<a routerLink="/profile" (click)="toggleMenu()" class="profile" >
<img onError="this.src='/assets/images/icons/profile_icon.svg'"[src]="profile.image" alt="{{'navigation-bar.item.profile' | translate}}">
{{'navigation-bar.item.profile' | translate}}
<span>{{'navigation-bar.item.profile' | translate}}</span>
</a>
</li>
<li routerLinkActive="active">
<a [routerLink]="['/conversations']" (click)="toggleMenu()">
<img src="/assets/images/icons/conversas_icon.svg" alt="{{'navigation-bar.item.conversations' | translate}}" />
<span class="">{{'navigation-bar.item.conversations' | translate}}</span>
<span>{{'navigation-bar.item.conversations' | translate}}</span>
</a>
</li>
<!-- <li><a routerLink="/notes" class="fa fa-pencil-square-o">Notes</a></li> -->
......@@ -24,7 +24,7 @@
<li routerLinkActive="active">
<a [routerLink]="['/comments']" class="comments" (click)="toggleMenu()">
<img src="/assets/images/icons/comentarios_icon.svg" alt="{{'navigation-bar.item.comments' | translate}}" />
<span class="">{{'navigation-bar.item.comments' | translate}}</span>
<span>{{'navigation-bar.item.comments' | translate}}</span>
</a>
</li>
<!-- <li><a href="/discussion/forum-home/" class="fa fa-quote-left">Fóruns</a></li> -->
......@@ -33,7 +33,7 @@
<li>
<a routerLink="/logout">
<img src="/assets/images/icons/sair_icon.svg" alt="Some user" class="img-circle"/>
{{'navigation-bar.item.logout' | translate }}
<span>{{'navigation-bar.item.logout' | translate }}</span>
</a>
</li>
</ul>
......
......@@ -25,6 +25,9 @@
@include media-breakpoint-up(sm) {
left: 0;
width: 100px;
span {
display: block;
}
}
@include media-breakpoint-down(sm) {
left: -245px;
......@@ -83,7 +86,7 @@
li {
position: relative;
padding: 25px 20px 25px 15px;
padding: 25px 5px 25px 5px;
@media screen and (min-height: 500px) and (max-height: 900px){
padding: 15px 20px 15px 15px;
......@@ -108,7 +111,6 @@
img{
width: 25px;
margin-right: 7px;
@include media-breakpoint-up(md) {
width: 30px;
......
Markdown is supported
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