##// END OF EJS Templates
Merge pull request #7413 from Carreau/end_Space...
Min RK -
r19923:d596129e merge
parent child Browse files
Show More
@@ -47,7 +47,7 b' label {'
47 47 /* Make the page background atleast 100% the height of the view port */
48 48 @page-backdrop-height: 100vh;
49 49 /* Make the page itself atleast 70% the height of the view port */
50 @page-min-height: 70vh;
50 @page-min-height: 0;
51 51 @page-backdrop-color: #EEE;
52 52 @page-color: @body-bg;
53 53 @page-padding: 15px;
@@ -195,7 +195,7 b' define(['
195 195 that.insert_cell_below('code',ncells-1);
196 196 });
197 197 this.element.append(this.container);
198 this.container.append(end_space);
198 this.container.after(end_space);
199 199 };
200 200
201 201 /**
@@ -959,7 +959,7 b' define(['
959 959
960 960 if (ncells === 0) {
961 961 // special case append if empty
962 this.element.find('div.end_space').before(element);
962 this.container.append(element);
963 963 } else if ( ncells === index ) {
964 964 // special case append it the end, but not empty
965 965 this.get_cell_element(index-1).after(element);
@@ -21,7 +21,7 b' define(['
21 21 this.events = options.events;
22 22 this.pager_element = $(pager_selector);
23 23 this.pager_button_area = $('#pager-button-area');
24 this._default_end_space = 200;
24 this._default_end_space = 100;
25 25 this.pager_element.resizable({handles: 'n', resize: $.proxy(this._resize, this)});
26 26 this.expanded = false;
27 27 this.create_button_area();
@@ -1,6 +1,6 b''
1 1 @media (max-width: 767px) {
2 2 // remove bootstrap-responsive's body padding on small screens
3 body.notebook_app {
3 .notebook_app {
4 4 padding-left: 0px;
5 5 padding-right: 0px;
6 6 }
@@ -14,12 +14,9 b' div#notebook_panel {'
14 14 margin: 0px;
15 15 padding: 0px;
16 16 .border-box-sizing();
17 @media not print {
18 background-color: @page-backdrop-color;
19 min-height: @page-backdrop-height;
20 }
21 17 }
22 div#notebook {
18
19 #notebook {
23 20 font-size: @notebook_font_size;
24 21 line-height: @notebook_line_height;
25 22 overflow-y: hidden;
@@ -27,7 +24,6 b' div#notebook {'
27 24 width: 100%;
28 25 /* This spaces the page away from the edge of the notebook area */
29 26 padding-top: @page-header-padding;
30 padding-bottom: @page-header-padding;
31 27 margin: 0px;
32 28 outline: none;
33 29 .border-box-sizing();
@@ -73,9 +69,15 b' p {'
73 69 }
74 70
75 71 .end_space {
76 height: 200px;
72 min-height: 100px;
77 73 }
78 74
79 75 .notebook_app #header {
80 76 .box-shadow(@global-shadow);
81 77 }
78
79 .notebook_app{
80 @media not print {
81 background-color: @page-backdrop-color;
82 }
83 }
@@ -8720,7 +8720,7 b' ul#new-menu {'
8720 8720 #texteditor-backdrop #texteditor-container {
8721 8721 padding: 0px;
8722 8722 background-color: #ffffff;
8723 min-height: 70vh;
8723 min-height: 0;
8724 8724 -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
8725 8725 box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
8726 8726 }
@@ -10026,7 +10026,7 b' h6:hover .anchor-link {'
10026 10026 *
10027 10027 */
10028 10028 @media (max-width: 767px) {
10029 body.notebook_app {
10029 .notebook_app {
10030 10030 padding-left: 0px;
10031 10031 padding-right: 0px;
10032 10032 }
@@ -10043,13 +10043,7 b' div#notebook_panel {'
10043 10043 -moz-box-sizing: border-box;
10044 10044 -webkit-box-sizing: border-box;
10045 10045 }
10046 @media not print {
10047 div#notebook_panel {
10048 background-color: #eeeeee;
10049 min-height: 100vh;
10050 }
10051 }
10052 div#notebook {
10046 #notebook {
10053 10047 font-size: 14px;
10054 10048 line-height: 20px;
10055 10049 overflow-y: hidden;
@@ -10057,7 +10051,6 b' div#notebook {'
10057 10051 width: 100%;
10058 10052 /* This spaces the page away from the edge of the notebook area */
10059 10053 padding-top: 20px;
10060 padding-bottom: 20px;
10061 10054 margin: 0px;
10062 10055 outline: none;
10063 10056 box-sizing: border-box;
@@ -10068,7 +10061,7 b' div#notebook {'
10068 10061 #notebook-container {
10069 10062 padding: 15px;
10070 10063 background-color: #ffffff;
10071 min-height: 70vh;
10064 min-height: 0;
10072 10065 -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
10073 10066 box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
10074 10067 }
@@ -10103,12 +10096,17 b' p {'
10103 10096 margin-bottom: 0;
10104 10097 }
10105 10098 .end_space {
10106 height: 200px;
10099 min-height: 100px;
10107 10100 }
10108 10101 .notebook_app #header {
10109 10102 -webkit-box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
10110 10103 box-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
10111 10104 }
10105 @media not print {
10106 .notebook_app {
10107 background-color: #eeeeee;
10108 }
10109 }
10112 10110 /* CSS for the cell toolbar */
10113 10111 .celltoolbar {
10114 10112 border: thin solid #CFCFCF;
General Comments 0
You need to be logged in to leave comments. Login now