Merge branch 'julius-dev' of Software_Engineering_I/greenvironment-frontend into master

master
Trivernis 5 years ago committed by Gitea
commit 1735cd4878

@ -8,7 +8,7 @@
overflow: scroll overflow: scroll
overflow-x: hidden overflow-x: hidden
#profile #profile
padding: 2em padding: 2em
max-width: 1200px max-width: 1200px
margin: 0 auto margin: 0 auto
@ -36,7 +36,7 @@ $mat-card-header-size: 100px !default
font-size: 14px font-size: 14px
margin-left: calc(100px + 0.5em) margin-left: calc(100px + 0.5em)
.info .info
margin-right: 3em margin-right: 3em
#username #username
margin: 0 0.5em margin: 0 0.5em
overflow: auto overflow: auto
@ -59,7 +59,7 @@ $mat-card-header-size: 100px !default
margin-top: 0.5em margin-top: 0.5em
outline: none outline: none
user-select: none user-select: none
/deep/ .mat-card-header-text ::ng-deep .mat-card-header-text
margin: 0 margin: 0
margin-left: 16px margin-left: 16px
.mat-card-subtitle .mat-card-subtitle
@ -79,7 +79,7 @@ $mat-card-header-size: 100px !default
.pointer .pointer
cursor: pointer cursor: pointer
/deep/ .mat-expansion-panel ::ng-deep .mat-expansion-panel
background: #e6e6e6 background: #e6e6e6
/deep/.dark-theme .mat-expansion-panel ::ng-deep.dark-theme .mat-expansion-panel
background: #121212 background: #121212

@ -1,7 +1,7 @@
.mat-sidenav-container .mat-sidenav-container
height: 100vh height: 100vh
.sidenav .sidenav
width: 200px width: 200px
.link .link
@ -34,11 +34,11 @@
.link-button .link-button
width: 100% width: 100%
margin-bottom: 0.5em margin-bottom: 0.5em
/deep/ .mat-tab-link ::ng-deep .mat-tab-link
min-width: 5em!important min-width: 5em!important
#menu-button-box #menu-button-box
text-align: right text-align: right
width: 100% width: 100%

@ -1,5 +1,5 @@
#search #search
width: 100% width: 100%
overflow-x: hidden overflow-x: hidden
height: 100% height: 100%
@ -22,7 +22,7 @@
margin-top: 0.5em margin-top: 0.5em
outline: none outline: none
user-select: none user-select: none
/deep/ .mat-card-header-text ::ng-deep .mat-card-header-text
width: 1000% width: 1000%
margin: 0 margin: 0
margin-left: 16px margin-left: 16px
@ -49,8 +49,8 @@
text-align: right text-align: right
width: 100% width: 100%
/deep/ .mat-expansion-panel ::ng-deep .mat-expansion-panel
background: #e6e6e6 background: #e6e6e6
/deep/.dark-theme .mat-expansion-panel ::ng-deep.dark-theme .mat-expansion-panel
background: #121212 background: #121212

@ -2,12 +2,12 @@
@import '../../../styles/vars.sass' @import '../../../styles/vars.sass'
#friendscontainer #friendscontainer
#groupscontainer #groupscontainer
#tabs #tabs
/deep/ .mat-tab-label ::ng-deep .mat-tab-label
min-width: 50px min-width: 50px
/deep/ .mat-toolbar-row ::ng-deep .mat-toolbar-row
max-height: 40px max-height: 40px

@ -1,6 +1,6 @@
@import '~@angular/material/theming' @import '~@angular/material/theming'
$primary: mat-palette($mat-light-green); $primary: mat-palette($mat-light-green)
$primary-color: mat-color($primary); $primary-color: mat-color($primary)

Loading…
Cancel
Save