##// END OF EJS Templates
Make things consistent
Jonathan Frederic -
Show More
@@ -10,7 +10,10 b' define(['
10
10
11 var Page = function () {
11 var Page = function () {
12 this.bind_events();
12 this.bind_events();
13 this._resize_header();
13
14 // When the page is ready, resize the header.
15 var that = this;
16 $(function() { that._resize_header(); });
14 };
17 };
15
18
16 Page.prototype.bind_events = function () {
19 Page.prototype.bind_events = function () {
@@ -26,7 +26,6 b' div#header {'
26 z-index: 100;
26 z-index: 100;
27
27
28 #header-container {
28 #header-container {
29 padding-left: 30px;
30 padding-bottom: 5px;
29 padding-bottom: 5px;
31 padding-top: 5px;
30 padding-top: 5px;
32 .border-box-sizing();
31 .border-box-sizing();
@@ -11,6 +11,8 b''
11 @grid-float-breakpoint: 540px;
11 @grid-float-breakpoint: 540px;
12 @logo_height: 28px;
12 @logo_height: 28px;
13 @border-radius-base: 2px;
13 @border-radius-base: 2px;
14 @border-radius-small: 2px;
15 @grid-gutter-width: 0px;
14
16
15 // Disable modal slide-in from top animation.
17 // Disable modal slide-in from top animation.
16 .modal {
18 .modal {
@@ -38,4 +40,6 b' label {'
38 }
40 }
39
41
40 // Our own global variables for all pages go here
42 // Our own global variables for all pages go here
43 @global-shadow: 0px 0px 12px 1px rgba(87, 87, 87, 0.2);
44 @page-header-padding: 20px;
41
45
@@ -4,4 +4,4 b' a hack to deal with our current css styles and no new styling should be added in'
4
4
5 #ipython-main-app {
5 #ipython-main-app {
6 position: relative;
6 position: relative;
7 } No newline at end of file
7 }
@@ -1,8 +1,3 b''
1
2 body {
3 background-color: @body-bg;
4 }
5
6 @media (max-width: 767px) {
1 @media (max-width: 767px) {
7 // remove bootstrap-responsive's body padding on small screens
2 // remove bootstrap-responsive's body padding on small screens
8 body.notebook_app {
3 body.notebook_app {
@@ -16,9 +11,12 b' body {'
16 }
11 }
17
12
18 div#notebook_panel {
13 div#notebook_panel {
19 margin: 0px 0px 0px 0px;
14 margin: 0px;
20 padding: 0px;
15 padding: 0px;
21 .border-box-sizing();
16 .border-box-sizing();
17 background-color: @notebook_dark_background;
18 /* Make the page background atleast 100% the height of the view port */
19 min-height: 100vh;
22 }
20 }
23 div#notebook {
21 div#notebook {
24 font-size: @notebook_font_size;
22 font-size: @notebook_font_size;
@@ -26,22 +24,22 b' div#notebook {'
26 overflow-y: hidden;
24 overflow-y: hidden;
27 overflow-x: auto;
25 overflow-x: auto;
28 width: 100%;
26 width: 100%;
29 /* This spaces the cell away from the edge of the notebook area */
27 /* This spaces the page away from the edge of the notebook area */
30 padding: 2em 0 2em 0;
28 padding-top: @page-header-padding;
29 padding-bottom: @page-header-padding;
31 margin: 0px;
30 margin: 0px;
32 outline: none;
31 outline: none;
33 .border-box-sizing();
32 .border-box-sizing();
34
35 background-color : @notebook_dark_background;
36 }
33 }
37
34
38 #notebook-container{
35 #notebook-container{
39 @media not print{
36 @media not print{
40 padding-right:80px;
37 padding: 15px;
41 padding-top:10px;
42 border-color: @body-bg;
38 border-color: @body-bg;
43 background-color : @body-bg;
39 background-color : @body-bg;
44 box-shadow: 0px 0px 12px 1px rgba(87,87,87,0.2);
40 /* Make the page itself atleast 70% the height of the view port */
41 min-height: 70vh;
42 .box-shadow(@global-shadow);
45 }
43 }
46 }
44 }
47
45
@@ -87,5 +85,5 b' p {'
87 }
85 }
88
86
89 .notebook_app #header {
87 .notebook_app #header {
90 .box-shadow(@notebook-shadow);
88 .box-shadow(@global-shadow);
91 }
89 }
@@ -10,6 +10,8 b' div#pager {'
10 max-height: 50%;
10 max-height: 50%;
11 padding-top: 8px;
11 padding-top: 8px;
12
12
13 .box-shadow(@global-shadow);
14
13 /* Display over codemirror */
15 /* Display over codemirror */
14 z-index: 100;
16 z-index: 100;
15
17
@@ -49,11 +51,6 b' div#pager {'
49 border-top: 1px solid @light_border_color;
51 border-top: 1px solid @light_border_color;
50 border-bottom: 1px solid @light_border_color;
52 border-bottom: 1px solid @light_border_color;
51
53
52 /* Similar to the notebook header's shadow, but not
53 exactly the same. The settings had to be adjusted
54 to get the shadow to show. */
55 .box-shadow(1px 4px 9px -3px rgba(0, 0, 0, 0.15));
56
57 /* This injects handle bars (a short, wide = symbol) for
54 /* This injects handle bars (a short, wide = symbol) for
58 the resize handle. */
55 the resize handle. */
59 &::after {
56 &::after {
@@ -33,7 +33,7 b''
33 margin-top: -8px;
33 margin-top: -8px;
34 border: 0px;
34 border: 0px;
35 min-height: 27px;
35 min-height: 27px;
36 margin-left: 32px;
36 margin-left: 0px;
37 padding-top: 11px;
37 padding-top: 11px;
38 padding-bottom: 3px;
38 padding-bottom: 3px;
39
39
@@ -11,7 +11,6 b''
11 @notebook_line_height: 20px;
11 @notebook_line_height: 20px;
12 @code_line_height: 1.21429em; // changed from 1.231 to get 17px even
12 @code_line_height: 1.21429em; // changed from 1.231 to get 17px even
13 @code_padding: 0.4em; // 5.6 px
13 @code_padding: 0.4em; // 5.6 px
14 @notebook-shadow: 1px 4px 9px -6px rgba(0,0,0,.25);
15 @rendered_html_border_color: black;
14 @rendered_html_border_color: black;
16 @input_prompt_color: navy;
15 @input_prompt_color: navy;
17 @output_prompt_color: darkred;
16 @output_prompt_color: darkred;
@@ -19,5 +19,5 b''
19 }
19 }
20
20
21 #terminado-container {
21 #terminado-container {
22 padding-top: 20px;
22 padding-top: @page-header-padding;
23 }
23 }
@@ -1,7 +1,3 b''
1 /*This file contains any manual css for this page that needs to override the global styles.
1 /*This file contains any manual css for this page that needs to override the global styles.
2 This is only required when different pages style the same element differently. This is just
2 This is only required when different pages style the same element differently. This is just
3 a hack to deal with our current css styles and no new styling should be added in this file.*/
3 a hack to deal with our current css styles and no new styling should be added in this file.*/
4
5 #ipython-main-app {
6 margin: 20px auto 0px auto;
7 }
@@ -172,5 +172,9 b' ul#new-notebook-menu {'
172 }
172 }
173
173
174 .kernel-menu-icon-current:before {
174 .kernel-menu-icon-current:before {
175 content: @fa-var-check;
175 content: @fa-var-check;
176 }
177
178 #tab_content {
179 padding-top: @page-header-padding;
176 }
180 }
General Comments 0
You need to be logged in to leave comments. Login now