From da6f8749db09305e52a59cd615dc59233cba0e9a Mon Sep 17 00:00:00 2001 From: devfake Date: Mon, 22 Jun 2015 17:27:53 +0200 Subject: [PATCH] bit styling --- site/client/assets/sass/_chat.scss | 6 +++--- site/client/assets/sass/_modal.scss | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/site/client/assets/sass/_chat.scss b/site/client/assets/sass/_chat.scss index b9598ad..12a94c3 100644 --- a/site/client/assets/sass/_chat.scss +++ b/site/client/assets/sass/_chat.scss @@ -24,13 +24,13 @@ .chats { float: left; - overflow-y: scroll; - height: calc(100% - 100px); + overflow-y: auto; + height: calc(100% - 80px); width: 100%; } .chatbox { - height: 100px; + height: 80px; float: left; width: 100%; border: 0; diff --git a/site/client/assets/sass/_modal.scss b/site/client/assets/sass/_modal.scss index 0acdeee..01a30fa 100644 --- a/site/client/assets/sass/_modal.scss +++ b/site/client/assets/sass/_modal.scss @@ -16,7 +16,7 @@ top: 0; right: 0; bottom: 0; - background: rgba(14,27,43,.5); + background: rgba(14, 27, 43, .5); z-index: 10; opacity: 0; visibility: hidden; @@ -24,18 +24,25 @@ &.active { visibility: visible; opacity: 1; - transition: all .3s ease-in-out 0s; + + @include transition(); } } .modal-banner { z-index: 20; - background: rgba(6,13,22,.95); + background: rgba(6, 13, 22, .95); width: 100%; color: #fff; padding: 50px 0; - margin: 25vh 0 0 0; + margin: 24vh 0 0 0; float: left; + + .active & { + @include transition(); + + margin: 25vh 0 0 0; + } } .icon-content-load { @@ -71,6 +78,6 @@ cursor: pointer; &:hover { - color: #8798ac; + color: #8798ac; } } \ No newline at end of file