##// END OF EJS Templates
Merge pull request #7011 from jdfreder/killthelayout...
Matthias Bussonnier -
r19249:949cf57f merge
parent child Browse files
Show More
@@ -4,14 +4,17 b''
4 define([
4 define([
5 'base/js/namespace',
5 'base/js/namespace',
6 'jquery',
6 'jquery',
7 ], function(IPython, $){
7 'base/js/events',
8 ], function(IPython, $, events){
8 "use strict";
9 "use strict";
9
10
10 var Page = function () {
11 var Page = function () {
11 this.bind_events();
12 this.bind_events();
13 this._resize_header();
12 };
14 };
13
15
14 Page.prototype.bind_events = function () {
16 Page.prototype.bind_events = function () {
17 events.on('resize-header.Page', $.proxy(this._resize_header, this));
15 };
18 };
16
19
17 Page.prototype.show = function () {
20 Page.prototype.show = function () {
@@ -41,6 +44,11 b' define(['
41 $('div#site').css('display','block');
44 $('div#site').css('display','block');
42 };
45 };
43
46
47 Page.prototype._resize_header = function() {
48 // Update the header's size.
49 $('#header-spacer').height($('#header').height());
50 };
51
44 // Register self in the global namespace for convenience.
52 // Register self in the global namespace for convenience.
45 IPython.Page = Page;
53 IPython.Page = Page;
46 return {'Page': Page};
54 return {'Page': Page};
@@ -20,11 +20,33 b' body {'
20 div#header {
20 div#header {
21 /* Initially hidden to prevent FLOUC */
21 /* Initially hidden to prevent FLOUC */
22 display: none;
22 display: none;
23 margin-bottom: 0px;
23 margin-bottom: -6px;
24 padding-left: 30px;
24 position: fixed;
25 padding-bottom: 5px;
25 top: 0;
26 border-bottom: 1px solid @navbar-default-border;
26 width: 100%;
27 .border-box-sizing();
27 background-color: @body-bg;
28 min-height: 31px;
29
30 /* Display over codemirror */
31 z-index: 100;
32
33 #header-container {
34 margin-bottom: 0px;
35 padding-left: 30px;
36 padding-bottom: 5px;
37 .border-box-sizing();
38 }
39
40 .header-bar {
41 width: 100%;
42 height: 0px;
43 border-bottom: 1px solid @navbar-default-border;
44 }
45 }
46
47 #header-spacer {
48 width: 100%;
49 visibility: hidden;
28 }
50 }
29
51
30 #ipython_notebook {
52 #ipython_notebook {
@@ -9,7 +9,6 b' require(['
9 'services/config',
9 'services/config',
10 'base/js/utils',
10 'base/js/utils',
11 'base/js/page',
11 'base/js/page',
12 'notebook/js/layoutmanager',
13 'base/js/events',
12 'base/js/events',
14 'auth/js/loginwidget',
13 'auth/js/loginwidget',
15 'notebook/js/maintoolbar',
14 'notebook/js/maintoolbar',
@@ -34,7 +33,6 b' require(['
34 configmod,
33 configmod,
35 utils,
34 utils,
36 page,
35 page,
37 layoutmanager,
38 events,
36 events,
39 loginwidget,
37 loginwidget,
40 maintoolbar,
38 maintoolbar,
@@ -66,9 +64,7 b' require(['
66
64
67 var user_config = $.extend({}, config.default_config);
65 var user_config = $.extend({}, config.default_config);
68 var page = new page.Page();
66 var page = new page.Page();
69 var layout_manager = new layoutmanager.LayoutManager();
67 var pager = new pager.Pager('div#pager', {
70 var pager = new pager.Pager('div#pager', 'div#pager_splitter', {
71 layout_manager: layout_manager,
72 events: events});
68 events: events});
73 var acts = new actions.init();
69 var acts = new actions.init();
74 var keyboard_manager = new keyboardmanager.KeyboardManager({
70 var keyboard_manager = new keyboardmanager.KeyboardManager({
@@ -104,7 +100,6 b' require(['
104 var menubar = new menubar.MenuBar('#menubar', $.extend({
100 var menubar = new menubar.MenuBar('#menubar', $.extend({
105 notebook: notebook,
101 notebook: notebook,
106 contents: contents,
102 contents: contents,
107 layout_manager: layout_manager,
108 events: events,
103 events: events,
109 save_widget: save_widget,
104 save_widget: save_widget,
110 quick_help: quick_help},
105 quick_help: quick_help},
@@ -132,9 +127,7 b' require(['
132
127
133 page.show();
128 page.show();
134
129
135 layout_manager.do_resize();
136 var first_load = function () {
130 var first_load = function () {
137 layout_manager.do_resize();
138 var hash = document.location.hash;
131 var hash = document.location.hash;
139 if (hash) {
132 if (hash) {
140 document.location.hash = '';
133 document.location.hash = '';
@@ -147,7 +140,6 b' require(['
147 events.on('notebook_loaded.Notebook', first_load);
140 events.on('notebook_loaded.Notebook', first_load);
148
141
149 IPython.page = page;
142 IPython.page = page;
150 IPython.layout_manager = layout_manager;
151 IPython.notebook = notebook;
143 IPython.notebook = notebook;
152 IPython.contents = contents;
144 IPython.contents = contents;
153 IPython.pager = pager;
145 IPython.pager = pager;
@@ -24,7 +24,6 b' define(['
24 * Dictionary of keyword arguments.
24 * Dictionary of keyword arguments.
25 * notebook: Notebook instance
25 * notebook: Notebook instance
26 * contents: ContentManager instance
26 * contents: ContentManager instance
27 * layout_manager: LayoutManager instance
28 * events: $(Events) instance
27 * events: $(Events) instance
29 * save_widget: SaveWidget instance
28 * save_widget: SaveWidget instance
30 * quick_help: QuickHelp instance
29 * quick_help: QuickHelp instance
@@ -37,7 +36,6 b' define(['
37 this.selector = selector;
36 this.selector = selector;
38 this.notebook = options.notebook;
37 this.notebook = options.notebook;
39 this.contents = options.contents;
38 this.contents = options.contents;
40 this.layout_manager = options.layout_manager;
41 this.events = options.events;
39 this.events = options.events;
42 this.save_widget = options.save_widget;
40 this.save_widget = options.save_widget;
43 this.quick_help = options.quick_help;
41 this.quick_help = options.quick_help;
@@ -88,6 +86,13 b' define(['
88 }
86 }
89 };
87 };
90
88
89 MenuBar.prototype._size_header = function() {
90 /**
91 * Update header spacer size.
92 */
93 this.events.trigger('resize-header.Page');
94 };
95
91 MenuBar.prototype.bind_events = function () {
96 MenuBar.prototype.bind_events = function () {
92 /**
97 /**
93 * File
98 * File
@@ -218,12 +223,12 b' define(['
218
223
219 // View
224 // View
220 this.element.find('#toggle_header').click(function () {
225 this.element.find('#toggle_header').click(function () {
221 $('div#header').toggle();
226 $('div#header-container').toggle();
222 that.layout_manager.do_resize();
227 that._size_header();
223 });
228 });
224 this.element.find('#toggle_toolbar').click(function () {
229 this.element.find('#toggle_toolbar').click(function () {
225 $('div#maintoolbar').toggle();
230 $('div#maintoolbar').toggle();
226 that.layout_manager.do_resize();
231 that._size_header();
227 });
232 });
228 // Insert
233 // Insert
229 this.element.find('#insert_cell_above').click(function () {
234 this.element.find('#insert_cell_above').click(function () {
@@ -8,48 +8,22 b' define(['
8 ], function(IPython, $, utils) {
8 ], function(IPython, $, utils) {
9 "use strict";
9 "use strict";
10
10
11 var Pager = function (pager_selector, pager_splitter_selector, options) {
11 var Pager = function (pager_selector, options) {
12 /**
12 /**
13 * Constructor
13 * Constructor
14 *
14 *
15 * Parameters:
15 * Parameters:
16 * pager_selector: string
16 * pager_selector: string
17 * pager_splitter_selector: string
18 * options: dictionary
17 * options: dictionary
19 * Dictionary of keyword arguments.
18 * Dictionary of keyword arguments.
20 * events: $(Events) instance
19 * events: $(Events) instance
21 * layout_manager: LayoutManager instance
22 */
20 */
23 this.events = options.events;
21 this.events = options.events;
24 this.pager_element = $(pager_selector);
22 this.pager_element = $(pager_selector);
25 this.pager_button_area = $('#pager_button_area');
23 this.pager_button_area = $('#pager-button-area');
26 var that = this;
24 this._default_end_space = 200;
27 this.percentage_height = 0.40;
25 this.pager_element.resizable({handles: 'n', resize: $.proxy(this._resize, this)});
28 options.layout_manager.pager = this;
29 this.pager_splitter_element = $(pager_splitter_selector)
30 .draggable({
31 containment: 'window',
32 axis:'y',
33 helper: null ,
34 drag: function(event, ui) {
35 /**
36 * recalculate the amount of space the pager should take
37 */
38 var pheight = ($(document.body).height()-event.clientY-4);
39 var downprct = pheight/options.layout_manager.app_height();
40 downprct = Math.min(0.9, downprct);
41 if (downprct < 0.1) {
42 that.percentage_height = 0.1;
43 that.collapse({'duration':0});
44 } else if (downprct > 0.2) {
45 that.percentage_height = downprct;
46 that.expand({'duration':0});
47 }
48 options.layout_manager.do_resize();
49 }
50 });
51 this.expanded = false;
26 this.expanded = false;
52 this.style();
53 this.create_button_area();
27 this.create_button_area();
54 this.bind_events();
28 this.bind_events();
55 };
29 };
@@ -61,7 +35,6 b' define(['
61 .attr('title',"Open the pager in an external window")
35 .attr('title',"Open the pager in an external window")
62 .addClass('ui-button')
36 .addClass('ui-button')
63 .click(function(){that.detach();})
37 .click(function(){that.detach();})
64 .attr('style','position: absolute; right: 20px;')
65 .append(
38 .append(
66 $('<span>').addClass("ui-icon ui-icon-extlink")
39 $('<span>').addClass("ui-icon ui-icon-extlink")
67 )
40 )
@@ -71,49 +44,37 b' define(['
71 .attr('title',"Close the pager")
44 .attr('title',"Close the pager")
72 .addClass('ui-button')
45 .addClass('ui-button')
73 .click(function(){that.collapse();})
46 .click(function(){that.collapse();})
74 .attr('style','position: absolute; right: 5px;')
75 .append(
47 .append(
76 $('<span>').addClass("ui-icon ui-icon-close")
48 $('<span>').addClass("ui-icon ui-icon-close")
77 )
49 )
78 );
50 );
79 };
51 };
80
52
81 Pager.prototype.style = function () {
82 this.pager_splitter_element.addClass('ui-widget ui-state-default');
83 this.pager_splitter_element.attr('title', 'Click to Show/Hide pager area, drag to Resize');
84 };
85
86
53
87 Pager.prototype.bind_events = function () {
54 Pager.prototype.bind_events = function () {
88 var that = this;
55 var that = this;
89
56
90 this.pager_element.bind('collapse_pager', function (event, extrap) {
57 this.pager_element.bind('collapse_pager', function (event, extrap) {
91 var time = 'fast';
58 // Animate hiding of the pager.
92 if (extrap && extrap.duration) {
59 var time = (extrap && extrap.duration) ? extrap.duration : 'fast';
93 time = extrap.duration;
60 that.pager_element.hide(time, function() {
94 }
61 $('.end_space').css('height', that._default_end_space);
95 that.pager_element.hide(time);
62 });
96 });
63 });
97
64
98 this.pager_element.bind('expand_pager', function (event, extrap) {
65 this.pager_element.bind('expand_pager', function (event, extrap) {
99 var time = 'fast';
66 // Clear the pager's height attr if it's set. This allows the
100 if (extrap && extrap.duration) {
67 // pager to size itself according to its contents.
101 time = extrap.duration;
68 that.pager_element.height('initial');
102 }
69
103 that.pager_element.show(time);
70 // Animate the showing of the pager
104 });
71 var time = (extrap && extrap.duration) ? extrap.duration : 'fast';
105
72 that.pager_element.show(time, function() {
106 this.pager_splitter_element.hover(
73 // Explicitly set pager height once the pager has shown itself.
107 function () {
74 // This allows the pager-contents div to use percentage sizing.
108 that.pager_splitter_element.addClass('ui-state-hover');
75 that.pager_element.height(that.pager_element.height());
109 },
76 that._resize();
110 function () {
77 });
111 that.pager_splitter_element.removeClass('ui-state-hover');
112 }
113 );
114
115 this.pager_splitter_element.click(function () {
116 that.toggle();
117 });
78 });
118
79
119 this.events.on('open_with_text.Pager', function (event, payload) {
80 this.events.on('open_with_text.Pager', function (event, payload) {
@@ -130,7 +91,7 b' define(['
130 Pager.prototype.collapse = function (extrap) {
91 Pager.prototype.collapse = function (extrap) {
131 if (this.expanded === true) {
92 if (this.expanded === true) {
132 this.expanded = false;
93 this.expanded = false;
133 this.pager_element.add($('div#notebook')).trigger('collapse_pager', extrap);
94 this.pager_element.trigger('collapse_pager', extrap);
134 }
95 }
135 };
96 };
136
97
@@ -138,7 +99,7 b' define(['
138 Pager.prototype.expand = function (extrap) {
99 Pager.prototype.expand = function (extrap) {
139 if (this.expanded !== true) {
100 if (this.expanded !== true) {
140 this.expanded = true;
101 this.expanded = true;
141 this.pager_element.add($('div#notebook')).trigger('expand_pager', extrap);
102 this.pager_element.trigger('expand_pager', extrap);
142 }
103 }
143 };
104 };
144
105
@@ -184,6 +145,18 b' define(['
184 this.pager_element.find(".container").append($('<pre/>').html(utils.fixCarriageReturn(utils.fixConsole(text))));
145 this.pager_element.find(".container").append($('<pre/>').html(utils.fixCarriageReturn(utils.fixConsole(text))));
185 };
146 };
186
147
148
149 Pager.prototype._resize = function() {
150 /**
151 * Update document based on pager size.
152 */
153
154 // Make sure the padding at the end of the notebook is large
155 // enough that the user can scroll to the bottom of the
156 // notebook.
157 $('.end_space').css('height', Math.max(this.pager_element.height(), this._default_end_space));
158 };
159
187 // Backwards compatability.
160 // Backwards compatability.
188 IPython.Pager = Pager;
161 IPython.Pager = Pager;
189
162
@@ -1,12 +1,13 b''
1 #menubar {
1 #menubar {
2 margin-top: 0px;
2 margin-top: 0px;
3 margin-bottom: -19px;
3 margin-bottom: -24px;
4 position: relative;
4 position: relative;
5 .border-box-sizing();
5 .border-box-sizing();
6
6
7 .navbar {
7 .navbar {
8 border-top: 1px;
8 border-top: 1px;
9 border-radius: 0px 0px @border-radius-base @border-radius-base;
9 border-radius: 0px 0px @border-radius-base @border-radius-base;
10 margin-bottom: 23px;
10 }
11 }
11
12
12 .navbar-toggle {
13 .navbar-toggle {
@@ -3,10 +3,6 b' body {'
3 background-color: @body-bg;
3 background-color: @body-bg;
4 }
4 }
5
5
6 body.notebook_app {
7 overflow: hidden;
8 }
9
10 @media (max-width: 767px) {
6 @media (max-width: 767px) {
11 // remove bootstrap-responsive's body padding on small screens
7 // remove bootstrap-responsive's body padding on small screens
12 body.notebook_app {
8 body.notebook_app {
@@ -36,19 +32,17 b' span#notebook_name {'
36 div#notebook_panel {
32 div#notebook_panel {
37 margin: 0px 0px 0px 0px;
33 margin: 0px 0px 0px 0px;
38 padding: 0px;
34 padding: 0px;
39 .box-shadow(@notebook-shadow);
40 .border-box-sizing();
35 .border-box-sizing();
41 }
36 }
42 div#notebook {
37 div#notebook {
43 font-size: @notebook_font_size;
38 font-size: @notebook_font_size;
44 line-height: @notebook_line_height;
39 line-height: @notebook_line_height;
45 overflow-y: scroll;
40 overflow-y: hidden;
46 overflow-x: auto;
41 overflow-x: auto;
47 width: 100%;
42 width: 100%;
48 /* This spaces the cell away from the edge of the notebook area */
43 /* This spaces the cell away from the edge of the notebook area */
49 padding: 1em 0 1em 0;
44 padding: 2em 0 2em 0;
50 margin: 0px;
45 margin: 0px;
51 border-top: 1px solid @navbar-default-border;
52 outline: none;
46 outline: none;
53 .border-box-sizing();
47 .border-box-sizing();
54 }
48 }
@@ -86,3 +80,14 b' p {'
86 .end_space {
80 .end_space {
87 height: 200px;
81 height: 200px;
88 }
82 }
83
84 .lower-header-bar {
85 width: 100%;
86 height: 0px;
87 border-bottom: 1px solid @navbar-default-border;
88 margin-bottom: -1px;
89 }
90
91 .notebook_app #header {
92 .box-shadow(@notebook-shadow);
93 }
@@ -1,25 +1,51 b''
1 div#pager_splitter {
2 height: 8px;
3 .border-box-sizing();
4 }
5
6 #pager-container {
7 position: relative;
8 padding: 15px 0px;
9 .border-box-sizing();
10 }
11
12 div#pager {
1 div#pager {
2 background-color: @body-bg;
13 font-size: @notebook_font_size;
3 font-size: @notebook_font_size;
14 line-height: @notebook_line_height;
4 line-height: @notebook_line_height;
15 overflow: auto;
5 overflow: hidden;
16 display: none;
6 display: none;
7 position: fixed;
8 bottom: 0px;
9 width: 100%;
10 max-height: 50%;
11 padding-top: 7px;
12
13 /* Display over codemirror */
14 z-index: 100;
15
16 /* Hack which prevents jquery ui resizable from changing top. */
17 top: inherit !important;
17
18
18 pre {
19 pre {
19 line-height: @code_line_height;
20 line-height: @code_line_height;
20 color: @text-color;
21 color: @text-color;
21 background-color: @cell_background;
22 background-color: @cell_background;
22 padding: @code_padding;
23 padding: @code_padding;
24 }
25
26 #pager-button-area {
27 position: absolute;
28 top: 7px;
29 right: 20px;
30 }
31
32 #pager-contents {
33 position: relative;
34 overflow: auto;
35 width: 100%;
36 height: 100%;
37
38 #pager-container {
39 position: relative;
40 padding: 15px 0px;
41 .border-box-sizing();
42 }
43 }
44
45 .ui-resizable-handle {
46 top: 0px;
47 height: 7px;
48 background: @light_border_color;
49 border-bottom: 1px solid @border_color;
23 }
50 }
24 .border-box-sizing();
25 }
51 }
@@ -2,6 +2,7 b''
2 padding: 0px;
2 padding: 0px;
3 margin-left: -5px;
3 margin-left: -5px;
4 margin-top: -5px;
4 margin-top: -5px;
5 margin-bottom: 5px;
5
6
6 select, label {
7 select, label {
7 width: auto;
8 width: auto;
@@ -33,8 +34,8 b''
33 border: 0px;
34 border: 0px;
34 min-height: 27px;
35 min-height: 27px;
35 margin-left: 32px;
36 margin-left: 32px;
36 padding-top: 6px;
37 padding-top: 11px;
37 padding-bottom: 8px;
38 padding-bottom: 3px;
38
39
39 .navbar-text {
40 .navbar-text {
40 float: none;
41 float: none;
@@ -44,10 +45,6 b''
44 margin-right: 0px;
45 margin-right: 0px;
45 margin-top: 0px;
46 margin-top: 0px;
46 }
47 }
47
48 .toolbar {
49 margin-top: 0px;
50 }
51 }
48 }
52
49
53 .select-xs {
50 .select-xs {
@@ -10,7 +10,7 b''
10 @notebook_line_height: 20px;
10 @notebook_line_height: 20px;
11 @code_line_height: 1.21429em; // changed from 1.231 to get 17px even
11 @code_line_height: 1.21429em; // changed from 1.231 to get 17px even
12 @code_padding: 0.4em; // 5.6 px
12 @code_padding: 0.4em; // 5.6 px
13 @notebook-shadow: inset 1px 4px 9px -6px rgba(0,0,0,.25);
13 @notebook-shadow: 1px 4px 9px -6px rgba(0,0,0,.25);
14 @rendered_html_border_color: black;
14 @rendered_html_border_color: black;
15 @input_prompt_color: navy;
15 @input_prompt_color: navy;
16 @output_prompt_color: darkred;
16 @output_prompt_color: darkred;
@@ -7751,14 +7751,32 b' body {'
7751 div#header {
7751 div#header {
7752 /* Initially hidden to prevent FLOUC */
7752 /* Initially hidden to prevent FLOUC */
7753 display: none;
7753 display: none;
7754 margin-bottom: -6px;
7755 position: fixed;
7756 top: 0;
7757 width: 100%;
7758 background-color: #ffffff;
7759 min-height: 31px;
7760 /* Display over codemirror */
7761 z-index: 100;
7762 }
7763 div#header #header-container {
7754 margin-bottom: 0px;
7764 margin-bottom: 0px;
7755 padding-left: 30px;
7765 padding-left: 30px;
7756 padding-bottom: 5px;
7766 padding-bottom: 5px;
7757 border-bottom: 1px solid #e7e7e7;
7758 box-sizing: border-box;
7767 box-sizing: border-box;
7759 -moz-box-sizing: border-box;
7768 -moz-box-sizing: border-box;
7760 -webkit-box-sizing: border-box;
7769 -webkit-box-sizing: border-box;
7761 }
7770 }
7771 div#header .header-bar {
7772 width: 100%;
7773 height: 0px;
7774 border-bottom: 1px solid #e7e7e7;
7775 }
7776 #header-spacer {
7777 width: 100%;
7778 visibility: hidden;
7779 }
7762 #ipython_notebook {
7780 #ipython_notebook {
7763 padding-left: 0px;
7781 padding-left: 0px;
7764 }
7782 }
@@ -9461,9 +9479,6 b' h6:hover .anchor-link {'
9461 body {
9479 body {
9462 background-color: #ffffff;
9480 background-color: #ffffff;
9463 }
9481 }
9464 body.notebook_app {
9465 overflow: hidden;
9466 }
9467 @media (max-width: 767px) {
9482 @media (max-width: 767px) {
9468 body.notebook_app {
9483 body.notebook_app {
9469 padding-left: 0px;
9484 padding-left: 0px;
@@ -9489,8 +9504,6 b' span#notebook_name:hover {'
9489 div#notebook_panel {
9504 div#notebook_panel {
9490 margin: 0px 0px 0px 0px;
9505 margin: 0px 0px 0px 0px;
9491 padding: 0px;
9506 padding: 0px;
9492 -webkit-box-shadow: inset 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
9493 box-shadow: inset 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
9494 box-sizing: border-box;
9507 box-sizing: border-box;
9495 -moz-box-sizing: border-box;
9508 -moz-box-sizing: border-box;
9496 -webkit-box-sizing: border-box;
9509 -webkit-box-sizing: border-box;
@@ -9498,13 +9511,12 b' div#notebook_panel {'
9498 div#notebook {
9511 div#notebook {
9499 font-size: 14px;
9512 font-size: 14px;
9500 line-height: 20px;
9513 line-height: 20px;
9501 overflow-y: scroll;
9514 overflow-y: hidden;
9502 overflow-x: auto;
9515 overflow-x: auto;
9503 width: 100%;
9516 width: 100%;
9504 /* This spaces the cell away from the edge of the notebook area */
9517 /* This spaces the cell away from the edge of the notebook area */
9505 padding: 1em 0 1em 0;
9518 padding: 2em 0 2em 0;
9506 margin: 0px;
9519 margin: 0px;
9507 border-top: 1px solid #e7e7e7;
9508 outline: none;
9520 outline: none;
9509 box-sizing: border-box;
9521 box-sizing: border-box;
9510 -moz-box-sizing: border-box;
9522 -moz-box-sizing: border-box;
@@ -9542,6 +9554,16 b' p {'
9542 .end_space {
9554 .end_space {
9543 height: 200px;
9555 height: 200px;
9544 }
9556 }
9557 .lower-header-bar {
9558 width: 100%;
9559 height: 0px;
9560 border-bottom: 1px solid #e7e7e7;
9561 margin-bottom: -1px;
9562 }
9563 .notebook_app #header {
9564 -webkit-box-shadow: 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
9565 box-shadow: 1px 4px 9px -6px rgba(0, 0, 0, 0.25);
9566 }
9545 /* CSS for the cell toolbar */
9567 /* CSS for the cell toolbar */
9546 .celltoolbar {
9568 .celltoolbar {
9547 border: thin solid #CFCFCF;
9569 border: thin solid #CFCFCF;
@@ -9779,7 +9801,7 b' fieldset[disabled] #kernel_selector_widget > button.active {'
9779 }
9801 }
9780 #menubar {
9802 #menubar {
9781 margin-top: 0px;
9803 margin-top: 0px;
9782 margin-bottom: -19px;
9804 margin-bottom: -24px;
9783 position: relative;
9805 position: relative;
9784 box-sizing: border-box;
9806 box-sizing: border-box;
9785 -moz-box-sizing: border-box;
9807 -moz-box-sizing: border-box;
@@ -9788,6 +9810,7 b' fieldset[disabled] #kernel_selector_widget > button.active {'
9788 #menubar .navbar {
9810 #menubar .navbar {
9789 border-top: 1px;
9811 border-top: 1px;
9790 border-radius: 0px 0px 4px 4px;
9812 border-radius: 0px 0px 4px 4px;
9813 margin-bottom: 23px;
9791 }
9814 }
9792 #menubar .navbar-toggle {
9815 #menubar .navbar-toggle {
9793 float: left;
9816 float: left;
@@ -10256,27 +10279,21 b' fieldset[disabled] .notification_widget.danger.active {'
10256 color: #d9534f;
10279 color: #d9534f;
10257 background-color: #ffffff;
10280 background-color: #ffffff;
10258 }
10281 }
10259 div#pager_splitter {
10260 height: 8px;
10261 box-sizing: border-box;
10262 -moz-box-sizing: border-box;
10263 -webkit-box-sizing: border-box;
10264 }
10265 #pager-container {
10266 position: relative;
10267 padding: 15px 0px;
10268 box-sizing: border-box;
10269 -moz-box-sizing: border-box;
10270 -webkit-box-sizing: border-box;
10271 }
10272 div#pager {
10282 div#pager {
10283 background-color: #ffffff;
10273 font-size: 14px;
10284 font-size: 14px;
10274 line-height: 20px;
10285 line-height: 20px;
10275 overflow: auto;
10286 overflow: hidden;
10276 display: none;
10287 display: none;
10277 box-sizing: border-box;
10288 position: fixed;
10278 -moz-box-sizing: border-box;
10289 bottom: 0px;
10279 -webkit-box-sizing: border-box;
10290 width: 100%;
10291 max-height: 50%;
10292 padding-top: 7px;
10293 /* Display over codemirror */
10294 z-index: 100;
10295 /* Hack which prevents jquery ui resizable from changing top. */
10296 top: inherit !important;
10280 }
10297 }
10281 div#pager pre {
10298 div#pager pre {
10282 line-height: 1.21429em;
10299 line-height: 1.21429em;
@@ -10284,6 +10301,30 b' div#pager pre {'
10284 background-color: #f7f7f7;
10301 background-color: #f7f7f7;
10285 padding: 0.4em;
10302 padding: 0.4em;
10286 }
10303 }
10304 div#pager #pager-button-area {
10305 position: absolute;
10306 top: 7px;
10307 right: 20px;
10308 }
10309 div#pager #pager-contents {
10310 position: relative;
10311 overflow: auto;
10312 width: 100%;
10313 height: 100%;
10314 }
10315 div#pager #pager-contents #pager-container {
10316 position: relative;
10317 padding: 15px 0px;
10318 box-sizing: border-box;
10319 -moz-box-sizing: border-box;
10320 -webkit-box-sizing: border-box;
10321 }
10322 div#pager .ui-resizable-handle {
10323 top: 0px;
10324 height: 7px;
10325 background: #cfcfcf;
10326 border-bottom: 1px solid #ababab;
10327 }
10287 .quickhelp {
10328 .quickhelp {
10288 /* Old browsers */
10329 /* Old browsers */
10289 display: -webkit-box;
10330 display: -webkit-box;
@@ -10350,6 +10391,7 b' span#autosave_status {'
10350 padding: 0px;
10391 padding: 0px;
10351 margin-left: -5px;
10392 margin-left: -5px;
10352 margin-top: -5px;
10393 margin-top: -5px;
10394 margin-bottom: 5px;
10353 box-sizing: border-box;
10395 box-sizing: border-box;
10354 -moz-box-sizing: border-box;
10396 -moz-box-sizing: border-box;
10355 -webkit-box-sizing: border-box;
10397 -webkit-box-sizing: border-box;
@@ -10380,8 +10422,8 b' span#autosave_status {'
10380 border: 0px;
10422 border: 0px;
10381 min-height: 27px;
10423 min-height: 27px;
10382 margin-left: 32px;
10424 margin-left: 32px;
10383 padding-top: 6px;
10425 padding-top: 11px;
10384 padding-bottom: 8px;
10426 padding-bottom: 3px;
10385 }
10427 }
10386 #maintoolbar .navbar-text {
10428 #maintoolbar .navbar-text {
10387 float: none;
10429 float: none;
@@ -10391,9 +10433,6 b' span#autosave_status {'
10391 margin-right: 0px;
10433 margin-right: 0px;
10392 margin-top: 0px;
10434 margin-top: 0px;
10393 }
10435 }
10394 #maintoolbar .toolbar {
10395 margin-top: 0px;
10396 }
10397 .select-xs {
10436 .select-xs {
10398 height: 24px;
10437 height: 24px;
10399 }
10438 }
@@ -32,7 +32,7 b' class="notebook_app"'
32 {% endblock %}
32 {% endblock %}
33
33
34
34
35 {% block header %}
35 {% block headercontainer %}
36
36
37
37
38 <span id="save_widget" class="nav pull-left">
38 <span id="save_widget" class="nav pull-left">
@@ -50,11 +50,9 b' class="notebook_app"'
50 </ul>
50 </ul>
51 </span>
51 </span>
52
52
53 {% endblock %}
53 {% endblock headercontainer %}
54
55
56 {% block site %}
57
54
55 {% block header %}
58 <div id="menubar-container" class="container">
56 <div id="menubar-container" class="container">
59 <div id="menubar">
57 <div id="menubar">
60 <div id="menus" class="navbar navbar-default" role="navigation">
58 <div id="menus" class="navbar navbar-default" role="navigation">
@@ -289,6 +287,7 b' class="notebook_app"'
289 </div>
287 </div>
290 </div>
288 </div>
291 </div>
289 </div>
290
292 <div id="maintoolbar" class="navbar">
291 <div id="maintoolbar" class="navbar">
293 <div class="toolbar-inner navbar-inner navbar-nobg">
292 <div class="toolbar-inner navbar-inner navbar-nobg">
294 <div id="maintoolbar-container" class="container"></div>
293 <div id="maintoolbar-container" class="container"></div>
@@ -296,19 +295,25 b' class="notebook_app"'
296 </div>
295 </div>
297 </div>
296 </div>
298
297
299 <div id="ipython-main-app">
298 <div class="lower-header-bar"></div>
299 {% endblock header %}
300
300
301 {% block site %}
302
303
304 <div id="ipython-main-app">
301 <div id="notebook_panel">
305 <div id="notebook_panel">
302 <div id="notebook"></div>
306 <div id="notebook"></div>
303 <div id="pager_splitter"></div>
304 <div id="pager">
305 <div id='pager_button_area'>
306 </div>
307 <div id="pager-container" class="container"></div>
308 </div>
309 </div>
307 </div>
308 </div>
310
309
310 <div id="pager">
311 <div id="pager-contents">
312 <div id="pager-container" class="container"></div>
313 </div>
314 <div id='pager-button-area'></div>
311 </div>
315 </div>
316
312 <div id='tooltip' class='ipython_tooltip' style='display:none'></div>
317 <div id='tooltip' class='ipython_tooltip' style='display:none'></div>
313
318
314
319
@@ -81,7 +81,7 b''
81 </noscript>
81 </noscript>
82
82
83 <div id="header" class="navbar navbar-static-top">
83 <div id="header" class="navbar navbar-static-top">
84 <div class="container">
84 <div id="header-container" class="container">
85 <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" alt='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
85 <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" alt='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
86
86
87 {% block login_widget %}
87 {% block login_widget %}
@@ -96,10 +96,15 b''
96
96
97 {% endblock %}
97 {% endblock %}
98
98
99 {% block header %}
99 {% block headercontainer %}
100 {% endblock %}
100 {% endblock %}
101 </div>
101 </div>
102 <div class="header-bar"></div>
103
104 {% block header %}
105 {% endblock %}
102 </div>
106 </div>
107 <div id="header-spacer"></div>
103
108
104 <div id="site">
109 <div id="site">
105 {% block site %}
110 {% block site %}
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now