Merge remote-tracking branch 'github/master' into portable

debomatic-webui/public/javascripts/page_distribution.js

@@ -503,7 +503,7 @@ function Page_Distrubion(socket) {
         init: function () {
             if (sidebarOffset === 0)
                 return;
-            if ($(window).scrollTop() > sidebarOffset) {
+            if ($(window).scrollTop() > sidebarOffset && $('#main').height() > $('#sticky').height()) {
                 sticky.show();
             } else {
                 sticky.hide();
@@ -523,11 +523,16 @@ function Page_Distrubion(socket) {
             sticky.start();
         },
         show: function () {
+            $('#sticky-package').fadeIn();
             if (config.preferences.sidebar) {
+                debug(2, 'showing sticky');
+                if ($(window).height() < $('#sticky').height()) {
+                    var size = $("#sticky-package").position().top;
+                    debug(2, 'sticky too tall - resizing', size);
+                    $('#sticky').height(size);
+                }
                 $('#sticky').addClass('fixed');
             }
-            debug(2, 'showing sticky');
-            $('#sticky-package').fadeIn();
         },
         hide: function () {
             $('#sticky').removeClass('fixed');

debomatic-webui/public/stylesheets/style.css

@@ -77,6 +77,7 @@ aside#sidebar .fixed {
   position: fixed;
   min-width: 220px !important;
   top: 0;
+  overflow: auto;
 }
 
 #sticky-package {
@@ -269,7 +270,7 @@ footer .info {
 }
 
 .ct-chart .ct-label {
-  font-size: 0.85em;
+  font-size: 0.85em !important;
 }
 
 #distributions-chart.ct-chart {

debomatic-webui/scripts/install/download_external_libs.sh

@@ -68,7 +68,7 @@ get_tablesorter
 get_github "twbs" "bootstrap" "3.2.0" "dist"
 
 # get chartist
-get_github "gionkunz" "chartist-js" "0.2.1" "libdist"
+get_github "gionkunz" "chartist-js" "0.4.0" "libdist"
 
 if [ "`ls -1`" != "" ] ; then mv * ${EXT_LIBS_DIR} ; fi
 cd && rm -r ${TMP_DIR}

debomatic-webui/views/footer.ejs

@@ -19,7 +19,7 @@
     <script src="/external_libs/tablesorter/jquery.tablesorter.min.js"></script>
     <script src="/external_libs/tablesorter/jquery.tablesorter.widgets.min.js"></script>
     <script src="/external_libs/bootstrap-3.2.0/js/bootstrap.min.js"></script>
-    <script src="/external_libs/chartist-js-0.2.1/chartist.min.js"></script>
+    <script src="/external_libs/chartist-js-0.4.0/chartist.min.js"></script>
 
     <script>
     var config = <%- JSON.stringify(web) %>

debomatic-webui/views/header.ejs

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0/css/bootstrap.min.css">
     <link rel="stylesheet" href="/external_libs/bootstrap-3.2.0/css/bootstrap-theme.min.css">
-    <link rel="stylesheet" href="/external_libs/chartist-js-0.2.1/chartist.min.css">
+    <link rel="stylesheet" href="/external_libs/chartist-js-0.4.0/chartist.min.css">
     <link rel="stylesheet" href="/external_libs/tablesorter/theme.bootstrap.css">
     <link rel="stylesheet" href="/stylesheets/style.css?<%= version %>">
   </head>