diff options
author | Marvin Borner | 2018-04-24 18:05:12 +0200 |
---|---|---|
committer | Marvin Borner | 2018-04-24 18:06:37 +0200 |
commit | 0ddf1d1ca8111132259d139b4fc498f06978e9e5 (patch) | |
tree | 2ddbb79c7edd777565f7c2bbed0b99938732202f /main/app/sprinkles/core/assets | |
parent | cf15f460a7384e81cb98e62d99120a3cd940ca60 (diff) |
Fixed some chat things - fixes #1
Diffstat (limited to 'main/app/sprinkles/core/assets')
3 files changed, 131 insertions, 20 deletions
diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/main.css b/main/app/sprinkles/core/assets/SiteAssets/css/main.css index a3c89ad..01ec6b1 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/main.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/main.css @@ -23,7 +23,7 @@ GENERAL background: transparent; } -body { +html, body { font-family: 'Nanum Gothic', sans-serif; height: 100%; width: 100%; @@ -60,7 +60,7 @@ hr.ShorterLine { } /******* -FLICKITY +SWIPEABLE *******/ .main-carousel { background: #EEE; @@ -68,15 +68,15 @@ FLICKITY .carousel-cell { width: 100%; - height: calc(100vh - 75px); - height: -moz-calc(100vh - 75px); - height: -webkit-calc(100vh - 75px); - height: -o-calc(100vh - 75px); - height: calc(100vh - 75px); + height: 100%; background: #0c1d34; counter-increment: carousel-cell; } +.draggable, .slick-track { + height: 100%; +} + /****** HEADER ******/ @@ -109,7 +109,7 @@ HEADER /*********** GENERAL TABS ***********/ -.MainInTab { +.MainTabWindows, .MainInTab { height: 100%; } @@ -174,12 +174,16 @@ CHAT WINDOW margin: 5px; } +hr.ChatHeaderDivider { + margin-bottom: 0.6em; /* cause of symmetry things */ +} + .ChatMessages { overflow-y: scroll; - max-height: calc(100% - 135px); /* navbar + input + some margin*/ - max-height: -moz-calc(100% - 135px); - max-height: -webkit-calc(100% - 135px); - max-height: -o-calc(100% - 135px); + max-height: calc(100% - 215px); /* navbar + input + some margin*/ + max-height: -moz-calc(100% - 215px); + max-height: -webkit-calc(100% - 215px); + max-height: -o-calc(100% - 215px); height: 100%; width: 100%; } @@ -194,7 +198,7 @@ CHAT WINDOW word-wrap: break-word; text-align: center; padding: 8px; - font-size: 0.9em; + font-size: 0.85em; } .ServerChatMessage { @@ -221,7 +225,7 @@ CHAT WINDOW .MessageReceived { float: left; background-color: #13223c; - color: #f3f4f5; + color: #a7a8a9; } .AloneMessage { @@ -255,7 +259,7 @@ CHAT WINDOW height: 40px; padding-left: 15px; padding-right: 15px; - bottom: 90px; /* 75+15 */ + bottom: 165px; /* 75+15 MATH GENIUS */ z-index: 600; border: none; -webkit-border-radius: 25px; diff --git a/main/app/sprinkles/core/assets/SiteAssets/css/slick.css b/main/app/sprinkles/core/assets/SiteAssets/css/slick.css index 4169151..5910f93 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/css/slick.css +++ b/main/app/sprinkles/core/assets/SiteAssets/css/slick.css @@ -1,2 +1,104 @@ -.slick-slider{position:relative;display:block;box-sizing:border-box;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-touch-callout:none;-khtml-user-select:none;-ms-touch-action:pan-y;touch-action:pan-y;-webkit-tap-highlight-color:transparent}.slick-list{position:relative;display:block;overflow:hidden;margin:0;padding:0}.slick-list:focus{outline:0}.slick-list.dragging{cursor:pointer;cursor:hand}.slick-slider .slick-list,.slick-slider .slick-track{-webkit-transform:translate3d(0,0,0);-moz-transform:translate3d(0,0,0);-ms-transform:translate3d(0,0,0);-o-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}.slick-track{position:relative;top:0;left:0;display:block;margin-left:auto;margin-right:auto}.slick-track:after,.slick-track:before{display:table;content:''}.slick-track:after{clear:both}.slick-loading .slick-track{visibility:hidden}.slick-slide{display:none;float:left;height:100%;min-height:1px}[dir=rtl] .slick-slide{float:right}.slick-slide img{display:block}.slick-slide.slick-loading img{display:none}.slick-slide.dragging img{pointer-events:none}.slick-initialized .slick-slide{display:block}.slick-loading .slick-slide{visibility:hidden}.slick-vertical .slick-slide{display:block;height:auto;border:1px solid transparent}.slick-arrow.slick-hidden{display:none} +.slick-slider { + position: relative; + display: block; + box-sizing: border-box; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -webkit-touch-callout: none; + -khtml-user-select: none; + -ms-touch-action: pan-y; + touch-action: pan-y; + -webkit-tap-highlight-color: transparent +} + +.slick-list { + position: relative; + display: block; + overflow: hidden; + margin: 0; + padding: 0 +} + +.slick-list:focus { + outline: 0 +} + +.slick-list.dragging { + cursor: pointer; + cursor: hand +} + +.slick-slider .slick-list, .slick-slider .slick-track { + -webkit-transform: translate3d(0, 0, 0); + -moz-transform: translate3d(0, 0, 0); + -ms-transform: translate3d(0, 0, 0); + -o-transform: translate3d(0, 0, 0); + transform: translate3d(0, 0, 0) +} + +.slick-track { + position: relative; + top: 0; + left: 0; + display: block; + margin-left: auto; + margin-right: auto +} + +.slick-track:after, .slick-track:before { + display: table; + content: '' +} + +.slick-track:after { + clear: both +} + +.slick-loading .slick-track { + visibility: hidden +} + +.slick-slide { + display: none; + float: left; + height: 100%; + min-height: 1px +} + +[dir=rtl] .slick-slide { + float: right +} + +.slick-slide img { + display: block +} + +.slick-slide.slick-loading img { + display: none +} + +.slick-slide.dragging img { + pointer-events: none +} + +.slick-initialized .slick-slide { + display: block +} + +.slick-loading .slick-slide { + visibility: hidden +} + +.slick-vertical .slick-slide { + display: block; + height: auto; + border: 1px solid transparent +} + +.slick-arrow.slick-hidden { + display: none +} + /*# sourceMappingURL=slick.min.css.map */
\ No newline at end of file diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/main.js b/main/app/sprinkles/core/assets/SiteAssets/js/main.js index 602eb8b..8341cbf 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/main.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/main.js @@ -16,10 +16,8 @@ NavbarLine .data("origWidth", NavbarLine.width()); NavbarIconWrap.on("click", function () { NavbarIconWrap.removeClass("ActiveTab"); - //$(this).children().attr("src", $(this).children().attr("src").split('.svg')[0] + "Activated.svg"); var index = $(this).attr('id'); MainTabWindows.slick('slickGoTo', index); - //$('.MainTabWindows').flickity().flickity('select', index); $el = $(this); leftPos = $el.position().left; NavbarLine.stop().animate({ @@ -28,8 +26,15 @@ NavbarIconWrap.on("click", function () { }, 300); }); +window.addEventListener("load",function() { + setTimeout(function(){ + // This hides the address bar: + window.scrollTo(0, 1); + }, 0); +}); + /******** - FLICKITY + SWIPEABLE *******/ MainTabWindows.slick({ initialSlide: 2, @@ -113,8 +118,8 @@ UserSearchBar.keyup(function () { SearchResults.append("<img class='avatar' src='" + answer.avatar + "'/><div class='full_name'>" + answer.full_name + "</div>"); }, error: function () { - console.log("[SEARCH LOGGER] " + RequestedUser + " not found..."); console.log("[SEARCH LOGGER] 404s are not a bug - they're a feature!"); + console.log("[SEARCH LOGGER] " + RequestedUser + " not found..."); } }); });
\ No newline at end of file |