Merge branch 'deployment' of https://github.com/dap-ps/discover into deployment

This commit is contained in:
George Spasov 2019-07-09 18:40:50 +03:00
commit 576aaf8da9
3 changed files with 7 additions and 7 deletions

View File

@ -36,9 +36,8 @@
padding: calculateRem(12); padding: calculateRem(12);
margin: calculateRem(4); margin: calculateRem(4);
cursor: pointer; cursor: pointer;
text-align: -webkit-center; text-align: left;
overflow: hidden; overflow: hidden;
display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;

View File

@ -5,7 +5,7 @@
flex-direction: column; flex-direction: column;
background-color: #eef2f5; background-color: #eef2f5;
font-family: $font; font-family: $font;
padding: calculateRem(40) calculateRem(16) calculateRem(32) calculateRem(16); padding: calculateRem(40) calculateRem(32) calculateRem(32) calculateRem(32);
margin-top: calculateRem(24); margin-top: calculateRem(24);
} }

View File

@ -10,26 +10,27 @@
.grid { .grid {
display: grid; display: grid;
grid-auto-flow: column; grid-auto-flow: column;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(3, 1fr);
grid-gap: calculateRem(20); grid-gap: calculateRem(20);
overflow-x: scroll; overflow-x: scroll;
overflow-y: hidden; overflow-y: hidden;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
margin-left: 1.1rem;
@media (min-width: $desktop) { @media (min-width: $desktop) {
// grid-auto-flow: row; // grid-auto-flow: row;
grid-template-rows: repeat(4, 1fr); grid-template-rows: repeat(3, 1fr);
grid-template-columns: unset; grid-template-columns: unset;
overflow-x: hidden; overflow-x: hidden;
} }
@media (min-width: 970px) { @media (min-width: 970px) {
grid-template-columns: unset; grid-template-columns: unset;
grid-template-rows: repeat(4, 1fr); grid-template-rows: repeat(3, 1fr);
} }
@media (min-width: 1300px) { @media (min-width: 1300px) {
grid-template-columns: unset; grid-template-columns: unset;
grid-template-rows: repeat(4, 1fr); grid-template-rows: repeat(3, 1fr);
} }
} }