##// END OF EJS Templates
tweak header
MinRK -
Show More
@@ -1,70 +1,69 b''
1 /**
1 /**
2 * Primary styles
2 * Primary styles
3 *
3 *
4 * Author: IPython Development Team
4 * Author: IPython Development Team
5 */
5 */
6
6
7
7
8 body {
8 body {
9 background-color: white;
9 background-color: white;
10 /* This makes sure that the body covers the entire window and needs to
10 /* This makes sure that the body covers the entire window and needs to
11 be in a different element than the display: box in wrapper below */
11 be in a different element than the display: box in wrapper below */
12 position: absolute;
12 position: absolute;
13 left: 0px;
13 left: 0px;
14 right: 0px;
14 right: 0px;
15 top: 0px;
15 top: 0px;
16 bottom: 0px;
16 bottom: 0px;
17 overflow: visible;
17 overflow: visible;
18 }
18 }
19
19
20
20
21 div#header {
21 div#header {
22 /* Initially hidden to prevent FLOUC */
22 /* Initially hidden to prevent FLOUC */
23 display: none;
23 display: none;
24 position: relative;
24 position: relative;
25 height: 40px;
25 height: 40px;
26 padding: 5px;
26 padding: 5px;
27 margin: 0px;
28 width: 100%;
29 }
27 }
30
28
31 span#ipython_notebook {
29 span#ipython_notebook {
32 position: absolute;
30 position: absolute;
33 padding: 2px 2px 2px 5px;
31 padding: 2px 2px 2px 5px;
34 }
32 }
35
33
36 span#ipython_notebook img {
34 span#ipython_notebook img {
37 font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
35 font-family: Verdana, "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
38 height: 24px;
36 height: 24px;
39 text-decoration:none;
37 text-decoration:none;
40 display: inline;
38 display: inline;
41 color: black;
39 color: black;
42 }
40 }
43
41
44 #site {
42 #site {
45 width: 100%;
43 width: 100%;
46 display: none;
44 display: none;
47 }
45 }
48
46
49 /* We set the fonts by hand here to override the values in the theme */
47 /* We set the fonts by hand here to override the values in the theme */
50 .ui-widget {
48 .ui-widget {
51 font-family: "Lucinda Grande", "Lucinda Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
49 font-family: "Lucinda Grande", "Lucinda Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
52 }
50 }
53
51
54 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
52 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
55 font-family: "Lucinda Grande", "Lucinda Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
53 font-family: "Lucinda Grande", "Lucinda Sans Unicode", Helvetica, Arial, Verdana, sans-serif;
56 }
54 }
57
55
58 /* Smaller buttons */
56 /* Smaller buttons */
59 .ui-button .ui-button-text {
57 .ui-button .ui-button-text {
60 padding: 0.2em 0.8em;
58 padding: 0.2em 0.8em;
61 font-size: 77%;
59 font-size: 77%;
62 }
60 }
63
61
64 input.ui-button {
62 input.ui-button {
65 padding: 0.3em 0.9em;
63 padding: 0.3em 0.9em;
66 }
64 }
67
65
68 span#login_widget {
66 span#login_widget {
69 float: right;
67 float: right;
68 margin-top: 2px;
70 }
69 }
@@ -1,90 +1,88 b''
1
1
2
2
3 <!DOCTYPE HTML>
3 <!DOCTYPE HTML>
4 {% macro static_url(name) -%}
4 {% macro static_url(name) -%}
5 {{ base_project_url }}static/{{ name }}
5 {{ base_project_url }}static/{{ name }}
6 {%- endmacro %}
6 {%- endmacro %}
7 <html>
7 <html>
8
8
9 <head>
9 <head>
10 <meta charset="utf-8">
10 <meta charset="utf-8">
11
11
12 <title>{% block title %}IPython Notebook{% endblock %}</title>
12 <title>{% block title %}IPython Notebook{% endblock %}</title>
13 <link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">
13 <link rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">
14 <meta http-equiv="X-UA-Compatible" content="chrome=1">
14 <meta http-equiv="X-UA-Compatible" content="chrome=1">
15 <link rel="stylesheet" href="{{static_url("components/jquery-ui/themes/smoothness/jquery-ui.min.css") }}" type="text/css" />
15 <link rel="stylesheet" href="{{static_url("components/jquery-ui/themes/smoothness/jquery-ui.min.css") }}" type="text/css" />
16 <meta name="viewport" content="width=device-width, initial-scale=1.0">
16 <meta name="viewport" content="width=device-width, initial-scale=1.0">
17 <link rel="stylesheet" href="{{static_url("components/bootstrap/bootstrap/css/bootstrap.min.css") }}" type="text/css" />
17 <link rel="stylesheet" href="{{static_url("components/bootstrap/bootstrap/css/bootstrap.min.css") }}" type="text/css" />
18 <!-- <link rel="stylesheet" href="{{static_url("components/bootstrap/bootstrap/css/bootstrap-responsive.min.css") }}" type="text/css" /> -->
18 <!-- <link rel="stylesheet" href="{{static_url("components/bootstrap/bootstrap/css/bootstrap-responsive.min.css") }}" type="text/css" /> -->
19
19
20 <link rel="stylesheet" href="{{static_url("base/css/boilerplate.css") }}" type="text/css" />
20 <link rel="stylesheet" href="{{static_url("base/css/boilerplate.css") }}" type="text/css" />
21 {% block stylesheet %}
21 {% block stylesheet %}
22 {% block lesscss %}
22 {% block lesscss %}
23 {% if use_less %}
23 {% if use_less %}
24 <link rel="stylesheet/less" href="{{ static_url("style/style.less") }}" type="text/css" />
24 <link rel="stylesheet/less" href="{{ static_url("style/style.less") }}" type="text/css" />
25 {% else %}
25 {% else %}
26 <link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
26 <link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
27 {% endif %}
27 {% endif %}
28 {% endblock %}
28 {% endblock %}
29 {% endblock %}
29 {% endblock %}
30 <link rel="stylesheet" href="{{ static_url("custom/custom.css") }}" type="text/css" />
30 <link rel="stylesheet" href="{{ static_url("custom/custom.css") }}" type="text/css" />
31 <script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script>
31 <script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script>
32 <script>
32 <script>
33 require.config({
33 require.config({
34 baseUrl: '{{static_url() }}',
34 baseUrl: '{{static_url() }}',
35 });
35 });
36 </script>
36 </script>
37
37
38 {% block meta %}
38 {% block meta %}
39 {% endblock %}
39 {% endblock %}
40
40
41 </head>
41 </head>
42
42
43 <body {% block params %}{% endblock %}>
43 <body {% block params %}{% endblock %}>
44
44
45 <div id="header-wrapper" class="navbar navbar-static-top">
45 <div id="header-wrapper" class="nav-wrapper">
46 <div class="navbar-inner navbar-nobg">
47 <div id="header" class="container">
46 <div id="header" class="container">
48 <span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
47 <span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
49
48
50 {% block login_widget %}
49 {% block login_widget %}
51
50
52 <span id="login_widget">
51 <span id="login_widget">
53 {% if logged_in %}
52 {% if logged_in %}
54 <button id="logout">Logout</button>
53 <button id="logout">Logout</button>
55 {% elif login_available and not logged_in %}
54 {% elif login_available and not logged_in %}
56 <button id="login">Login</button>
55 <button id="login">Login</button>
57 {% endif %}
56 {% endif %}
58 </span>
57 </span>
59
58
60 {% endblock %}
59 {% endblock %}
61
60
62 {% block header %}
61 {% block header %}
63 {% endblock %}
62 {% endblock %}
64 </div>
63 </div>
65 </div>
66 </div>
64 </div>
67
65
68 <div id="site" class="container">
66 <div id="site" class="container">
69 {% block site %}
67 {% block site %}
70 {% endblock %}
68 {% endblock %}
71 </div>
69 </div>
72
70
73 <script src="{{static_url("components/jquery/jquery.min.js") }}" type="text/javascript" charset="utf-8"></script>
71 <script src="{{static_url("components/jquery/jquery.min.js") }}" type="text/javascript" charset="utf-8"></script>
74 <script src="{{static_url("components/jquery-ui/ui/minified/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
72 <script src="{{static_url("components/jquery-ui/ui/minified/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
75 <script src="{{static_url("components/bootstrap/bootstrap/js/bootstrap.min.js") }}" type="text/javascript" charset="utf-8"></script>
73 <script src="{{static_url("components/bootstrap/bootstrap/js/bootstrap.min.js") }}" type="text/javascript" charset="utf-8"></script>
76 <script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
74 <script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
77 <script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
75 <script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
78 <script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
76 <script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
79
77
80 {% block script %}
78 {% block script %}
81 {% if use_less %}
79 {% if use_less %}
82 <script src="{{ static_url("components/less.js/dist/less-1.3.3.min.js") }}" charset="utf-8"></script>
80 <script src="{{ static_url("components/less.js/dist/less-1.3.3.min.js") }}" charset="utf-8"></script>
83 {% endif %}
81 {% endif %}
84 {% endblock %}
82 {% endblock %}
85
83
86 <script src="{{static_url("custom/custom.js") }}" type="text/javascript" charset="utf-8"></script>
84 <script src="{{static_url("custom/custom.js") }}" type="text/javascript" charset="utf-8"></script>
87
85
88 </body>
86 </body>
89
87
90 </html>
88 </html>
General Comments 0
You need to be logged in to leave comments. Login now