From 70a43227f3ac6fff2c369208cec0c6bc6d737232 Mon Sep 17 00:00:00 2001 From: MinRK Date: Fri, 24 May 2013 10:45:03 -0700 Subject: [PATCH 1/4] fix login page override css just centers form, rather than allowing it to wrap weirdly --- IPython/frontend/html/notebook/static/auth/css/override.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/IPython/frontend/html/notebook/static/auth/css/override.css b/IPython/frontend/html/notebook/static/auth/css/override.css index b5e513498..92b40d32f 100644 --- a/IPython/frontend/html/notebook/static/auth/css/override.css +++ b/IPython/frontend/html/notebook/static/auth/css/override.css @@ -3,7 +3,6 @@ This is only required when different pages style the same element differently. T a hack to deal with our current css styles and no new styling should be added in this file.*/ #ipython-main-app { - height: 100px; - width: 350px; margin: 50px auto; + text-align: center; } \ No newline at end of file From 87b6761601b4f0dba380d3af2a730a26cf525a8e Mon Sep 17 00:00:00 2001 From: MinRK Date: Fri, 24 May 2013 10:58:20 -0700 Subject: [PATCH 2/4] only round CM-gutter corners on outer (left) edge --- .../html/notebook/static/notebook/less/codemirror.less | 7 ++++--- IPython/frontend/html/notebook/static/style/style.min.css | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/IPython/frontend/html/notebook/static/notebook/less/codemirror.less b/IPython/frontend/html/notebook/static/notebook/less/codemirror.less index 6c2457c7d..52fe51a36 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/codemirror.less +++ b/IPython/frontend/html/notebook/static/notebook/less/codemirror.less @@ -35,9 +35,10 @@ } .CodeMirror-gutters { - // This is needed because our cell has rounded corners, otherwise the gutter area square - // corner cuts into the rounded cell border. - .corner-all; + // 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: @corner_radius; + border-top-left-radius: @corner_radius; } .CodeMirror pre { diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css index e8fe2b7e0..aea06fa49 100644 --- a/IPython/frontend/html/notebook/static/style/style.min.css +++ b/IPython/frontend/html/notebook/static/style/style.min.css @@ -943,7 +943,7 @@ div.output_prompt{color:darkred;margin:0 5px 0 -5px;} .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto;} .CodeMirror-lines{padding:0.4em;} .CodeMirror-linenumber{padding:0 8px 0 4px;} -.CodeMirror-gutters{border-radius:4px;} +.CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px;} .CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .completions{position:absolute;z-index:10;overflow:hidden;border:1px solid #ababab;border-radius:4px;-webkit-box-shadow:0px 6px 10px -1px #adadad;-moz-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;} .completions select{background:white;outline:none;border:none;padding:0px;margin:0px;overflow:auto;font-family:monospace;font-size:110%;color:#000000;} From bf97e27c22e14a136b3670e0e046400cec65aada Mon Sep 17 00:00:00 2001 From: MinRK Date: Fri, 24 May 2013 11:01:51 -0700 Subject: [PATCH 3/4] don't hardcode output_area pre background set it to transparent, thus inheriting from the parent div. --- .../html/notebook/static/notebook/less/outputarea.less | 8 ++++---- IPython/frontend/html/notebook/static/style/style.min.css | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IPython/frontend/html/notebook/static/notebook/less/outputarea.less b/IPython/frontend/html/notebook/static/notebook/less/outputarea.less index 59578b002..a69c3f6b1 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/outputarea.less +++ b/IPython/frontend/html/notebook/static/notebook/less/outputarea.less @@ -5,7 +5,7 @@ div.output_area { .hbox(); } - + /* This is needed to protect the pre formating from global settings such as that of bootstrap */ div.output_area pre { @@ -16,9 +16,9 @@ div.output_area pre { font-size: 100%; vertical-align: baseline; color: black; - background-color: white; - .border-radius(0); - line-height: inherit; + background-color: transparent; + .border-radius(0); + line-height: inherit; } /* This class is for the output subarea inside the output_area and after diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css index aea06fa49..b7df97931 100644 --- a/IPython/frontend/html/notebook/static/style/style.min.css +++ b/IPython/frontend/html/notebook/static/style/style.min.css @@ -990,7 +990,7 @@ a.heading-anchor:link,a.heading-anchor:visited{text-decoration:none;color:inheri #notification_area{position:absolute;right:0px;top:0px;height:25px;padding:3px 0px;padding-right:3px;z-index:10;} .notification_widget{float:right;right:0px;top:1px;height:25px;padding:3px 6px;z-index:10;} div.output_area{padding:0px;page-break-inside:avoid;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;} -div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;background-color:white;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit;} +div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit;} div.output_subarea{padding:0.44em 0.4em 0.4em 1px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;} div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231;} div.output_stream{padding-top:0.0em;padding-bottom:0.0em;} From bb4228d4e5ba51bf8f50c34019254a5e6a227237 Mon Sep 17 00:00:00 2001 From: MinRK Date: Fri, 24 May 2013 11:10:37 -0700 Subject: [PATCH 4/4] remove outline from heading-anchor links --- .../frontend/html/notebook/static/notebook/less/notebook.less | 3 +-- IPython/frontend/html/notebook/static/style/style.min.css | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/IPython/frontend/html/notebook/static/notebook/less/notebook.less b/IPython/frontend/html/notebook/static/notebook/less/notebook.less index de00d216c..18194659a 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/notebook.less +++ b/IPython/frontend/html/notebook/static/notebook/less/notebook.less @@ -65,8 +65,7 @@ p { a.heading-anchor:link, a.heading-anchor:visited { text-decoration: none; + outline: none; color: inherit; } - - diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css index b7df97931..b03e77570 100644 --- a/IPython/frontend/html/notebook/static/style/style.min.css +++ b/IPython/frontend/html/notebook/static/style/style.min.css @@ -986,7 +986,7 @@ pre,code,kbd,samp{white-space:pre-wrap;} #fonttest{font-family:monospace;} a{text-decoration:underline;} p{margin-bottom:0;} -a.heading-anchor:link,a.heading-anchor:visited{text-decoration:none;color:inherit;} +a.heading-anchor:link,a.heading-anchor:visited{text-decoration:none;outline:none;color:inherit;} #notification_area{position:absolute;right:0px;top:0px;height:25px;padding:3px 0px;padding-right:3px;z-index:10;} .notification_widget{float:right;right:0px;top:1px;height:25px;padding:3px 6px;z-index:10;} div.output_area{padding:0px;page-break-inside:avoid;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;}