From 7068d354e8205dd7cc4e9c95ba57274a62c5062c Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Thu, 4 Dec 2014 11:32:30 +0100 Subject: [PATCH] Update layout. --- src/_h5ai/client/css/inc/general.less | 3 +++ src/_h5ai/client/css/inc/sidebar.less | 20 +++++++------------ .../js/lib/jquery.scrollpanel-0.4.0.min.js | 2 -- 3 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 src/_h5ai/client/js/lib/jquery.scrollpanel-0.4.0.min.js diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 2e69b556..55b34e34 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -91,4 +91,7 @@ body { justify-content: flex-start; align-content: flex-start; align-items: stretch; + + // non-webkit fix; + height: 0; } diff --git a/src/_h5ai/client/css/inc/sidebar.less b/src/_h5ai/client/css/inc/sidebar.less index 2d75cfab..4995319c 100644 --- a/src/_h5ai/client/css/inc/sidebar.less +++ b/src/_h5ai/client/css/inc/sidebar.less @@ -6,8 +6,6 @@ order: 99; width: 200px; padding: 8px 16px; - // background-color: @col-widget-back; - // border-left: @border-widget; background: #eaeaea; } @@ -34,9 +32,9 @@ height: 30px; line-height: 30px; padding: 0 10px; - outline: none; + outline: 0; - &:hover, &.hover { + &:hover { opacity: 1.0; box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4); } @@ -45,8 +43,7 @@ .current { a, span.element { opacity: 1.0; - // background: @col-widget-back-highlight; - background: rgba(0,0,0,0.02); + background: rgba(0,0,0,0.03); box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4); } } @@ -64,11 +61,10 @@ } .select { - // background-color: @col-widget-back-highlight; background: transparent; width: 175px; overflow: hidden; - outline: none; + outline: 0; &:hover, &.hover { box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4); @@ -83,17 +79,15 @@ font-size: @font-size; font-weight: @font-weight; color: @col; - // background: @col-widget-back; background: transparent; width: 100%; height: 30px; line-height: 30px; border: 0 solid #000; cursor: pointer; - outline: none; + outline: 0; &:hover, &.hover { - // background: @col-widget-back-highlight; box-shadow: inset 0 0 4px 0 rgba(0,0,0,0.4); } } @@ -105,9 +99,9 @@ input[type='range'] { border-radius: 2px; - width: 60px; + width: 50px; margin: 0 0 4px 12px; - padding: 0 2px; + padding: 0 8px; vertical-align: middle; } diff --git a/src/_h5ai/client/js/lib/jquery.scrollpanel-0.4.0.min.js b/src/_h5ai/client/js/lib/jquery.scrollpanel-0.4.0.min.js deleted file mode 100644 index 3028afd3..00000000 --- a/src/_h5ai/client/js/lib/jquery.scrollpanel-0.4.0.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/* jQuery.scrollpanel 0.4.0 - http://larsjung.de/jquery-scrollpanel/ */ -!function(){"use strict";function o(o,t){var s=this;s.$el=e(o),s.settings=e.extend({},r,t);var n=s.settings.prefix;s.mouseOffsetY=0,s.updateId=0,s.scrollProxy=e.proxy(s.scroll,s),s.$el.css("position")&&"static"!==s.$el.css("position")||s.$el.css("position","relative"),s.$scrollbar=e('
'),s.$thumb=e('
').appendTo(s.$scrollbar),s.$el.addClass(n+"host").wrapInner('
').append(s.$scrollbar),s.$viewport=s.$el.find("> ."+n+"viewport"),s.$container=s.$viewport.find("> ."+n+"container"),s.$el.on("mousewheel",function(o,e,t,r){s.$viewport.scrollTop(s.$viewport.scrollTop()-50*r),s.update(),o.preventDefault(),o.stopPropagation()}).on("scroll",function(){s.update()}),s.$viewport.css({paddingRight:s.$scrollbar.outerWidth(!0),height:s.$el.height(),overflow:"hidden"}),s.$container.css({overflow:"hidden"}),s.$scrollbar.css({position:"absolute",top:0,right:0,overflow:"hidden"}).on("mousedown",function(o){s.mouseOffsetY=s.$thumb.outerHeight()/2,s.onMousedown(o)}).each(function(){s.onselectstart=function(){return!1}}),s.$thumb.css({position:"absolute",left:0,width:"100%"}).on("mousedown",function(o){s.mouseOffsetY=o.pageY-s.$thumb.offset().top,s.onMousedown(o)}),s.update()}var e=jQuery,t=e(window),s="scrollpanel",r={prefix:"sp-"};e.extend(o.prototype,{update:function(o){var e=this;e.updateId&&!o?(clearInterval(e.updateId),e.updateId=0):!e.updateId&&o&&(e.updateId=setInterval(function(){e.update(!0)},50)),e.$viewport.css("height",e.$el.height());var t=e.$el.height(),s=e.$container.outerHeight(),r=e.$viewport.scrollTop(),n=r/s,i=Math.min(t/s,1),l=e.$scrollbar.height();1>i?(e.$scrollbar.css({height:e.$el.innerHeight()+l-e.$scrollbar.outerHeight(!0)}).fadeIn(50),e.$thumb.css({top:l*n,height:l*i})):e.$scrollbar.fadeOut(50)},scroll:function(o){var e=this,t=(o.pageY-e.$scrollbar.offset().top-e.mouseOffsetY)/e.$scrollbar.height();e.$viewport.scrollTop(e.$container.outerHeight()*t),e.update(),o.preventDefault(),o.stopPropagation()},onMousedown:function(o){var e=this;e.scroll(o),e.$scrollbar.addClass("active"),t.on("mousemove",e.scrollProxy).one("mouseup",function(o){e.$scrollbar.removeClass("active"),t.off("mousemove",e.scrollProxy),e.scroll(o)})}}),e.fn[s]=function(t,r){return this.each(function(){var n=e(this),i=n.data(s);i||(i=new o(this,t),i.update(),n.data(s,i)),"update"===t&&i.update(r)})}}(); \ No newline at end of file