diff --git a/project/settings.py b/project/settings.py index bf64ffe0..b671f3da 100644 --- a/project/settings.py +++ b/project/settings.py @@ -199,10 +199,10 @@ ACTIVE_LINK_STRICT = True # PUSHER settings -PUSHER_APP_ID = u"" -PUSHER_KEY = u"" -PUSHER_SECRET = u"" -PUSHER_CLUSTER = u"" +PUSHER_APP_ID = s.getenv('PUSHER_APP_ID', '603232') +PUSHER_KEY = os.getenv('PUSHER_KEY', 'da02184c4a0f92f9db4a') +PUSHER_SECRET = os.getenv('PUSHER_SECRET', 'de2f4cd63136acfecc75') +PUSHER_CLUSTER = 'eu' # DRF settings diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 8a2452ec..a1e6a5bb 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -2905,18 +2905,17 @@ a.grey-link height: 20px &--heart &__content - font-size: 24px; - color: #d40700; + font-size: 24px + color: #d40700 &--chat - margin-top: 15px; + margin-top: 15px &--chat &__items - background: white; - border: 1px solid #ccc; - padding: 10px; - border-radius: 5px; - max-height: 400px; - overflow: auto; + background: white + padding: 10px + border-radius: 5px + max-height: 400px + overflow: auto +m max-height: inherit &--chat &__item, &--chat &__item_reply