t510599/2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[fix] fix the grammatical errors which occurs after merge conflict

Browse Source
This commit is contained in:
mysper 2021-02-03 23:40:14 +08:00
parent 91ab4bae73
commit 305e90d858
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/assets/scss/news/agenda.scss
View File

@ -22,14 +22,6 @@ $max-width-small-3: 360px;
// .info-container // .info-container
@mixin infoContainer() { @mixin infoContainer() {
max-width: 80%; max-width: 80%;
<<<<<<< HEAD
// padding-left: 7%;
@media only screen and (max-width: 1030px){
max-width: 100%;
padding-left: 40px;
padding-right: 40px;
}
=======
@media screen and (max-width: 1365px) { @media screen and (max-width: 1365px) {
margin: 0 120px; margin: 0 120px;
} }
@ -44,7 +36,6 @@ $max-width-small-3: 360px;
padding-left: 40px; padding-left: 40px;
padding-right: 40px; padding-right: 40px;
} }
>>>>>>> dev2
} }
// .info-section // .info-section