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

master
Max_ES 5 years ago committed by Gitea
commit 9b00def085

@ -12,6 +12,7 @@
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)
background-color: $cPrimaryBackground background-color: $cPrimaryBackground
padding: 1em padding: 1em
overflow: auto
input input
margin: 0.25em margin: 0.25em

@ -22,6 +22,7 @@
display: grid display: grid
grid-template: 5% 95% /100% grid-template: 5% 95% /100%
background-color: $cFeedBackground background-color: $cFeedBackground
overflow: auto
#feedchooser #feedchooser
@include gridPosition(1, 2, 1, 2) @include gridPosition(1, 2, 1, 2)

@ -10,15 +10,18 @@
#chatcontainer #chatcontainer
@include gridPosition(1, 3, 1, 2) @include gridPosition(1, 3, 1, 2)
background-color: $cBoxBodyBackground background-color: $cBoxBodyBackground
overflow: auto
#feedcontainer #feedcontainer
@include gridPosition(1, 3, 2, 3) @include gridPosition(1, 3, 2, 3)
display: grid display: grid
grid-template: 10% 90% /100% grid-template: 10% 90% /100%
background-color: $cSecondaryBackground background-color: $cSecondaryBackground
overflow: auto
#socialcontainer #socialcontainer
@include gridPosition(1, 3, 3, 4) @include gridPosition(1, 3, 3, 4)
display: grid display: grid
grid-template: 50% 50% /100% grid-template: 50% 50% /100%
background-color: $cBoxBodyBackground background-color: $cBoxBodyBackground
overflow: auto

@ -11,6 +11,7 @@
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)
background-color: $cPrimaryBackground background-color: $cPrimaryBackground
padding: 1em padding: 1em
overflow: auto
input input
margin: 0.25em margin: 0.25em

@ -11,6 +11,7 @@
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)
background-color: $cPrimaryBackground background-color: $cPrimaryBackground
padding: 1em padding: 1em
overflow: auto
input input
margin: 0.25em margin: 0.25em

@ -7,12 +7,14 @@
display: grid display: grid
min-height: 90vh min-height: 90vh
max-height: 90vh max-height: 90vh
#profilecontainer #profilecontainer
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)
//grid-template: 15% 15% 15% 15% 15% 15% / 100% //grid-template: 15% 15% 15% 15% 15% 15% / 100%
background-color: $cPrimaryBackground background-color: $cPrimaryBackground
padding: 1em padding: 1em
overflow: auto
th th
text-align: left text-align: left

@ -13,6 +13,7 @@
grid-template: 15% 15% 15% 15% 15% 15% / 100% grid-template: 15% 15% 15% 15% 15% 15% / 100%
background-color: $cPrimaryBackground background-color: $cPrimaryBackground
padding: 1em padding: 1em
overflow: auto
input input
margin: 0.25em margin: 0.25em

Loading…
Cancel
Save