diff options
author | Michael Grosser <development@stp-ip.net> | 2017-09-15 20:06:57 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-15 20:06:57 +0300 |
commit | a5b2d92a3fd49c0bc293737916bad2f16d6cc664 (patch) | |
tree | a00318131628d557db8627aca34da3cd71baeacf /static | |
parent | d484f239dd2229c631b50b5f645726fe5598e9f9 (diff) |
Revert "Fix body height"revert-27-fixWhiteBar
Diffstat (limited to 'static')
-rw-r--r-- | static/assets/css/main.css | 6 | ||||
-rw-r--r-- | static/assets/css/page.css | 60 | ||||
-rw-r--r-- | static/images/backgrounds/bg1.jpg | bin | 0 -> 11383 bytes | |||
-rw-r--r-- | static/images/backgrounds/bg2.jpg | bin | 0 -> 25424 bytes | |||
-rw-r--r-- | static/images/backgrounds/bg3.jpg | bin | 0 -> 123221 bytes | |||
-rw-r--r-- | static/images/backgrounds/bg4.png | bin | 0 -> 45154 bytes |
6 files changed, 55 insertions, 11 deletions
diff --git a/static/assets/css/main.css b/static/assets/css/main.css index 8b735ac..93ec2ed 100644 --- a/static/assets/css/main.css +++ b/static/assets/css/main.css @@ -536,6 +536,12 @@ button, #main .avatar:before { left: -2em; width: calc(100% + 4em); } } + body.is-loading #main { + opacity: 0; + -moz-transform: rotateX(15deg); + -webkit-transform: rotateX(15deg); + -ms-transform: rotateX(15deg); + transform: rotateX(15deg); } /* Footer */ #footer { diff --git a/static/assets/css/page.css b/static/assets/css/page.css index 34cba0b..75a69cb 100644 --- a/static/assets/css/page.css +++ b/static/assets/css/page.css @@ -1,16 +1,54 @@ +/* Basic */ +@media screen { + html, body { + min-width: 320px; } } +body.is-loading *, body.is-loading *:before, body.is-loading *:after { + -moz-animation: none !important; + -webkit-animation: none !important; + -ms-animation: none !important; + animation: none !important; + -moz-transition: none !important; + -webkit-transition: none !important; + -ms-transition: none !important; + transition: none !important; } + html { - height: 100vh; -} + height: 100%; } body { - height: 100vh; - margin: 0; - background-attachment: fixed; + height: 100%; background-color: #ffffff; - background-image: url("images/overlay.png"), -moz-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); - background-image: url("images/overlay.png"), -webkit-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); - background-image: url("images/overlay.png"), -ms-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); - background-image: url("images/overlay.png"), linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); - -} + background-image: url("images/overlay.png"), -moz-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url("../../images/backgrounds/bg1.jpg"); + background-image: url("images/overlay.png"), -webkit-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url("../../images/backgrounds/bg1.jpg"); + background-image: url("images/overlay.png"), -ms-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url("../../images/backgrounds/bg1.jpg"); + background-image: url("images/overlay.png"), linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)), url("../../images/backgrounds/bg1.jpg"); + background-repeat: repeat, no-repeat, no-repeat; + background-size: 100px 100px, cover, cover; + background-position: top left, center center, bottom center; + background-attachment: fixed, fixed, fixed; } + body:after { + content: ''; + display: block; + position: fixed; + top: 0; + left: 0; + width: 100%; + height: inherit; + opacity: 0; + z-index: 1; + background-color: #ffffff; + background-image: url("images/overlay.png"), -moz-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); + background-image: url("images/overlay.png"), -webkit-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); + background-image: url("images/overlay.png"), -ms-linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); + background-image: url("images/overlay.png"), linear-gradient(60deg, rgba(255, 165, 150, 0.5) 5%, rgba(0, 228, 255, 0.35)); + background-repeat: repeat, no-repeat; + background-size: 100px 100px, cover; + background-position: top left, center center; + -moz-transition: opacity 1.75s ease-out; + -webkit-transition: opacity 1.75s ease-out; + -ms-transition: opacity 1.75s ease-out; + transition: opacity 1.75s ease-out; } + body.is-loading:after { + opacity: 1; } +/*# sourceMappingURL=page.css.map */ diff --git a/static/images/backgrounds/bg1.jpg b/static/images/backgrounds/bg1.jpg Binary files differnew file mode 100644 index 0000000..03a7991 --- /dev/null +++ b/static/images/backgrounds/bg1.jpg diff --git a/static/images/backgrounds/bg2.jpg b/static/images/backgrounds/bg2.jpg Binary files differnew file mode 100644 index 0000000..5acaaa8 --- /dev/null +++ b/static/images/backgrounds/bg2.jpg diff --git a/static/images/backgrounds/bg3.jpg b/static/images/backgrounds/bg3.jpg Binary files differnew file mode 100644 index 0000000..7ee2c69 --- /dev/null +++ b/static/images/backgrounds/bg3.jpg diff --git a/static/images/backgrounds/bg4.png b/static/images/backgrounds/bg4.png Binary files differnew file mode 100644 index 0000000..d010176 --- /dev/null +++ b/static/images/backgrounds/bg4.png |