Remove dependency on notebook LESS

ship some of flexbox, mixins

Author: minrk

build_css.js

@@ -23,10 +23,7 @@ function run(cmd) {
 }
 
 run(['lessc',
-    '--include-path=' + [
-        './less_include/notebook/notebook/static',
-        './less_include',
-        ].join(path.delimiter),
+    '--include-path=./less_include',
     source,
     css_destination,
 ]);

ipywidgets/static/widgets/less/flexbox.less

@@ -0,0 +1,106 @@
+
+/* Flexible box model classes */
+/* Taken from Alex Russell http://infrequently.org/2009/08/css-3-progress/ */
+
+/* This file is a compatability layer.  It allows the usage of flexible box 
+model layouts accross multiple browsers, including older browsers.  The newest,
+universal implementation of the flexible box model is used when available (see
+`Modern browsers` comments below).  Browsers that are known to implement this 
+new spec completely include:
+
+    Firefox 28.0+
+    Chrome 29.0+
+    Internet Explorer 11+ 
+    Opera 17.0+
+
+Browsers not listed, including Safari, are supported via the styling under the
+`Old browsers` comments below.
+*/
+
+
+.hbox() {
+    /* Old browsers */
+    display: -webkit-box;
+    -webkit-box-orient: horizontal;
+    -webkit-box-align: stretch;
+
+    display: -moz-box;
+    -moz-box-orient: horizontal;
+    -moz-box-align: stretch;
+
+    display: box;
+    box-orient: horizontal;
+    box-align: stretch;
+
+    /* Modern browsers */
+    display: flex;
+    flex-direction: row;
+    align-items: stretch;
+}
+
+.vbox() {
+    /* Old browsers */
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-box-align: stretch;
+
+    display: -moz-box;
+    -moz-box-orient: vertical;
+    -moz-box-align: stretch;
+
+    display: box;
+    box-orient: vertical;
+    box-align: stretch;
+
+    /* Modern browsers */
+    display: flex;
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.box-flex0() {
+    /* Old browsers */
+    -webkit-box-flex: 0;
+    -moz-box-flex: 0;
+    box-flex: 0;
+    
+    /* Modern browsers */
+    flex: none;
+    width: auto;
+}
+
+.box-flex1() {
+    /* Old browsers */
+    -webkit-box-flex: 1;
+    -moz-box-flex: 1;
+    box-flex: 1;
+
+    /* Modern browsers */
+    flex: 1;
+}
+
+.box-flex() {
+    /* Old browsers */
+    .box-flex1();
+}
+
+.box-flex2() {
+    /* Old browsers */
+    -webkit-box-flex: 2;
+    -moz-box-flex: 2;
+    box-flex: 2;
+
+    /* Modern browsers */
+    flex: 2;
+}
+
+.align-start() {
+    /* Old browsers */
+    -webkit-box-align: start;
+    -moz-box-align: start;
+    box-align: start;
+    
+    /* Modern browsers */
+    align-items: flex-start;
+}
+

ipywidgets/static/widgets/less/mixins.less

@@ -0,0 +1,12 @@
+// Mixin CSS classes
+
+.border-box-sizing() {
+    box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+}
+
+.corner-all() {
+    border-radius: @border-radius-base;
+}
+

ipywidgets/static/widgets/less/widgets.less

@@ -6,11 +6,9 @@
 @import "/components/font-awesome/less/variables.less";
 
 // import variables, mixins from Notebook
-@import "/base/less/variables.less";
-@import "/base/less/mixins.less";
-@import "/base/less/flexbox.less";
-
-@import "/notebook/less/variables.less";
+// layout mixins
+@import "./flexbox.less";
+@import "./mixins.less";
 
 @widget-width: 350px;
 @widget-width-short: 150px;
@@ -58,7 +56,6 @@
         content: @fa-var-chain-broken;
         font-family: 'FontAwesome';
         color: @brand-danger;
-        font-size: @notebook_font_size;
         top: 3px;
         padding: 3px;
     }
@@ -133,7 +130,6 @@
         .ui-slider-range {
             height     : 12px;
             margin-top : -4px;
-            background : @page-backdrop-color; 
         }
     }
 }
@@ -178,7 +174,6 @@
         .ui-slider-range {
             width       : 12px;
             margin-left : -1px;
-            background  : @page-backdrop-color; 
         }
     }
 }

setup.py

@@ -27,22 +27,14 @@
 # get on with it
 #-----------------------------------------------------------------------------
 
-import errno
 import os
-import shutil
 from distutils import log
 from distutils.core import setup, Command
 from distutils.command.build_py import build_py
 from distutils.command.sdist import sdist
 from glob import glob
 from os.path import join as pjoin
 from subprocess import check_call
-from zipfile import ZipFile
-
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
 
 
 repo_root = os.path.dirname(os.path.abspath(__file__))
@@ -149,52 +141,14 @@ def run(self):
             update_package_data(self.distribution)
     return DecoratedCommand
 
+
 def update_package_data(distribution):
     """update package_data to catch changes during setup"""
     build_py = distribution.get_command_obj('build_py')
     # distribution.package_data = find_package_data()
     # re-init build_py options which load package_data
     build_py.finalize_options()
 
-class FetchNotebook(Command):
-    description = "Fetch Notebook source, needed for LESS sources"
-
-    user_options = []
-    
-    def initialize_options(self):
-        pass
-    
-    def finalize_options(self):
-        pass
-    
-    # FIXME: update url to 4.0 when notebook is released
-    url = "https://github.com/jupyter/notebook/archive/master.zip"
-    
-    def run(self):
-        nb_dir = pjoin('less_include', 'notebook')
-        nb_zip = pjoin('less_include', 'notebook.zip')
-        if os.path.exists(nb_dir):
-            return
-        try:
-            os.mkdir('less_include')
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                raise
-        if not os.path.exists(nb_zip):
-            log.info("downloading %s" % self.url)
-            r = urlopen(self.url)
-            with open(nb_zip, 'wb') as f:
-                for chunk in r:
-                    f.write(chunk)
-        log.info("unzipping notebook")
-        zf = ZipFile(nb_zip)
-        if os.path.exists('notebook-tmp'):
-            shutil.rmtree('notebook-tmp')
-        zf.extractall('notebook-tmp')
-        d = glob(pjoin('notebook-tmp', '*'))[0]
-        shutil.move(d, nb_dir)
-        os.rmdir('notebook-tmp')
-    
 
 class NPM(Command):
     description = "install package,json dependencies using npm"
@@ -223,7 +177,6 @@ def should_run_npm(self):
         return mtime(self.node_modules) < mtime(pjoin(repo_root, 'package.json'))
 
     def run(self):
-        self.distribution.run_command('fetch_notebook')
         if self.should_run_npm():
             print("installing build dependencies with npm")
             check_call(['npm', 'install'], cwd=repo_root)
@@ -286,7 +239,6 @@ def run(self):
         'build_py': js_prerelease(build_py),
         'sdist': js_prerelease(sdist, strict=True),
         'jsdeps': NPM,
-        'fetch_notebook': FetchNotebook,
     },
 )