Merge branch 'master' of Tolstoevsky/switching into master

This commit is contained in:
Tolstoevsky 2019-07-31 13:36:20 +00:00 committed by Gitea
commit 46f0cf0f83

View File

@ -3,7 +3,7 @@ html, body {
} }
.mainContainer { .mainContainer {
width: 85%; width: 1024px;
margin: auto; margin: auto;
min-height: 100%; min-height: 100%;
} }
@ -200,13 +200,116 @@ img, iframe {
max-width: 100%; max-width: 100%;
} }
@media only screen and (max-width : 640px) { @media only screen and (max-width : 1024px) {
nav { nav {
display: block; display: block;
overflow: hidden; overflow: hidden;
background-color: #93ff83; background-color: #93ff83;
} }
.mainContainer {
width: 968px;
}
.mainContainer > nav > a {
margin: 10px;
}
.mainContainer > nav > a > div {
transform: initial;
top: 0;
position: static;
}
.floatRight {
float: none;
}
.mainContainer img,
.mainContainer iframe {
margin: 15px 0;
}
}
@media only screen and (max-width : 968px) {
nav {
display: block;
overflow: hidden;
background-color: #93ff83;
}
.mainContainer {
width: 800px;
}
.mainContainer > nav > a {
margin: 10px;
}
.mainContainer > nav > a > div {
transform: initial;
top: 0;
position: static;
}
.floatRight {
float: none;
}
.mainContainer img,
.mainContainer iframe {
margin: 15px 0;
}
}
@media only screen and (max-width : 800px) {
nav {
display: block;
overflow: hidden;
background-color: #93ff83;
}
.mainContainer {
width: 640px;
}
.mainContainer > nav > a {
margin: 10px;
}
.mainContainer > nav > a > div {
transform: initial;
top: 0;
position: static;
}
.floatRight {
float: none;
}
.mainContainer img,
.mainContainer iframe {
margin: 15px 0;
}
}
@media only screen and (max-width : 640px) {
nav {
display: block;
overflow: hidden;
background-color: #93ff83;
}
.mainContainer {
width: 600px;
}
.mainContainer > nav > a { .mainContainer > nav > a {
margin: 10px; margin: 10px;
} }