diff --git a/assets/css/scss/_base.scss b/assets/css/scss/_base.scss index 51fb9b3b57..28f2338eab 100755 --- a/assets/css/scss/_base.scss +++ b/assets/css/scss/_base.scss @@ -534,8 +534,8 @@ hr { left: 44%; margin-left: -32px; text-align: center; - border: 1px solid rgba(0, 0, 0, 0.125) ; - border-radius: 50%; + border: 2px solid rgba(0, 188, 212, 0.37) ; + border-radius: 10px; img{ transition: transform .2s ease-in; padding-top: 10px; diff --git a/assets/js/app.js b/assets/js/app.js index a0b20f391b..4c63bf8a18 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -64,12 +64,6 @@ $(function() { checkBrand(); - var id; - $(window).resize(function() { - clearTimeout(id); - id = setTimeout(doneResizing, 200); - }); - // Removes the yellow input in Chrome if (navigator.userAgent.toLowerCase().indexOf("chrome") >= 0) { $(window).on("load", function () { @@ -272,8 +266,12 @@ $(function() { var id = $(this).attr('id') + '_options'; var button = $(this); $("#" + id).toggle(); - - $("#card-container").css("height","100vh"); + console.log($("#card-container").height()); + if($("#card-container").height()>700){ + $("#card-container").css("height","auto"); + } else { + $("#card-container").css("height","100vh"); + } if($("#column-left").hasClass("col-md-12")){ $("#column-left").removeClass('col-md-12'); @@ -628,22 +626,7 @@ if (typeof CKEDITOR !== 'undefined') { }; } -function doneResizing() { - var widthWindow = $(window).width(); - if ((widthWindow>=1024) && (widthWindow>=768)) { - $("#profileCollapse").addClass("in"); - $("#courseCollapse").addClass("in"); - $("#skillsCollapse").addClass("in"); - $("#sn-sidebar-collapse").addClass("in"); - $("#user_image_block").removeClass("text-muted"); - } else { - $("#profileCollapse").removeClass("in"); - $("#courseCollapse").removeClass("in"); - $("#skillsCollapse").removeClass("in"); - $("#sn-avatar-one").removeClass("in"); - $("#user_image_block").addClass("text-muted"); - } -} + function addMainEvent(elm, evType, fn, useCapture) { @@ -680,6 +663,5 @@ window.checkBrand = checkBrand; window.setCheckbox = setCheckbox; window.action_click = action_click; window.hideUnhide = hideUnhide; -window.doneResizing = doneResizing; window.addMainEvent = addMainEvent; window.showTemplates = showTemplates;