From a35b7a7e819631b6398fd12542a0406f59a87d3a Mon Sep 17 00:00:00 2001 From: "Brian E. Granger" Date: Wed, 15 May 2013 16:05:10 -0700 Subject: [PATCH] More movign around of things in notebook and js/less. --- .../notebook/static/ipython/base/less/mixins.less | 11 +++++++++++ .../notebook/static/ipython/base/less/variables.less | 4 +--- .../static/ipython/notebooks/less/variables.less | 12 ++---------- .../html/notebook/templates/{base.html => page.html} | 0 4 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 IPython/frontend/html/notebook/static/ipython/base/less/mixins.less rename IPython/frontend/html/notebook/templates/{base.html => page.html} (100%) diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/mixins.less b/IPython/frontend/html/notebook/static/ipython/base/less/mixins.less new file mode 100644 index 000000000..203299788 --- /dev/null +++ b/IPython/frontend/html/notebook/static/ipython/base/less/mixins.less @@ -0,0 +1,11 @@ +// Mixin CSS classes + +.border-box-sizing { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +.corner-all { + border-radius: @corner_radius; +} \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/ipython/base/less/variables.less b/IPython/frontend/html/notebook/static/ipython/base/less/variables.less index fe3b15dfc..084d40fd3 100644 --- a/IPython/frontend/html/notebook/static/ipython/base/less/variables.less +++ b/IPython/frontend/html/notebook/static/ipython/base/less/variables.less @@ -1,5 +1,3 @@ -// Our customizations to bootstrap +// Our customizations to bootstrap no here. @textColor: @black; - -@baseFontSize: 10pt; \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less b/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less index 72cf639ee..2e45ab9c8 100644 --- a/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less +++ b/IPython/frontend/html/notebook/static/ipython/notebooks/less/variables.less @@ -1,3 +1,5 @@ +// Bootstrap customizations specific to this page. + @corner_radius: 4px; @notebook_background : white; @cell_selected_background: darken(@notebook_background, 2%); @@ -6,14 +8,4 @@ @light_border_color: darken(@cell_selected_background, 17%); @borderwidth : 1px; @fontBaseColor : black; - @baseFontSize: 30pt; - - - - -// utilities mixins - -.corner-all { - border-radius:@corner_radius; -} diff --git a/IPython/frontend/html/notebook/templates/base.html b/IPython/frontend/html/notebook/templates/page.html similarity index 100% rename from IPython/frontend/html/notebook/templates/base.html rename to IPython/frontend/html/notebook/templates/page.html