##// END OF EJS Templates
Merge pull request #7517 from minrk/scroll-offset...
Jonathan Frederic -
r20091:6b96f0fb merge
parent child Browse files
Show More
@@ -14,6 +14,9 body {
14 right: 0px;
14 right: 0px;
15 top: 0px;
15 top: 0px;
16 bottom: 0px;
16 bottom: 0px;
17 @media not print {
18 .vbox();
19 }
17 overflow: visible;
20 overflow: visible;
18 }
21 }
19
22
@@ -81,6 +84,11 body {
81 width: 100%;
84 width: 100%;
82 display: none;
85 display: none;
83 .border-box-sizing();
86 .border-box-sizing();
87 overflow: auto;
88 @media not print {
89 flex: 1;
90 height: 0px; // triggers overflow, but overridded by flex
91 }
84 }
92 }
85
93
86 /* Smaller buttons */
94 /* Smaller buttons */
@@ -8267,6 +8267,24 body {
8267 bottom: 0px;
8267 bottom: 0px;
8268 overflow: visible;
8268 overflow: visible;
8269 }
8269 }
8270 @media not print {
8271 body {
8272 /* Old browsers */
8273 display: -webkit-box;
8274 -webkit-box-orient: vertical;
8275 -webkit-box-align: stretch;
8276 display: -moz-box;
8277 -moz-box-orient: vertical;
8278 -moz-box-align: stretch;
8279 display: box;
8280 box-orient: vertical;
8281 box-align: stretch;
8282 /* Modern browsers */
8283 display: flex;
8284 flex-direction: column;
8285 align-items: stretch;
8286 }
8287 }
8270 #header {
8288 #header {
8271 /* Initially hidden to prevent FLOUC */
8289 /* Initially hidden to prevent FLOUC */
8272 display: none;
8290 display: none;
@@ -8329,6 +8347,13 body {
8329 box-sizing: border-box;
8347 box-sizing: border-box;
8330 -moz-box-sizing: border-box;
8348 -moz-box-sizing: border-box;
8331 -webkit-box-sizing: border-box;
8349 -webkit-box-sizing: border-box;
8350 overflow: auto;
8351 }
8352 @media not print {
8353 #site {
8354 flex: 1;
8355 height: 0px;
8356 }
8332 }
8357 }
8333 /* Smaller buttons */
8358 /* Smaller buttons */
8334 .ui-button .ui-button-text {
8359 .ui-button .ui-button-text {
@@ -81,7 +81,7
81 </div>
81 </div>
82 </noscript>
82 </noscript>
83
83
84 <div id="header" class="navbar navbar-fixed-top">
84 <div id="header">
85 <div id="header-container" class="container">
85 <div id="header-container" class="container">
86 <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" title='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
86 <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree" title='dashboard'>{% block logo %}<img src='{{static_url("base/images/logo.png") }}' alt='Jupyter Notebook'/>{% endblock %}</a></div>
87
87
@@ -106,8 +106,6
106 {% endblock %}
106 {% endblock %}
107 </div>
107 </div>
108
108
109 <div id="header-spacer"></div>
110
111 <div id="site">
109 <div id="site">
112 {% block site %}
110 {% block site %}
113 {% endblock %}
111 {% endblock %}
General Comments 0
You need to be logged in to leave comments. Login now