From 808916762e718046d463948889ebcc362b154052 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Thu, 18 Dec 2014 16:41:15 -0800 Subject: [PATCH 01/27] Remove terminals page of the dashboard, move contents into running tab. --- IPython/html/static/tree/js/terminallist.js | 2 +- IPython/html/templates/tree.html | 37 ++++++++------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/IPython/html/static/tree/js/terminallist.js b/IPython/html/static/tree/js/terminallist.js index 3fab779de..b66f68b3b 100644 --- a/IPython/html/static/tree/js/terminallist.js +++ b/IPython/html/static/tree/js/terminallist.js @@ -20,7 +20,7 @@ define([ * base_url: string */ this.base_url = options.base_url || utils.get_body_data("baseUrl"); - this.element_name = options.element_name || 'terminal'; + this.element_name = options.element_name || 'running'; this.selector = selector; this.terminals = []; if (this.selector !== undefined) { diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html index 167b5e2ce..ff8daeed8 100644 --- a/IPython/html/templates/tree.html +++ b/IPython/html/templates/tree.html @@ -19,9 +19,6 @@ data-terminals-available="{{terminals_available}}"
@@ -78,40 +75,32 @@ data-terminals-available="{{terminals_available}}"
- Currently running IPython notebooks + Currently running Jupyter processes
+ {% if terminals_available %} + + {% endif %}
+ {% if terminals_available %} +
+
+
There are no terminals running.
+
+
+ {% endif %}
There are no notebooks running.
- {% if terminals_available %} -
-
-
- Currently running terminals -
-
- - - - -
-
-
-
-
There are no terminals running.
-
-
-
- {% endif %}
From 2d835bd7ed9b272a408c9ab57629776bf6180376 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 19 Dec 2014 11:32:36 -0800 Subject: [PATCH 02/27] Put lists in an accordion --- IPython/html/templates/tree.html | 44 ++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html index ff8daeed8..583ace8a9 100644 --- a/IPython/html/templates/tree.html +++ b/IPython/html/templates/tree.html @@ -88,18 +88,42 @@ data-terminals-available="{{terminals_available}}"
- {% if terminals_available %} -
-
-
There are no terminals running.
+
+
+
+ + Terminals + +
+
+
+ {% if terminals_available %} +
+
+
There are no terminals running.
+
+
+ {% endif %} +
+
-
- {% endif %} -
-
-
There are no notebooks running.
+
+
+ + Notebooks + +
+
+
+
+
+
There are no notebooks running.
+
+
+
+
-
+
From 06fe62fe96b26a6937ad09bfbe0ad682d79f338d Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 19 Dec 2014 12:27:17 -0800 Subject: [PATCH 03/27] Improved styling --- IPython/html/static/tree/less/tree.less | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 9a12bde6d..ad10a9371 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -179,3 +179,34 @@ ul#new-menu { #tab_content { padding-top: @page-header-padding; } + +#running { + .panel-group{ + .panel { + margin-top: 15px; + + .panel-heading { + background-color: #eee; /* @page-backdrop-color */ + padding-top: 4px; + padding-bottom: 4px; + padding-left: 7px; + padding-right: 7px; + } + + .panel-body { + padding: 0px; + + .list_container { + margin-top: 0px; + margin-bottom: 0px; + border: 0px; + border-radius: 0px; + + .list_item { + border-bottom: 1px solid #ddd; + } + } + } + } + } +} From d783812d9babc46bdcaad3dd8f71e74d627f5fac Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 19 Dec 2014 12:27:34 -0800 Subject: [PATCH 04/27] invoke css --- IPython/html/static/style/style.min.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index c834ff5fd..17e5b98f8 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8665,6 +8665,28 @@ ul#new-menu { } #tab_content { padding-top: 20px; +#running .panel-group .panel { + margin-top: 15px; +} +#running .panel-group .panel .panel-heading { + background-color: #eee; + /* @page-backdrop-color */ + padding-top: 4px; + padding-bottom: 4px; + padding-left: 7px; + padding-right: 7px; +} +#running .panel-group .panel .panel-body { + padding: 0px; +} +#running .panel-group .panel .panel-body .list_container { + margin-top: 0px; + margin-bottom: 0px; + border: 0px; + border-radius: 0px; +} +#running .panel-group .panel .panel-body .list_container .list_item { + border-bottom: 1px solid #ddd; } /*! * From 9f35ee6c7a2009e953a2a920a0420eac1627b814 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 12:20:15 -0800 Subject: [PATCH 05/27] Use less for heading padding --- IPython/html/static/tree/less/tree.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index ad10a9371..fc347365a 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -187,10 +187,10 @@ ul#new-menu { .panel-heading { background-color: #eee; /* @page-backdrop-color */ - padding-top: 4px; - padding-bottom: 4px; - padding-left: 7px; - padding-right: 7px; + padding-top: @dashboard_tb_pad; + padding-bottom: @dashboard_tb_pad; + padding-left: @dashboard_lr_pad; + padding-right: @dashboard_lr_pad; } .panel-body { From 33d1bc2abe27dddd1d7b1ba5f05e55857df36f55 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 12:38:48 -0800 Subject: [PATCH 06/27] Fix heading height --- IPython/html/static/tree/less/tree.less | 1 + 1 file changed, 1 insertion(+) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index fc347365a..01c8c895f 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -191,6 +191,7 @@ ul#new-menu { padding-bottom: @dashboard_tb_pad; padding-left: @dashboard_lr_pad; padding-right: @dashboard_lr_pad; + line-height: @btn_mini_height; } .panel-body { From 0b4d5e73b20dcd335288b136f3a42c0bf3a85d4e Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 12:44:05 -0800 Subject: [PATCH 07/27] Decrease 2px bottom border to 1px --- IPython/html/static/tree/less/tree.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 01c8c895f..b936c020e 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -205,6 +205,10 @@ ul#new-menu { .list_item { border-bottom: 1px solid #ddd; + + &:last-child { + border-bottom: 0px; + } } } } From 7c7da546991657bd5147aba6d5fb9764e37a356c Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 12:44:31 -0800 Subject: [PATCH 08/27] invoke css --- IPython/html/static/style/style.min.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 17e5b98f8..77c0a1ded 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8675,6 +8675,7 @@ ul#new-menu { padding-bottom: 4px; padding-left: 7px; padding-right: 7px; + line-height: 22px; } #running .panel-group .panel .panel-body { padding: 0px; @@ -8688,6 +8689,9 @@ ul#new-menu { #running .panel-group .panel .panel-body .list_container .list_item { border-bottom: 1px solid #ddd; } +#running .panel-group .panel .panel-body .list_container .list_item:last-child { + border-bottom: 0px; +} /*! * * IPython text editor webapp From 12fe7823ad68d94ee32572bdbb5067deebb1988a Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 12:48:23 -0800 Subject: [PATCH 09/27] New Terminal into new new button --- IPython/html/static/tree/js/terminallist.js | 2 +- IPython/html/templates/tree.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IPython/html/static/tree/js/terminallist.js b/IPython/html/static/tree/js/terminallist.js index b66f68b3b..b7524ce91 100644 --- a/IPython/html/static/tree/js/terminallist.js +++ b/IPython/html/static/tree/js/terminallist.js @@ -38,7 +38,7 @@ define([ $('#refresh_' + this.element_name + '_list').click(function () { that.load_terminals(); }); - $('#new_terminal').click($.proxy(this.new_terminal, this)); + $('#new-terminal').click($.proxy(this.new_terminal, this)); }; TerminalList.prototype.new_terminal = function () { diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html index 583ace8a9..c3a708c1d 100644 --- a/IPython/html/templates/tree.html +++ b/IPython/html/templates/tree.html @@ -49,6 +49,11 @@ data-terminals-available="{{terminals_available}}" + {% if terminals_available %} + + {% endif %} @@ -79,11 +84,6 @@ data-terminals-available="{{terminals_available}}"
- {% if terminals_available %} - - {% endif %}
From 070d9ace2edf92445469d4bafb1e07ced333ac6d Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 12:51:12 -0800 Subject: [PATCH 10/27] Remove underline header collapse links --- IPython/html/static/tree/less/tree.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index b936c020e..2a880b2c0 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -192,6 +192,10 @@ ul#new-menu { padding-left: @dashboard_lr_pad; padding-right: @dashboard_lr_pad; line-height: @btn_mini_height; + + a:focus, a:hover { + text-decoration: none; + } } .panel-body { From 6007ef89fe2b578906b7008f3f35b999482cdd37 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 12:52:32 -0800 Subject: [PATCH 11/27] invoke css --- IPython/html/static/style/style.min.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 77c0a1ded..e66949327 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8677,6 +8677,10 @@ ul#new-menu { padding-right: 7px; line-height: 22px; } +#running .panel-group .panel .panel-heading a:focus, +#running .panel-group .panel .panel-heading a:hover { + text-decoration: none; +} #running .panel-group .panel .panel-body { padding: 0px; } From 0cabf033434d7ca5320ea3cfa44dcf791e300bbc Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 13:22:21 -0800 Subject: [PATCH 12/27] Animated arrow icon --- IPython/html/static/tree/js/sessionlist.js | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/IPython/html/static/tree/js/sessionlist.js b/IPython/html/static/tree/js/sessionlist.js index 2319cd2d0..44a29afda 100644 --- a/IPython/html/static/tree/js/sessionlist.js +++ b/IPython/html/static/tree/js/sessionlist.js @@ -21,6 +21,36 @@ define([ this.events = options.events; this.sessions = {}; this.base_url = options.base_url || utils.get_body_data("baseUrl"); + + // Add collapse arrows. + $('#running .panel-group .panel .panel-heading a').each(function(index, el) { + var $link = $(el); + var $icon = $('') + .addClass('fa fa-caret-down'); + $link.append($icon); + $link.down = true; + $link.click(function () { + if ($link.down) { + $link.down = false; + // jQeury doesn't know how to animate rotations. Abuse + // jQueries animate function by using an unused css attribute + // to do the animation (borderSpacing). + $icon.animate({ borderSpacing: 90 }, { + step: function(now,fx) { + $icon.css('transform','rotate(-' + now + 'deg)'); + } + }, 250); + } else { + $link.down = true; + // See comment above. + $icon.animate({ borderSpacing: 0 }, { + step: function(now,fx) { + $icon.css('transform','rotate(-' + now + 'deg)'); + } + }, 250); + } + }); + }); }; SesssionList.prototype.load_sessions = function(){ From bc79ec0c754ccf503552e8b60b91b421fd4c5430 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 23 Dec 2014 13:24:24 -0800 Subject: [PATCH 13/27] invoke css after rebase --- IPython/html/static/style/style.min.css | 1 + 1 file changed, 1 insertion(+) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index e66949327..4d6f7a1b4 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8665,6 +8665,7 @@ ul#new-menu { } #tab_content { padding-top: 20px; +} #running .panel-group .panel { margin-top: 15px; } From 0159a2911de3e4d3ac060270259f5f04a285edae Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 6 Jan 2015 08:18:07 -0800 Subject: [PATCH 14/27] Use less variable for header bg color --- IPython/html/static/tree/less/tree.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 2a880b2c0..b1bbf8cf0 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -186,7 +186,7 @@ ul#new-menu { margin-top: 15px; .panel-heading { - background-color: #eee; /* @page-backdrop-color */ + background-color: @page-backdrop-color; padding-top: @dashboard_tb_pad; padding-bottom: @dashboard_tb_pad; padding-left: @dashboard_lr_pad; From 74fbcdfec26c62878a0a8f1697d130fdbf88e97e Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 6 Jan 2015 08:18:25 -0800 Subject: [PATCH 15/27] invoke css --- IPython/html/static/style/style.min.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 4d6f7a1b4..3d1045198 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8670,8 +8670,7 @@ ul#new-menu { margin-top: 15px; } #running .panel-group .panel .panel-heading { - background-color: #eee; - /* @page-backdrop-color */ + background-color: #eeeeee; padding-top: 4px; padding-bottom: 4px; padding-left: 7px; From bb0bc50cf3caab0c34208fad262ed3f941c1db72 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:18:21 -0800 Subject: [PATCH 16/27] Use bootstrap variable for table color --- IPython/html/static/tree/less/tree.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index b1bbf8cf0..7b57c1ef8 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -73,7 +73,7 @@ ul.breadcrumb { .list_item { &:hover .list_item { - background-color: #ddd; + background-color: @table-border-color; }; a {text-decoration: none;} } @@ -208,7 +208,7 @@ ul#new-menu { border-radius: 0px; .list_item { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid @table-border-color; &:last-child { border-bottom: 0px; From cf0234d5f9978be666d3c6050ab9d181ebccf418 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:18:36 -0800 Subject: [PATCH 17/27] invoke css --- IPython/html/static/style/style.min.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 3d1045198..9f91f59e7 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8534,7 +8534,7 @@ ul.breadcrumb span { border: none; } .list_item:hover .list_item { - background-color: #ddd; + background-color: #dddddd; } .list_item a { text-decoration: none; @@ -8691,7 +8691,7 @@ ul#new-menu { border-radius: 0px; } #running .panel-group .panel .panel-body .list_container .list_item { - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #dddddd; } #running .panel-group .panel .panel-body .list_container .list_item:last-child { border-bottom: 0px; From 30a596b4df01975e4a6ba4646de39fc71239bb7c Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:23:15 -0800 Subject: [PATCH 18/27] Fix margins --- IPython/html/static/tree/less/tree.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 7b57c1ef8..98cc6a589 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -183,7 +183,8 @@ ul#new-menu { #running { .panel-group{ .panel { - margin-top: 15px; + margin-top: 3px; + margin-bottom: 1em; .panel-heading { background-color: @page-backdrop-color; From aebc1ac2c1f156131d12a35759039afa4cdafb34 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:26:07 -0800 Subject: [PATCH 19/27] Adjust colors so they are the same --- IPython/html/static/tree/less/tree.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 98cc6a589..a688278e6 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -56,12 +56,12 @@ ul.breadcrumb { .list_container { margin-top: @dashboard_tb_pad; margin-bottom: 5*@dashboard_tb_pad; - border: 1px solid @border_color; + border: 1px solid @table-border-color; border-radius: @border-radius-base; } .list_container > div { - border-bottom: 1px solid @border_color; + border-bottom: 1px solid @table-border-color; &:hover .list-item{ background-color: red; }; From db8cad5bff6f7949a5dfe09a70f33d3dd1ea1440 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:26:32 -0800 Subject: [PATCH 20/27] invoke css --- IPython/html/static/style/style.min.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 9f91f59e7..1c2eaa29e 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8521,11 +8521,11 @@ ul.breadcrumb span { .list_container { margin-top: 4px; margin-bottom: 20px; - border: 1px solid #ababab; + border: 1px solid #dddddd; border-radius: 2px; } .list_container > div { - border-bottom: 1px solid #ababab; + border-bottom: 1px solid #dddddd; } .list_container > div:hover .list-item { background-color: red; @@ -8667,7 +8667,8 @@ ul#new-menu { padding-top: 20px; } #running .panel-group .panel { - margin-top: 15px; + margin-top: 3px; + margin-bottom: 1em; } #running .panel-group .panel .panel-heading { background-color: #eeeeee; From d39311ccb578ec97a37a6a60cb4088fca66d22c1 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:30:41 -0800 Subject: [PATCH 21/27] Correct the padding of the new button group on the files page --- IPython/html/static/tree/less/tree.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index a688278e6..9c582fb2c 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -156,6 +156,10 @@ input.engine_num_input { .icon(@fa-var-file-o) } +#new-buttons { + padding-top: 2px; +} + ul#new-menu { // align right instead of left left: auto; From 96656a87e0d6f4bdf13d3688ce16c9b4e64ad1e8 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:31:15 -0800 Subject: [PATCH 22/27] invoke css --- IPython/html/static/style/style.min.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 1c2eaa29e..9e4524843 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8648,6 +8648,9 @@ input.engine_num_input { .file_icon:before.pull-right { margin-left: .3em; } +#new-buttons { + padding-top: 2px; +} ul#new-menu { left: auto; right: 0; From f254cda663b7c32ee0a8b73a24a3bcd9d4882f91 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:32:55 -0800 Subject: [PATCH 23/27] Typo fix --- IPython/html/static/tree/less/tree.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 9c582fb2c..1b4be08fd 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -156,7 +156,7 @@ input.engine_num_input { .icon(@fa-var-file-o) } -#new-buttons { +#notebook_toolbar .pull-right { padding-top: 2px; } From 64f529d399ee131eef3a5236b8d75d492f572c0e Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Fri, 16 Jan 2015 16:33:24 -0800 Subject: [PATCH 24/27] invoke css --- IPython/html/static/style/style.min.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 9e4524843..7ddb35f57 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8648,7 +8648,7 @@ input.engine_num_input { .file_icon:before.pull-right { margin-left: .3em; } -#new-buttons { +#notebook_toolbar .pull-right { padding-top: 2px; } ul#new-menu { From 78f28a635bec8596a4a6dbf675c3b9c75f20bc51 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 20 Jan 2015 13:31:04 -0800 Subject: [PATCH 25/27] Review comments --- IPython/html/static/base/less/page.less | 1 + IPython/html/static/notebook/less/menubar.less | 1 + IPython/html/static/style/style.min.css | 6 ++++-- IPython/html/static/tree/less/tree.less | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/IPython/html/static/base/less/page.less b/IPython/html/static/base/less/page.less index 36bdd2e6b..27b9d5bd9 100644 --- a/IPython/html/static/base/less/page.less +++ b/IPython/html/static/base/less/page.less @@ -35,6 +35,7 @@ body { width: 100%; height: 1px; background: @navbar-default-border; + margin-bottom: -1px; } @media print { diff --git a/IPython/html/static/notebook/less/menubar.less b/IPython/html/static/notebook/less/menubar.less index 2dab92359..e9827d07d 100644 --- a/IPython/html/static/notebook/less/menubar.less +++ b/IPython/html/static/notebook/less/menubar.less @@ -1,5 +1,6 @@ #menubar { .border-box-sizing(); + margin-top: 1px; .navbar { border-top: 1px; diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 7ddb35f57..32529270b 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8285,6 +8285,7 @@ body { width: 100%; height: 1px; background: #e7e7e7; + margin-bottom: -1px; } @media print { #header { @@ -8510,7 +8511,7 @@ ul.breadcrumb span { vertical-align: middle; } .list_toolbar .tree-buttons { - padding-top: 2px; + padding-top: 1px; } .list_toolbar [class*="span"] { min-height: 24px; @@ -8649,7 +8650,7 @@ input.engine_num_input { margin-left: .3em; } #notebook_toolbar .pull-right { - padding-top: 2px; + padding-top: 0px; } ul#new-menu { left: auto; @@ -10303,6 +10304,7 @@ select[multiple].celltoolbar select { box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + margin-top: 1px; } #menubar .navbar { border-top: 1px; diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 1b4be08fd..835f036fc 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -41,7 +41,7 @@ ul.breadcrumb { vertical-align: middle; .tree-buttons { - padding-top: 2px; + padding-top: 1px; } } @@ -157,7 +157,7 @@ input.engine_num_input { } #notebook_toolbar .pull-right { - padding-top: 2px; + padding-top: 0px; } ul#new-menu { From fafd6ca3054435d0e19f496c629971fa024b28b6 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 20 Jan 2015 15:13:55 -0800 Subject: [PATCH 26/27] Move new button group over one pixel --- IPython/html/static/tree/less/tree.less | 1 + 1 file changed, 1 insertion(+) diff --git a/IPython/html/static/tree/less/tree.less b/IPython/html/static/tree/less/tree.less index 835f036fc..8ae733a0e 100644 --- a/IPython/html/static/tree/less/tree.less +++ b/IPython/html/static/tree/less/tree.less @@ -158,6 +158,7 @@ input.engine_num_input { #notebook_toolbar .pull-right { padding-top: 0px; + margin-right: -1px; } ul#new-menu { From 5ef0c1dfd359517ba912911d90ecc74dc21acd65 Mon Sep 17 00:00:00 2001 From: Jonathan Frederic Date: Tue, 20 Jan 2015 15:14:13 -0800 Subject: [PATCH 27/27] invoke css --- IPython/html/static/style/style.min.css | 1 + 1 file changed, 1 insertion(+) diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index 32529270b..c996b8945 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -8651,6 +8651,7 @@ input.engine_num_input { } #notebook_toolbar .pull-right { padding-top: 0px; + margin-right: -1px; } ul#new-menu { left: auto;