##// END OF EJS Templates
Merge branch 'master' into interact-range-widgets...
Merge branch 'master' into interact-range-widgets Conflicts: IPython/html/static/style/ipython.min.css IPython/html/static/style/style.min.css IPython/html/static/widgets/js/widget_int.js

File last commit:

r15733:67701c01
r17589:157df08f merge
Show More
override.css
6 lines | 324 B | text/css | CssLexer
/*This file contains any manual css for this page that needs to override the global styles.
This is only required when different pages style the same element differently. This is just
a hack to deal with our current css styles and no new styling should be added in this file.*/
#ipython-main-app {
position: relative;
}