From 009e7713472d6bfa482a3f3b0ec20deabbad745e 2013-12-05 20:30:28 From: Brian E. Granger Date: 2013-12-05 20:30:28 Subject: [PATCH] Cleaning up indentation and spacing of less files touched. --- diff --git a/IPython/html/static/base/less/flexbox.less b/IPython/html/static/base/less/flexbox.less index 052868b..089bb39 100644 --- a/IPython/html/static/base/less/flexbox.less +++ b/IPython/html/static/base/less/flexbox.less @@ -66,8 +66,6 @@ .box-flex1(); } - - .box-flex2 { -webkit-box-flex: 2; -moz-box-flex: 2; diff --git a/IPython/html/static/notebook/less/codemirror.less b/IPython/html/static/notebook/less/codemirror.less index 512157b..aa440e2 100644 --- a/IPython/html/static/notebook/less/codemirror.less +++ b/IPython/html/static/notebook/less/codemirror.less @@ -11,8 +11,8 @@ .CodeMirror { line-height: @code_line_height; /* Changed from 1em to our global default */ - height: auto; /* Changed to auto to autogrow */ - background: none; /* Changed from white to allow our bg to show through */ + height: auto; /* Changed to auto to autogrow */ + background: none; /* Changed from white to allow our bg to show through */ } .CodeMirror-scroll { @@ -23,36 +23,36 @@ } @-moz-document url-prefix() { - /* Firefox does weird and terrible things (#3549) when overflow-x is auto */ - /* It doesn't respect the overflow setting anyway, so we can workaround it with this */ - .CodeMirror-scroll { - overflow-x: hidden; - } + /* Firefox does weird and terrible things (#3549) when overflow-x is auto */ + /* It doesn't respect the overflow setting anyway, so we can workaround it with this */ + .CodeMirror-scroll { + overflow-x: hidden; + } } .CodeMirror-lines { - /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */ - /* we have set a different line-height and want this to scale with that. */ - padding: @code_padding; + /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */ + /* we have set a different line-height and want this to scale with that. */ + padding: @code_padding; } .CodeMirror-linenumber { - // This is needed to fine tune the position of the line numbers because we use the 0.4em in @code_padding - // spacing in various places. Fine tuned to look right. - padding: 0 8px 0 4px; + // This is needed to fine tune the position of the line numbers because we use the 0.4em in @code_padding + // spacing in various places. Fine tuned to look right. + padding: 0 8px 0 4px; } .CodeMirror-gutters { - // This is needed because our cell has rounded corners, otherwise the gutter area square - // corner cuts into the rounded cell border. - border-bottom-left-radius: @baseBorderRadius; - border-top-left-radius: @baseBorderRadius; + // This is needed because our cell has rounded corners, otherwise the gutter area square + // corner cuts into the rounded cell border. + border-bottom-left-radius: @baseBorderRadius; + border-top-left-radius: @baseBorderRadius; } .CodeMirror pre { - /* In CM3 this went to 4px from 0 in CM2. We need the 0 value because of how we size */ - /* .CodeMirror-lines */ - padding: 0; - border: 0; - .border-radius(0) + /* In CM3 this went to 4px from 0 in CM2. We need the 0 value because of how we size */ + /* .CodeMirror-lines */ + padding: 0; + border: 0; + .border-radius(0) } diff --git a/IPython/html/static/notebook/less/completer.less b/IPython/html/static/notebook/less/completer.less index 165ad17..6f633de 100644 --- a/IPython/html/static/notebook/less/completer.less +++ b/IPython/html/static/notebook/less/completer.less @@ -20,5 +20,5 @@ } .completions select option.context { - color: @blueDark; + color: @blueDark; } diff --git a/IPython/html/static/notebook/less/notebook.less b/IPython/html/static/notebook/less/notebook.less index f84e1c1..b51f356 100644 --- a/IPython/html/static/notebook/less/notebook.less +++ b/IPython/html/static/notebook/less/notebook.less @@ -2,7 +2,7 @@ body { background-color: @bodyBackground; } - + body.notebook_app { overflow: hidden; } @@ -61,5 +61,5 @@ p { } .end_space { - height: 200px; + height: 200px; } diff --git a/IPython/html/static/notebook/less/outputarea.less b/IPython/html/static/notebook/less/outputarea.less index 8ccabe0..c50f6ad 100644 --- a/IPython/html/static/notebook/less/outputarea.less +++ b/IPython/html/static/notebook/less/outputarea.less @@ -6,34 +6,34 @@ div.output_wrapper { /* class for the output area when it should be height-limited */ div.output_scroll { - /* ideally, this would be max-height, but FF barfs all over that */ - height: 24em; - /* FF needs this *and the wrapper* to specify full width, or it will shrinkwrap */ - width: 100%; + /* ideally, this would be max-height, but FF barfs all over that */ + height: 24em; + /* FF needs this *and the wrapper* to specify full width, or it will shrinkwrap */ + width: 100%; - overflow: auto; - .corner-all; - .box-shadow(inset 0 2px 8px rgba(0, 0, 0, .8)); + overflow: auto; + .corner-all; + .box-shadow(inset 0 2px 8px rgba(0, 0, 0, .8)); } /* output div while it is collapsed */ div.output_collapsed { - margin: 0px; - padding: 0px; - .vbox(); + margin: 0px; + padding: 0px; + .vbox(); } div.out_prompt_overlay { - height: 100%; - padding: 0px @code_padding; - position: absolute; - .corner-all; + height: 100%; + padding: 0px @code_padding; + position: absolute; + .corner-all; } div.out_prompt_overlay:hover { - /* use inner shadow to get border that is computed the same on WebKit/FF */ - .box-shadow(inset 0 0 1px #000); - background: rgba(240, 240, 240, 0.5); + /* use inner shadow to get border that is computed the same on WebKit/FF */ + .box-shadow(inset 0 0 1px #000); + background: rgba(240, 240, 240, 0.5); } div.output_prompt { @@ -71,8 +71,8 @@ div.output_area { .vbox(); } -div.output_area pre { - font-family: @monoFontFamily; +div.output_area pre { + font-family: @monoFontFamily; margin: 0; padding: 0; border: 0; @@ -99,7 +99,7 @@ div.output_text { text-align: left; color: @textColor; font-family: @monoFontFamily; - /* This has to match that of the the CodeMirror class line-height below */ + /* This has to match that of the the CodeMirror class line-height below */ line-height: @code_line_height; } @@ -134,26 +134,28 @@ div.output_jpeg { /* raw_input styles */ div.raw_input { - padding-top: 0px; - padding-bottom: 0px; - height: 1em; - line-height: 1em; - font-family: @monoFontFamily; + padding-top: 0px; + padding-bottom: 0px; + height: 1em; + line-height: 1em; + font-family: @monoFontFamily; } + span.input_prompt { - font-family: inherit; + font-family: inherit; } + input.raw_input { - font-family: inherit; - font-size: inherit; - color: inherit; - width: auto; - margin: -2px 0px 0px 1px; - padding-left: 1px; - padding-top: 2px; - height: 1em; + font-family: inherit; + font-size: inherit; + color: inherit; + width: auto; + margin: -2px 0px 0px 1px; + padding-left: 1px; + padding-top: 2px; + height: 1em; } p.p-space { - margin-bottom: 10px; + margin-bottom: 10px; }