Get notebook running with Bootstrap3

Jonathan Frederic 12 years ago committed by Jonathan Frederic
parent 2c8a53aca1
commit 5c47651786

@ -7,5 +7,9 @@
}
.corner-all {
border-radius: @baseBorderRadius;
border-radius: @border-radius-base;
}
.border-radius(@radius) {
border-radius: @radius;
}

@ -1,9 +1,10 @@
// Our customizations to bootstrap go here.
@textColor: @black;
@baseFontSize: 13px;
@monoFontFamily: monospace; // to allow user to customize their fonts
@navbarHeight: 36px;
@black: @gray-darker;
@text-color: @black;
@font-size-base: 13px;
@font-family-monospace: monospace; // to allow user to customize their fonts
// @navbarHeight: 36px; Not used it BS3
code {
color: @black; // default code color in bootstrap is #d14 (crimson / amaranth)

@ -27,7 +27,7 @@ div.prompt {
/* This padding is tuned to match the padding on the CodeMirror editor. */
padding: @code_padding;
margin: 0px;
font-family: @monoFontFamily;
font-family: @font-family-monospace;
text-align: right;
/* This has to match that of the the CodeMirror class line-height below */
line-height: @code_line_height;

@ -37,8 +37,8 @@
.CodeMirror-gutters {
// This is needed because our cell has rounded corners, otherwise the gutter area square
// corner cuts into the rounded cell border.
border-bottom-left-radius: @baseBorderRadius;
border-top-left-radius: @baseBorderRadius;
border-bottom-left-radius: @border-radius-base;
border-top-left-radius: @border-radius-base;
}
.CodeMirror pre {

@ -14,12 +14,12 @@
padding: 0px;
margin: 0px;
overflow: auto;
font-family: @monoFontFamily;
font-family: @font-family-monospace;
font-size: 110%;
color: @textColor;
color: @text-color;
width: auto;
}
.completions select option.context {
color: @blueDark;
color: darken(@brand-primary, 10%);
}

@ -4,7 +4,7 @@
#menubar .navbar-inner {
min-height: 28px;
border-top: 1px;
border-radius: 0px 0px @baseBorderRadius @baseBorderRadius;
border-radius: 0px 0px @border-radius-base @border-radius-base;
}
#menubar .navbar {
@ -12,7 +12,7 @@
}
.nav-wrapper {
border-bottom: 1px solid @navbarBorder;
border-bottom: 1px solid @navbar-default-border;
}
#menubar li.dropdown {

@ -1,6 +1,6 @@
body {
background-color: @bodyBackground;
background-color: @body-bg;
}
body.notebook_app {
@ -65,7 +65,7 @@ p.dialog {
pre, code, kbd, samp { white-space: pre-wrap; }
#fonttest {
font-family: @monoFontFamily;
font-family: @font-family-monospace;
}
p {

@ -3,7 +3,7 @@
}
.indicator_area {
color: @navbarLinkColor;
color: @navbar-default-link-color;
padding: 4px 3px;
margin: 0px;
width: 11px;

@ -1,10 +1,10 @@
.notification_widget {
color: @navbarLinkColor;
color: @navbar-default-link-color;
padding: 1px 12px;
margin: 2px 4px;
z-index: 10;
border: 1px solid #ccc;
border-radius: @baseBorderRadius;
border-radius: @border-radius-base;
background: rgba(240, 240, 240, 0.5);
&.span {

@ -102,7 +102,7 @@ div.output_subarea {
/* all text output has this class: */
div.output_text {
text-align: left;
color: @textColor;
color: @text-color;
/* This has to match that of the the CodeMirror class line-height below */
line-height: @code_line_height;
}
@ -143,7 +143,7 @@ div.output_javascript:empty {
/* raw_input styles */
div.raw_input_container {
font-family: @monoFontFamily;
font-family: @font-family-monospace;
// for some reason, em padding doesn't compute the same for raw_input
// that is not the first input, but px does
padding-top: 5px;

@ -15,7 +15,7 @@ div#pager {
pre {
line-height: @code_line_height;
color: @textColor;
color: @text-color;
background-color: @cell_background;
padding: @code_padding;
}

@ -5,7 +5,7 @@
display: inline-block;
width: 20ex;
text-align: right;
font-family: @monoFontFamily;
font-family: @font-family-monospace;
}
.shortcut_descr {

@ -1,6 +1,6 @@
.rendered_html {
color: @textColor;
color: @text-color;
em {font-style: italic;}
strong {font-weight: bold;}
u {text-decoration: underline;}
@ -46,8 +46,8 @@
pre, code {
border: 0;
background-color: @bodyBackground;
color: @textColor;
background-color: @body-bg;
color: @text-color;
font-size: 100%;
padding: 0px;
}

@ -16,7 +16,7 @@ div.text_cell_render {
width: inherit;
border-style: none;
padding: 0.5em 0.5em 0.5em @code_padding;
color: @textColor;
color: @text-color;
}
a.anchor-link:link {

@ -4,7 +4,7 @@
select, label {
width: auto;
height: @baseLineHeight + 6px;
height: @line-height-base + 6px;
vertical-align:middle;
margin-right:2px;
margin-bottom:0px;

@ -106,7 +106,7 @@
padding: 3px;
margin: 0px;
padding-left:7px;
font-family: @monoFontFamily;
font-family: @font-family-monospace;
min-height:50px;
.dropshadow;

@ -1,8 +1,8 @@
// Our own variables for this page
@cell_selected_background: darken(@bodyBackground, 2%);
@cell_background: darken(@bodyBackground, 3.2%);
@cell_selected_background: darken(@body-bg, 2%);
@cell_background: darken(@body-bg, 3.2%);
@border_color: darken(@cell_selected_background, 31%);
@light_border_color: darken(@cell_selected_background, 17%);
@border_width: 1px;

@ -1,9 +1,5 @@
.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}
.clearfix:after{clear:both}
.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
code{color:#000}
pre{font-size:inherit;line-height:inherit}
code{color:#222}
.border-box-sizing{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}
.corner-all{border-radius:4px}
.hbox{display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}
@ -27,6 +23,32 @@ div.error{margin:2em;text-align:center}
div.error>h1{font-size:500%;line-height:normal}
div.error>p{font-size:200%;line-height:normal}
div.traceback-wrapper{text-align:left;max-width:800px;margin:auto}
.center-nav{display:inline-block;margin-bottom:-4px}
.alternate_upload{background-color:none;display:inline}
.alternate_upload.form{padding:0;margin:0}
.alternate_upload input.fileinput{background-color:#f00;position:relative;opacity:0;z-index:2;width:295px;margin-left:163px;cursor:pointer;height:26px}
ul#tabs{margin-bottom:4px}
ul#tabs a{padding-top:4px;padding-bottom:4px}
ul.breadcrumb a:focus,ul.breadcrumb a:hover{text-decoration:none}
ul.breadcrumb i.icon-home{font-size:16px;margin-right:4px}
ul.breadcrumb span{color:#5e5e5e}
.list_toolbar{padding:4px 0 4px 0}
.list_toolbar [class*="span"]{min-height:26px}
.list_header{font-weight:bold}
.list_container{margin-top:4px;margin-bottom:20px;border:1px solid #ababab;border-radius:4px}
.list_container>div{border-bottom:1px solid #ababab}.list_container>div:hover .list-item{background-color:#f00}
.list_container>div:last-child{border:none}
.list_item:hover .list_item{background-color:#ddd}
.list_item a{text-decoration:none}
.list_header>div,.list_item>div{padding-top:4px;padding-bottom:4px;padding-left:7px;padding-right:7px;height:22px;line-height:22px}
.item_name{line-height:22px;height:26px}
.item_icon{font-size:14px;color:#5e5e5e;margin-right:7px}
.item_buttons{line-height:1em}
.toolbar_info{height:26px;line-height:26px}
input.nbname_input,input.engine_num_input{padding-top:3px;padding-bottom:3px;height:14px;line-height:14px;margin:0}
input.engine_num_input{width:60px}
.highlight_text{color:#00f}
#project_name>.breadcrumb{padding:0;margin-bottom:0;background-color:transparent;font-weight:bold}
.ansibold{font-weight:bold}
.ansiblack{color:#000}
.ansired{color:#8b0000}
@ -49,19 +71,18 @@ div.cell.edit_mode{border-radius:4px;border:thin #008000 solid}
div.cell{width:100%;padding:5px 5px 5px 0;margin:0;outline:none}
div.prompt{min-width:11ex;padding:.4em;margin:0;font-family:monospace;text-align:right;line-height:1.21429em}
@media (max-width:480px){div.prompt{text-align:left}}div.inner_cell{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;line-height:1.21429em}
div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7}
div.prompt:empty{padding-top:0;padding-bottom:0}
div.input{page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}
@media (max-width:480px){div.input{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}}div.input_prompt{color:#000080;border-top:1px solid transparent}
div.input_area>div.highlight{margin:.4em;border:none;padding:0;background-color:transparent}
div.input_area>div.highlight>pre{margin:0;border:none;padding:0;background-color:transparent}
div.input_area>div.highlight>pre{margin:0;border:0;padding:0;background-color:transparent;font-size:14px;line-height:1.21429em}
.CodeMirror{line-height:1.21429em;height:auto;background:none;}
.CodeMirror-scroll{overflow-y:hidden;overflow-x:auto}
.CodeMirror-lines{padding:.4em}
.CodeMirror-linenumber{padding:0 8px 0 4px}
.CodeMirror-gutters{border-bottom-left-radius:4px;border-top-left-radius:4px}
.CodeMirror pre{padding:0;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
.CodeMirror-vscrollbar,.CodeMirror-hscrollbar{display:none !important}
.CodeMirror pre{padding:0;border:0;border-radius:0}
pre code{display:block;padding:.5em}
.highlight-base,pre code,pre .subst,pre .tag .title,pre .lisp .title,pre .clojure .built_in,pre .nginx .title{color:#000}
.highlight-string,pre .string,pre .constant,pre .parent,pre .tag .value,pre .rules .value,pre .rules .value .number,pre .preprocessor,pre .ruby .symbol,pre .ruby .symbol .string,pre .aggregate,pre .template_tag,pre .django .variable,pre .smalltalk .class,pre .addition,pre .flow,pre .stream,pre .bash .variable,pre .apache .tag,pre .apache .cbracket,pre .tex .command,pre .tex .special,pre .erlang_repl .function_or_atom,pre .markdown .header{color:#ba2121}
@ -84,18 +105,18 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j
.cm-s-ipython span.cm-meta{color:#a2f}
.cm-s-ipython span.cm-tab{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAGFJREFUSMft1LsRQFAQheHPowAKoACx3IgEKtaEHujDjORSgWTH/ZOdnZOcM/sgk/kFFWY0qV8foQwS4MKBCS3qR6ixBJvElOobYAtivseIE120FaowJPN75GMu8j/LfMwNjh4HUpwg4LUAAAAASUVORK5CYII=);background-position:right;background-repeat:no-repeat}
div.output_wrapper{position:relative;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}
div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);-moz-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);display:block}
div.output_scroll{height:24em;width:100%;overflow:auto;border-radius:4px;-webkit-box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);box-shadow:inset 0 2px 8px rgba(0,0,0,0.8);display:block}
div.output_collapsed{margin:0;padding:0;display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}
div.out_prompt_overlay{height:100%;padding:0 .4em;position:absolute;border-radius:4px}
div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000;-moz-box-shadow:inset 0 0 1px #000;box-shadow:inset 0 0 1px #000;background:rgba(240,240,240,0.5)}
div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000;box-shadow:inset 0 0 1px #000;background:rgba(240,240,240,0.5)}
div.output_prompt{color:#8b0000}
div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}div.output_area .MathJax_Display{text-align:left !important}
div.output_area .rendered_html table{margin-left:0;margin-right:0}
div.output_area .rendered_html img{margin-left:0;margin-right:0}
.output{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}
@media (max-width:480px){div.output_area{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}}div.output_area pre{margin:0;padding:0;border:0;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
@media (max-width:480px){div.output_area{display:-webkit-box;-webkit-box-orient:vertical;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:vertical;-moz-box-align:stretch;display:box;box-orient:vertical;box-align:stretch;display:flex;flex-direction:column;align-items:stretch}}div.output_area pre{margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit}
div.output_subarea{padding:.4em .4em 0 .4em;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1}
div.output_text{text-align:left;color:#000;line-height:1.21429em}
div.output_text{text-align:left;color:#222;line-height:1.21429em}
div.output_stderr{background:#fdd;}
div.output_latex{text-align:left}
div.output_javascript:empty{padding:0}
@ -105,7 +126,7 @@ span.raw_input_prompt{}
input.raw_input{font-family:inherit;font-size:inherit;color:inherit;width:auto;vertical-align:baseline;padding:0 .25em;margin:0 .25em}
input.raw_input:focus{box-shadow:none}
p.p-space{margin-bottom:10px}
.rendered_html{color:#000;}.rendered_html em{font-style:italic}
.rendered_html{color:#222;}.rendered_html em{font-style:italic}
.rendered_html strong{font-weight:bold}
.rendered_html u{text-decoration:underline}
.rendered_html :link{text-decoration:underline}
@ -134,7 +155,7 @@ p.p-space{margin-bottom:10px}
.rendered_html *+ol{margin-top:1em}
.rendered_html hr{color:#000;background-color:#000}
.rendered_html pre{margin:1em 2em}
.rendered_html pre,.rendered_html code{border:0;background-color:#fff;color:#000;font-size:100%;padding:0}
.rendered_html pre,.rendered_html code{border:0;background-color:#fff;color:#222;font-size:100%;padding:0}
.rendered_html blockquote{margin:1em 2em}
.rendered_html table{margin-left:auto;margin-right:auto;border:1px solid #000;border-collapse:collapse}
.rendered_html tr,.rendered_html th,.rendered_html td{border:1px solid #000;border-collapse:collapse;margin:1em 2em}
@ -146,7 +167,7 @@ p.p-space{margin-bottom:10px}
.rendered_html img{display:block;margin-left:auto;margin-right:auto}
.rendered_html *+img{margin-top:1em}
div.text_cell{padding:5px 5px 5px 0;display:-webkit-box;-webkit-box-orient:horizontal;-webkit-box-align:stretch;display:-moz-box;-moz-box-orient:horizontal;-moz-box-align:stretch;display:box;box-orient:horizontal;box-align:stretch;display:flex;flex-direction:row;align-items:stretch}
@media (max-width:480px){div.text_cell>div.prompt{display:none}}div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#000}
@media (max-width:480px){div.text_cell>div.prompt{display:none}}div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:.5em .5em .5em .4em;color:#222}
a.anchor-link:link{text-decoration:none;padding:0 20px;visibility:hidden}
h1:hover .anchor-link,h2:hover .anchor-link,h3:hover .anchor-link,h4:hover .anchor-link,h5:hover .anchor-link,h6:hover .anchor-link{visibility:visible}
div.cell.text_cell.rendered{padding:0}

@ -1,6 +1,7 @@
// Bootstrap
@import "../components/bootstrap/less/bootstrap.less";
@import "../components/bootstrap/less/responsive.less";
@import "../components/bootstrap/less/responsive-embed.less";
@import "../components/bootstrap/less/responsive-utilities.less";
// Font-Awesome
@import "../components/font-awesome/less/font-awesome.less";

File diff suppressed because one or more lines are too long

@ -79,7 +79,7 @@
<script src="{{static_url("components/jquery/jquery.min.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("components/jquery-ui/ui/minified/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("components/bootstrap/bootstrap/js/bootstrap.min.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("components/bootstrap/dist/js/bootstrap.min.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>

Loading…
Cancel
Save