Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

master
Trivernis 5 years ago committed by Gitea
commit ac4f830367

@ -5,22 +5,26 @@ html, body
margin: 0 margin: 0
height: 100% height: 100%
$scrollbar-color: transparent
$scrollbar-thumb-color: #aaa
$scrollbar-color-dark: transparent
$scrollbar-thumb-color-dark: #aaa
::ng-deep body ::ng-deep body
scrollbar-color: #aaa #ddd scrollbar-color: $scrollbar-color $scrollbar-thumb-color
scrollbar-width: thin scrollbar-width: thin
.dark-theme .dark-theme
scrollbar-color: #ddd #666 scrollbar-color: $scrollbar-color-dark $scrollbar-thumb-color-dark
::ng-deep ::-webkit-scrollbar ::ng-deep ::-webkit-scrollbar
width: 4px width: 4px
::ng-deep ::-webkit-scrollbar-track ::ng-deep ::-webkit-scrollbar-track
background: #ddd background: $scrollbar-color
.dark-theme .dark-theme
background: #666 background: $scrollbar-color-dark
::ng-deep ::-webkit-scrollbar-thumb ::ng-deep ::-webkit-scrollbar-thumb
background: #aaa background: $scrollbar-thumb-color
.dark-theme .dark-theme
background: #ddd background: $scrollbar-thumb-color-dark

@ -34,7 +34,8 @@ $mat-card-header-size: 40px !default
margin-left: auto margin-left: auto
::ng-deep img ::ng-deep img
max-width: 100% width: 100%
max-height: 40vh
height: auto height: auto
border-radius: 4px border-radius: 4px
::ng-deep video ::ng-deep video

@ -11,6 +11,7 @@
margin-top: 0.5em margin-top: 0.5em
outline: none outline: none
user-select: none user-select: none
cursor: pointer
::ng-deep .mat-card-header-text ::ng-deep .mat-card-header-text
width: 1000% width: 1000%
margin: auto 0 auto 24px margin: auto 0 auto 24px

Loading…
Cancel
Save