Merge branch 'master' into gh-pages
This commit is contained in:
commit
32f7c6b162
11 changed files with 68 additions and 25 deletions
|
|
@ -223,7 +223,6 @@
|
||||||
.pcjs-copyright a {
|
.pcjs-copyright a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 800px) {
|
@media screen and (max-width: 800px) {
|
||||||
.pcjs-textarea {
|
.pcjs-textarea {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
|
|
@ -242,7 +241,6 @@
|
||||||
padding-right: 0 !important;
|
padding-right: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 1200px) {
|
@media screen and (min-width: 1200px) {
|
||||||
.machine-left {
|
.machine-left {
|
||||||
max-width: 48%;
|
max-width: 48%;
|
||||||
|
|
|
||||||
|
|
@ -53,12 +53,12 @@ function addStickyMachine(idMachine)
|
||||||
if (topMachine < 0) {
|
if (topMachine < 0) {
|
||||||
topMachine = findTop(machine);
|
topMachine = findTop(machine);
|
||||||
}
|
}
|
||||||
machine.className = machine.className.replace(/pcjs-machine-(floating|sticky) /g, '');
|
machine.className = machine.className.replace(/machine-(floating|sticky) /g, '');
|
||||||
if (window.pageYOffset <= topMachine) {
|
if (window.pageYOffset <= topMachine) {
|
||||||
machine.className = 'pcjs-machine-floating ' + machine.className;
|
machine.className = 'machine-floating ' + machine.className;
|
||||||
if (machineSibling) machineSibling.style.paddingTop = 0;
|
if (machineSibling) machineSibling.style.paddingTop = 0;
|
||||||
} else {
|
} else {
|
||||||
machine.className = 'pcjs-machine-sticky ' + machine.className;
|
machine.className = 'machine-sticky ' + machine.className;
|
||||||
if (machineSibling) machineSibling.style.paddingTop = machine.offsetHeight + 'px';
|
if (machineSibling) machineSibling.style.paddingTop = machine.offsetHeight + 'px';
|
||||||
}
|
}
|
||||||
if (prevOnScroll) prevOnScroll();
|
if (prevOnScroll) prevOnScroll();
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,19 @@ pre a, code a {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
.machine-floating {
|
||||||
|
position: relative;
|
||||||
|
z-index: auto;
|
||||||
|
background-color: transparent;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
.machine-sticky {
|
||||||
|
position: fixed !important;
|
||||||
|
z-index: 1 !important;
|
||||||
|
background-color: #404040 !important;
|
||||||
|
padding-right: 16px !important;
|
||||||
|
top: 0 !important;
|
||||||
|
}
|
||||||
.common-top {
|
.common-top {
|
||||||
background: #202020;
|
background: #202020;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
|
||||||
|
|
@ -228,19 +228,6 @@
|
||||||
.pcjs-copyright a {
|
.pcjs-copyright a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
.pcjs-machine-floating {
|
|
||||||
position: relative;
|
|
||||||
z-index: auto;
|
|
||||||
background-color: transparent;
|
|
||||||
padding-right: 0;
|
|
||||||
}
|
|
||||||
.pcjs-machine-sticky {
|
|
||||||
position: fixed !important;
|
|
||||||
z-index: 1 !important;
|
|
||||||
background-color: #404040 !important;
|
|
||||||
padding-right: 16px !important;
|
|
||||||
top: 0 !important;
|
|
||||||
}
|
|
||||||
@media screen and (max-width: 800px) {
|
@media screen and (max-width: 800px) {
|
||||||
.pcjs-textarea {
|
.pcjs-textarea {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
|
|
@ -259,7 +246,6 @@
|
||||||
padding-right: 0 !important;
|
padding-right: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 1200px) {
|
@media screen and (min-width: 1200px) {
|
||||||
.machine-left {
|
.machine-left {
|
||||||
max-width: 48%;
|
max-width: 48%;
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,19 @@ pre a, code a {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
.machine-floating {
|
||||||
|
position: relative;
|
||||||
|
z-index: auto;
|
||||||
|
background-color: transparent;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
.machine-sticky {
|
||||||
|
position: fixed !important;
|
||||||
|
z-index: 1 !important;
|
||||||
|
background-color: #404040 !important;
|
||||||
|
padding-right: 16px !important;
|
||||||
|
top: 0 !important;
|
||||||
|
}
|
||||||
.common-top {
|
.common-top {
|
||||||
background: #202020;
|
background: #202020;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,19 @@ pre a, code a {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
.machine-floating {
|
||||||
|
position: relative;
|
||||||
|
z-index: auto;
|
||||||
|
background-color: transparent;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
.machine-sticky {
|
||||||
|
position: fixed !important;
|
||||||
|
z-index: 1 !important;
|
||||||
|
background-color: #404040 !important;
|
||||||
|
padding-right: 16px !important;
|
||||||
|
top: 0 !important;
|
||||||
|
}
|
||||||
.common-top {
|
.common-top {
|
||||||
background: #202020;
|
background: #202020;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
|
||||||
|
|
@ -223,7 +223,6 @@
|
||||||
.pcjs-copyright a {
|
.pcjs-copyright a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 800px) {
|
@media screen and (max-width: 800px) {
|
||||||
.pcjs-textarea {
|
.pcjs-textarea {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
|
|
@ -242,7 +241,6 @@
|
||||||
padding-right: 0 !important;
|
padding-right: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 1200px) {
|
@media screen and (min-width: 1200px) {
|
||||||
.machine-left {
|
.machine-left {
|
||||||
max-width: 48%;
|
max-width: 48%;
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,19 @@ pre a, code a {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
.machine-floating {
|
||||||
|
position: relative;
|
||||||
|
z-index: auto;
|
||||||
|
background-color: transparent;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
.machine-sticky {
|
||||||
|
position: fixed !important;
|
||||||
|
z-index: 1 !important;
|
||||||
|
background-color: #404040 !important;
|
||||||
|
padding-right: 16px !important;
|
||||||
|
top: 0 !important;
|
||||||
|
}
|
||||||
.common-top {
|
.common-top {
|
||||||
background: #202020;
|
background: #202020;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
|
||||||
|
|
@ -223,7 +223,6 @@
|
||||||
.pcjs-copyright a {
|
.pcjs-copyright a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 800px) {
|
@media screen and (max-width: 800px) {
|
||||||
.pcjs-textarea {
|
.pcjs-textarea {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
|
|
@ -242,7 +241,6 @@
|
||||||
padding-right: 0 !important;
|
padding-right: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 1200px) {
|
@media screen and (min-width: 1200px) {
|
||||||
.machine-left {
|
.machine-left {
|
||||||
max-width: 48%;
|
max-width: 48%;
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,19 @@ pre a, code a {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
.machine-floating {
|
||||||
|
position: relative;
|
||||||
|
z-index: auto;
|
||||||
|
background-color: transparent;
|
||||||
|
padding-right: 0;
|
||||||
|
}
|
||||||
|
.machine-sticky {
|
||||||
|
position: fixed !important;
|
||||||
|
z-index: 1 !important;
|
||||||
|
background-color: #404040 !important;
|
||||||
|
padding-right: 16px !important;
|
||||||
|
top: 0 !important;
|
||||||
|
}
|
||||||
.common-top {
|
.common-top {
|
||||||
background: #202020;
|
background: #202020;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
|
||||||
|
|
@ -223,7 +223,6 @@
|
||||||
.pcjs-copyright a {
|
.pcjs-copyright a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 800px) {
|
@media screen and (max-width: 800px) {
|
||||||
.pcjs-textarea {
|
.pcjs-textarea {
|
||||||
width: 100% !important;
|
width: 100% !important;
|
||||||
|
|
@ -242,7 +241,6 @@
|
||||||
padding-right: 0 !important;
|
padding-right: 0 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 1200px) {
|
@media screen and (min-width: 1200px) {
|
||||||
.machine-left {
|
.machine-left {
|
||||||
max-width: 48%;
|
max-width: 48%;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue