-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
110 additions
and
67 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,28 @@ | ||
| @import "/src/styles/colors"; | ||
|
|
||
| .userOptions{ | ||
| padding: 0 1.5rem .5rem 0; | ||
| a{ | ||
| text-decoration: none; | ||
|
|
||
| &:hover{ | ||
| color: $primary; | ||
| } | ||
| &::before{ | ||
| -moz-transition: all .15s ease-out; | ||
| -webkit-transition: all .15s ease-out; | ||
| -ms-transition: all .15s ease-out; | ||
| -o-transition: all .15s ease-out; | ||
| transition: all .15s ease-out; | ||
| content: ""; | ||
| position: absolute; | ||
| left: 0; | ||
| display: block; | ||
| width: 9px; | ||
| height: 9px; | ||
| background: transparent; | ||
| border-radius: 9px; | ||
| } | ||
| } | ||
| .userOptions { | ||
| padding: 0 1.5rem 0.5rem 0; | ||
|
|
||
| a { | ||
| text-decoration: none; | ||
|
|
||
| &:hover { | ||
| color: $primary; | ||
| } | ||
| &::before { | ||
| -moz-transition: all 0.15s ease-out; | ||
| -webkit-transition: all 0.15s ease-out; | ||
| -ms-transition: all 0.15s ease-out; | ||
| -o-transition: all 0.15s ease-out; | ||
| transition: all 0.15s ease-out; | ||
| content: ""; | ||
| position: absolute; | ||
| left: 0; | ||
| display: block; | ||
| width: 9px; | ||
| height: 9px; | ||
| background: transparent; | ||
| border-radius: 9px; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,51 @@ | ||
| <nav class="main-menu d-flex flex-column justify-content-between"> | ||
| <div id="main-options"> | ||
| <a [routerLinkActive]="['active']" [routerLinkActiveOptions]="{ exact: true }" (click)="openLoginModal()"> | ||
| {{'components.mainMenu.section7.title' | translate }} | ||
| <img src="../../../../assets/img/icon/user.svg" alt="User"/> | ||
| </a> | ||
| <a [routerLink]="[ 'challenges' ]" [routerLinkActive]="['active']" >{{'components.mainMenu.section1.title' | translate }}</a> | ||
| <a [routerLink]="[ '#' ]" [routerLinkActive]="['active']" >{{'components.mainMenu.section2.title' | translate }}</a> | ||
| <a [routerLink]="[ '#' ]" [routerLinkActive]="['active']" >Hackathons</a> | ||
| <a [routerLink]="[ '#' ]" [routerLinkActive]="['active']" >{{'components.mainMenu.section4.title' | translate }}</a> | ||
| <a [routerLink]="[ '#' ]" [routerLinkActive]="['active']" >{{'components.mainMenu.section5.title' | translate }}</a> | ||
| </div> | ||
| <div id="user-options"> | ||
| <section id="languages"> | ||
| <button (click)="changeLanguage('es')">ES</button> | ||
| <button id="middleBtn" (click)="changeLanguage('cat')">CAT</button> | ||
| <button (click)="changeLanguage('en')">EN</button> | ||
| </section> | ||
| </div> | ||
| <div id="main-options"> | ||
|
|
||
| <a [routerLink]="['#']" [routerLinkActive]="['active']">Inicio</a> | ||
|
|
||
| <a [routerLink]="['challenges']" [routerLinkActive]="['active']">{{ | ||
| "components.mainMenu.section1.title" | translate | ||
| }}</a> | ||
| <a [routerLink]="['#']" [routerLinkActive]="['active']">{{ | ||
| "components.mainMenu.section2.title" | translate | ||
| }}</a> | ||
| <a [routerLink]="['#']" [routerLinkActive]="['active']">Hackathons</a> | ||
| <a [routerLink]="['#']" [routerLinkActive]="['active']">{{ | ||
| "components.mainMenu.section4.title" | translate | ||
| }}</a> | ||
| <a [routerLink]="['#']" [routerLinkActive]="['active']">{{ | ||
| "components.mainMenu.section5.title" | translate | ||
| }}</a> | ||
|
|
||
| <div | ||
| class="userOptions d-none d-md-flex flex-column justify-content-center" | ||
| > | ||
| <a | ||
| class="mb-2" | ||
| [routerLink]="['#']" | ||
| [routerLinkActive]="['active']" | ||
| > | ||
| <img | ||
| src="../../../../assets/img/icon/setting.svg" | ||
| alt="Settings" | ||
| /> | ||
| {{ "components.mainMenu.section6.title" | translate }} | ||
| </a> | ||
| <a | ||
| [routerLinkActive]="['active']" | ||
| [routerLinkActiveOptions]="{ exact: true }" | ||
| (click)="openLoginModal()" | ||
| > | ||
| <img src="../../../../assets/img/icon/user.svg" alt="User" /> | ||
| {{ "components.mainMenu.section7.title" | translate }} | ||
| </a> | ||
| </div> | ||
| </div> | ||
| <div id="user-options"> | ||
| <section id="languages"> | ||
| <button (click)="changeLanguage('es')">ES</button> | ||
| <button id="middleBtn" (click)="changeLanguage('cat')">CAT</button> | ||
| <button (click)="changeLanguage('en')">EN</button> | ||
| </section> | ||
| </div> | ||
| </nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters