From 83094539bfac6cae766d4fab62c1874b0e34ba28 2014-06-09 19:05:38 From: Jonathan Frederic Date: 2014-06-09 19:05:38 Subject: [PATCH] Fab CSS --- diff --git a/IPython/html/static/style/ipython.min.css b/IPython/html/static/style/ipython.min.css index 549511b..66da61e 100644 --- a/IPython/html/static/style/ipython.min.css +++ b/IPython/html/static/style/ipython.min.css @@ -1,5 +1,6 @@ code{color:#222} +pre{font-size:inherit;line-height:inherit} .border-box-sizing{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} .corner-all{border-radius:4px} .no-padding{padding:0} @@ -24,34 +25,6 @@ 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;vertical-align:middle}.list_toolbar .tree-buttons{padding-top:2px} -.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} -.action_col{text-align:right} -.list_header>div,.list_item>div{padding-top:4px;padding-bottom:4px;padding-left:7px;padding-right:7px;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:22px;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} -.tab-content .row{margin-left:0;margin-right:0} .ansibold{font-weight:bold} .ansiblack{color:#000} .ansired{color:#8b0000} @@ -74,12 +47,12 @@ 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} +div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;line-height:1.21429em} 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:0;padding:0;background-color:transparent;font-size:14px;line-height:1.21429em} +div.input_area>div.highlight>pre{margin:0;border:none;padding:0;background-color:transparent} .CodeMirror{line-height:1.21429em;height:auto;background:none;} .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto} .CodeMirror-lines{padding:.4em} @@ -117,7 +90,7 @@ div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-bo 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;font-size:100%;vertical-align:baseline;color:#000;background-color:transparent;border-radius:0;line-height:inherit} +@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;border-radius:0} 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:#222;line-height:1.21429em} div.output_stderr{background:#fdd;} diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css index ca0c16e..53e0349 100644 --- a/IPython/html/static/style/style.min.css +++ b/IPython/html/static/style/style.min.css @@ -1280,6 +1280,7 @@ a .icon-rotate-90:before,a .icon-rotate-180:before,a .icon-rotate-270:before,a . .icon-weibo:before{content:"\f18a"} .icon-renren:before{content:"\f18b"} code{color:#222} +pre{font-size:inherit;line-height:inherit} .border-box-sizing{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box} .corner-all{border-radius:4px} .no-padding{padding:0} @@ -1346,6 +1347,8 @@ input.engine_num_input{width:60px} .highlight_text{color:#00f} #project_name>.breadcrumb{padding:0;margin-bottom:0;background-color:transparent;font-weight:bold} .tab-content .row{margin-left:0;margin-right:0} +.folder_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f114"} +.notebook_icon:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;content:"\f02d"} .ansibold{font-weight:bold} .ansiblack{color:#000} .ansired{color:#8b0000} @@ -1368,12 +1371,12 @@ 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} +div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;line-height:1.21429em} 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:0;padding:0;background-color:transparent;font-size:14px;line-height:1.21429em} +div.input_area>div.highlight>pre{margin:0;border:none;padding:0;background-color:transparent} .CodeMirror{line-height:1.21429em;height:auto;background:none;} .CodeMirror-scroll{overflow-y:hidden;overflow-x:auto} .CodeMirror-lines{padding:.4em} @@ -1411,7 +1414,7 @@ div.output_area{padding:0;page-break-inside:avoid;display:-webkit-box;-webkit-bo 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;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} +@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;border-radius:0} 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:#222;line-height:1.21429em} div.output_stderr{background:#fdd;} @@ -1516,7 +1519,7 @@ p{margin-bottom:0} .completions{position:absolute;z-index:10;overflow:hidden;border:1px solid #ababab;border-radius:4px;-webkit-box-shadow:0 6px 10px -1px #adadad;box-shadow:0 6px 10px -1px #adadad} .completions select{background:#fff;outline:none;border:none;padding:0;margin:0;overflow:auto;font-family:monospace;font-size:110%;color:#222;width:auto} .completions select option.context{color:#3071a9} -#menubar{margin-bottom:15px} +#menubar{margin-bottom:15px;margin-top:2px} #menubar .navbar-inner{min-height:28px;border-top:1px;border-radius:0 0 4px 4px} #menubar .navbar{margin-bottom:8px} .nav-wrapper{border-bottom:1px solid #e7e7e7} @@ -1543,13 +1546,13 @@ ul#menus{float:left} .notification_widget{color:#777;padding:1px 12px;margin:2px 4px;z-index:10;border:1px solid #ccc;border-radius:4px;background:rgba(240,240,240,0.5)}.notification_widget.span{padding-right:2px} div#pager_splitter{height:8px} #pager-container{position:relative;padding:15px 0} -div#pager{font-size:14px;line-height:20px;overflow:auto;display:none}div#pager pre{font-size:13px;line-height:1.21429em;color:#222;background-color:#f7f7f7;padding:.4em} +div#pager{font-size:14px;line-height:20px;overflow:auto;display:none}div#pager pre{line-height:1.21429em;color:#222;background-color:#f7f7f7;padding:.4em} .quickhelp{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} .shortcut_key{display:inline-block;width:20ex;text-align:right;font-family:monospace} .shortcut_descr{display:inline-block;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;flex:1} span#save_widget{padding:0 5px;margin-top:12px} span#checkpoint_status,span#autosave_status{font-size:small} -@media (max-width:767px){span#save_widget{font-size:small} span#checkpoint_status,span#autosave_status{font-size:x-small}}@media (max-width:767px){span#checkpoint_status,span#autosave_status{display:none}}@media (min-width:768px) and (max-width:979px){span#checkpoint_status{display:none} span#autosave_status{font-size:x-small}}.toolbar{padding:0 10px;margin-top:-5px}.toolbar select,.toolbar label{width:auto;vertical-align:middle;margin-right:2px;margin-bottom:0;display:inline;font-size:92%;margin-left:.3em;margin-right:.3em;padding:0;padding-top:3px} +@media (max-width:767px){span#save_widget{font-size:small} span#checkpoint_status,span#autosave_status{font-size:x-small}}@media (max-width:767px){span#checkpoint_status,span#autosave_status{display:none}}@media (min-width:768px) and (max-width:979px){span#checkpoint_status{display:none} span#autosave_status{font-size:x-small}}.toolbar{padding:0;margin-left:-5px;margin-top:-5px}.toolbar select,.toolbar label{width:auto;vertical-align:middle;margin-right:2px;margin-bottom:0;display:inline;font-size:92%;margin-left:.3em;margin-right:.3em;padding:0;padding-top:3px} .toolbar .btn{padding:2px 8px} .toolbar .btn-group{margin-top:0;margin-left:5px} .toolbar-inner{border:none !important;-webkit-box-shadow:none !important;box-shadow:none !important}