From f166c754db7d32388760389c1ffdf57b1c51d0e8 2013-05-24 22:19:34 From: Fernando Perez Date: 2013-05-24 22:19:34 Subject: [PATCH] Merge pull request #3325 from ellisonbg/jsreorg Organize the JS and less files by component, in the `static` directory of the notebook. This PR does the client side re-org that parallels the server side work in #3321. There are now subdirectories in `static/` for each part of the client; roughly speaking there is one subdir for each page, web service or component. --- diff --git a/IPython/core/tests/test_display.py b/IPython/core/tests/test_display.py index 61f5f8f..c34674d 100644 --- a/IPython/core/tests/test_display.py +++ b/IPython/core/tests/test_display.py @@ -29,7 +29,7 @@ def test_image_filename_defaults(): embed=True) nt.assert_raises(ValueError, display.Image) nt.assert_raises(ValueError, display.Image, data='this is not an image', format='badformat', embed=True) - imgfile = os.path.join(tpath, 'frontend/html/notebook/static/ipynblogo.png') + imgfile = os.path.join(tpath, 'frontend/html/notebook/static/base/images/ipynblogo.png') img = display.Image(filename=imgfile) nt.assert_equal('png', img.format) nt.assert_is_not_none(img._repr_png_()) diff --git a/IPython/frontend/html/notebook/README.md b/IPython/frontend/html/notebook/README.md index cf2889a..e528167 100644 --- a/IPython/frontend/html/notebook/README.md +++ b/IPython/frontend/html/notebook/README.md @@ -1,6 +1,6 @@ # IPython Notebook development -# Development dependencies +## Development dependencies Developers of the IPython Notebook will need to install the following tools: @@ -9,7 +9,7 @@ Developers of the IPython Notebook will need to install the following tools: * less (`npm install -g less`) * bower (`npm install -g bower`) -# Components +## Components We are moving to a model where our JavaScript dependencies are managed using [bower](http://bower.io/). These packages are installed in `static/components` @@ -22,8 +22,52 @@ we maintain our own fork of CodeMirror that is used with bower. This fork should track the upstream CodeMirror exactly; the only difference is that we are adding semantic versioned tags to our repo. -# less +## less If you edit our `.less` files you will need to run the less compiler to build our minified css files. This can be done by running `fab css` from this directory. +## JavaScript Documentation + + +How to Build/ view the doc for JavaScript. JavaScript documentation should follow a +style close to JSDoc one, so you should be able to build them with your favorite +documentation builder. Still the documentation comment are mainly written to be read +with YUI doc. You can either build a static version, or start a YUIdoc server that +will live update the doc at every page request. + + + +To do so, you will need to install YUIdoc. + +### Install NodeJS + +Node is a browser less javascript interpreter. To install it please refer to +the documentation for your platform. Install also NPM (node package manager) if +it does not come bundled with it. + +### Get YUIdoc + +npm does by default install package in `./node_modules` instead of doing a +system wide install. I'll leave you to yuidoc docs if you want to make a system +wide install. + +First, cd into js directory : +```bash +cd IPython/frontend/html/notebook/static/js/ +# install yuidoc +npm install yuidocjs +``` + + +### Run YUIdoc server + +From IPython/frontend/html/notebook/static/js/ +```bash +# run yuidoc for install dir +./node_modules/yuidocjs/lib/cli.js --server . +``` + +Follow the instruction and the documentation should be available on localhost:3000 + +Omitting `--server` will build a static version in the `out` folder by default. \ No newline at end of file diff --git a/IPython/frontend/html/notebook/fabfile.py b/IPython/frontend/html/notebook/fabfile.py index 06de449..224e148 100644 --- a/IPython/frontend/html/notebook/fabfile.py +++ b/IPython/frontend/html/notebook/fabfile.py @@ -7,15 +7,24 @@ import os static_dir = 'static' components_dir = os.path.join(static_dir, 'components') - -def css(minify=True): +def css(minify=True, verbose=False): """generate the css from less files""" - if minify not in ['True', 'False', True, False]: - abort('minify must be Boolean') - minify = (minify in ['True',True]) + source = os.path.join('style', 'style.less') + target = os.path.join('style', 'style.min.css') + _compile_less(source, target, minify, verbose) + +def _to_bool(b): + if not b in ['True', 'False', True, False]: + abort('boolean expected, got: %s' % b) + return (b in ['True', True]) - min_flag= '-x' if minify is True else '' +def _compile_less(source, target, minify=True, verbose=False): + """Complie a less file by source and target relative to static_dir""" + minify = _to_bool(minify) + verbose = _to_bool(verbose) + min_flag = '-x' if minify is True else '' + ver_flag = '--verbose' if verbose is True else '' lessc = os.path.join('components', 'less.js', 'bin', 'lessc') with lcd(static_dir): - local('{lessc} {min_flag} less/style.less css/style.min.css'.format(**locals())) + local('{lessc} {min_flag} {ver_flag} {source} {target}'.format(**locals())) diff --git a/IPython/frontend/html/notebook/notebook/handlers.py b/IPython/frontend/html/notebook/notebook/handlers.py index 9e931b4..4f8d360 100644 --- a/IPython/frontend/html/notebook/notebook/handlers.py +++ b/IPython/frontend/html/notebook/notebook/handlers.py @@ -43,7 +43,7 @@ class NamedNotebookHandler(IPythonHandler): nbm = self.notebook_manager if not nbm.notebook_exists(notebook_id): raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id) - self.write(self.render_template('notebooks.html', + self.write(self.render_template('notebook.html', project=self.project, notebook_id=notebook_id, kill_kernel=False, diff --git a/IPython/frontend/html/notebook/static/auth/css/override.css b/IPython/frontend/html/notebook/static/auth/css/override.css new file mode 100644 index 0000000..92b40d3 --- /dev/null +++ b/IPython/frontend/html/notebook/static/auth/css/override.css @@ -0,0 +1,8 @@ +/*This file contains any manual css for this page that needs to override the global styles. +This is only required when different pages style the same element differently. This is just +a hack to deal with our current css styles and no new styling should be added in this file.*/ + +#ipython-main-app { + margin: 50px auto; + text-align: center; +} \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/js/loginmain.js b/IPython/frontend/html/notebook/static/auth/js/loginmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/loginmain.js rename to IPython/frontend/html/notebook/static/auth/js/loginmain.js diff --git a/IPython/frontend/html/notebook/static/js/loginwidget.js b/IPython/frontend/html/notebook/static/auth/js/loginwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/loginwidget.js rename to IPython/frontend/html/notebook/static/auth/js/loginwidget.js diff --git a/IPython/frontend/html/notebook/static/js/logoutmain.js b/IPython/frontend/html/notebook/static/auth/js/logoutmain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/logoutmain.js rename to IPython/frontend/html/notebook/static/auth/js/logoutmain.js diff --git a/IPython/frontend/html/notebook/static/auth/less/login.less b/IPython/frontend/html/notebook/static/auth/less/login.less new file mode 100644 index 0000000..0c8c311 --- /dev/null +++ b/IPython/frontend/html/notebook/static/auth/less/login.less @@ -0,0 +1 @@ +// Custom styles for login.html \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/auth/less/logout.less b/IPython/frontend/html/notebook/static/auth/less/logout.less new file mode 100644 index 0000000..63cd701 --- /dev/null +++ b/IPython/frontend/html/notebook/static/auth/less/logout.less @@ -0,0 +1,2 @@ +// Custom styles for logout.html + diff --git a/IPython/frontend/html/notebook/static/auth/less/style.less b/IPython/frontend/html/notebook/static/auth/less/style.less new file mode 100644 index 0000000..86be9c5 --- /dev/null +++ b/IPython/frontend/html/notebook/static/auth/less/style.less @@ -0,0 +1,2 @@ +@import "../auth/less/login.less"; +@import "../auth/less/logout.less"; diff --git a/IPython/frontend/html/notebook/static/css/boilerplate.css b/IPython/frontend/html/notebook/static/base/css/boilerplate.css similarity index 100% rename from IPython/frontend/html/notebook/static/css/boilerplate.css rename to IPython/frontend/html/notebook/static/base/css/boilerplate.css diff --git a/IPython/frontend/html/notebook/static/favicon.ico b/IPython/frontend/html/notebook/static/base/images/favicon.ico similarity index 100% rename from IPython/frontend/html/notebook/static/favicon.ico rename to IPython/frontend/html/notebook/static/base/images/favicon.ico Binary files a/IPython/frontend/html/notebook/static/favicon.ico and b/IPython/frontend/html/notebook/static/base/images/favicon.ico differ diff --git a/IPython/frontend/html/notebook/static/ipynblogo.png b/IPython/frontend/html/notebook/static/base/images/ipynblogo.png similarity index 100% rename from IPython/frontend/html/notebook/static/ipynblogo.png rename to IPython/frontend/html/notebook/static/base/images/ipynblogo.png Binary files a/IPython/frontend/html/notebook/static/ipynblogo.png and b/IPython/frontend/html/notebook/static/base/images/ipynblogo.png differ diff --git a/IPython/frontend/html/notebook/static/IPy_Notebook_logo.svg b/IPython/frontend/html/notebook/static/base/images/ipynblogo.svg similarity index 100% rename from IPython/frontend/html/notebook/static/IPy_Notebook_logo.svg rename to IPython/frontend/html/notebook/static/base/images/ipynblogo.svg diff --git a/IPython/frontend/html/notebook/static/js/events.js b/IPython/frontend/html/notebook/static/base/js/events.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/events.js rename to IPython/frontend/html/notebook/static/base/js/events.js diff --git a/IPython/frontend/html/notebook/static/js/namespace.js b/IPython/frontend/html/notebook/static/base/js/namespace.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/namespace.js rename to IPython/frontend/html/notebook/static/base/js/namespace.js diff --git a/IPython/frontend/html/notebook/static/js/page.js b/IPython/frontend/html/notebook/static/base/js/page.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/page.js rename to IPython/frontend/html/notebook/static/base/js/page.js diff --git a/IPython/frontend/html/notebook/static/js/pagemain.js b/IPython/frontend/html/notebook/static/base/js/pagemain.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/pagemain.js rename to IPython/frontend/html/notebook/static/base/js/pagemain.js diff --git a/IPython/frontend/html/notebook/static/js/utils.js b/IPython/frontend/html/notebook/static/base/js/utils.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/utils.js rename to IPython/frontend/html/notebook/static/base/js/utils.js diff --git a/IPython/frontend/html/notebook/static/less/flexible-box-model.less b/IPython/frontend/html/notebook/static/base/less/flexbox.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/flexible-box-model.less rename to IPython/frontend/html/notebook/static/base/less/flexbox.less diff --git a/IPython/frontend/html/notebook/static/base/less/mixins.less b/IPython/frontend/html/notebook/static/base/less/mixins.less new file mode 100644 index 0000000..2032997 --- /dev/null +++ b/IPython/frontend/html/notebook/static/base/less/mixins.less @@ -0,0 +1,11 @@ +// Mixin CSS classes + +.border-box-sizing { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +.corner-all { + border-radius: @corner_radius; +} \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/css/page.css b/IPython/frontend/html/notebook/static/base/less/page.less similarity index 96% rename from IPython/frontend/html/notebook/static/css/page.css rename to IPython/frontend/html/notebook/static/base/less/page.less index 4ce53a6..91528a7 100644 --- a/IPython/frontend/html/notebook/static/css/page.css +++ b/IPython/frontend/html/notebook/static/base/less/page.less @@ -68,10 +68,3 @@ input.ui-button { span#login_widget { float: right; } - -.border-box-sizing { - box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - diff --git a/IPython/frontend/html/notebook/static/base/less/style.less b/IPython/frontend/html/notebook/static/base/less/style.less new file mode 100644 index 0000000..9981053 --- /dev/null +++ b/IPython/frontend/html/notebook/static/base/less/style.less @@ -0,0 +1,4 @@ +@import "../base/less/variables.less"; +@import "../base/less/mixins.less"; +@import "../base/less/flexbox.less"; +@import "../base/less/page.less"; diff --git a/IPython/frontend/html/notebook/static/base/less/variables.less b/IPython/frontend/html/notebook/static/base/less/variables.less new file mode 100644 index 0000000..2f356a6 --- /dev/null +++ b/IPython/frontend/html/notebook/static/base/less/variables.less @@ -0,0 +1,10 @@ +// Our customizations to bootstrap go here. + +@textColor: @black; +@baseFontSize: 13px; +@baseLineHeight: 1.231; +@monoFontFamily: monospace; // to allow user to customize their fonts + +// Our own global variables for all pages go here + +@corner_radius: 4px; \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/css/login.css b/IPython/frontend/html/notebook/static/css/login.css deleted file mode 100644 index 3cb3d4b..0000000 --- a/IPython/frontend/html/notebook/static/css/login.css +++ /dev/null @@ -1,6 +0,0 @@ - -#ipython-main-app { - height: 100px; - width: 350px; - margin: 50px auto; -} diff --git a/IPython/frontend/html/notebook/static/css/logout.css b/IPython/frontend/html/notebook/static/css/logout.css deleted file mode 100644 index 231eea2..0000000 --- a/IPython/frontend/html/notebook/static/css/logout.css +++ /dev/null @@ -1,7 +0,0 @@ - -#ipython-main-app { - height: 100px; - width: 200px; - margin: 50px auto; -} - diff --git a/IPython/frontend/html/notebook/static/css/custom.css b/IPython/frontend/html/notebook/static/custom/custom.css similarity index 80% rename from IPython/frontend/html/notebook/static/css/custom.css rename to IPython/frontend/html/notebook/static/custom/custom.css index e3f18e6..9f4abda 100644 --- a/IPython/frontend/html/notebook/static/css/custom.css +++ b/IPython/frontend/html/notebook/static/custom/custom.css @@ -1,7 +1,7 @@ /* Placeholder for custom user CSS -mainly to be overridden in profile/static/css/custom.css +mainly to be overridden in profile/static/custom/custom.css This will always be an empty file in IPython */ \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/js/custom.js b/IPython/frontend/html/notebook/static/custom/custom.js similarity index 88% rename from IPython/frontend/html/notebook/static/js/custom.js rename to IPython/frontend/html/notebook/static/custom/custom.js index 8375f39..a276b2d 100644 --- a/IPython/frontend/html/notebook/static/js/custom.js +++ b/IPython/frontend/html/notebook/static/custom/custom.js @@ -3,14 +3,14 @@ * * * Placeholder for custom user javascript - * mainly to be overridden in profile/static/js/custom.js + * mainly to be overridden in profile/static/custom/custom.js * This will always be an empty file in IPython * - * User could add any javascript in the `profile/static/js/custom.js` file + * User could add any javascript in the `profile/static/custom/custom.js` file * (and should create it if it does not exist). * It will be executed by the ipython notebook at load time. * - * Same thing with `profile/static/css/custom.css` to inject custom css into the notebook. + * Same thing with `profile/static/custom/custom.css` to inject custom css into the notebook. * * Example : * @@ -34,10 +34,10 @@ * to load custom script into the notebook. * * // to load the metadata ui extension example. - * $.getScript('/static/js/celltoolbarpresets/example.js'); + * $.getScript('/static/notebook/js/celltoolbarpresets/example.js'); * // or * // to load the metadata ui extension to control slideshow mode / reveal js for nbconvert - * $.getScript('/static/js/celltoolbarpresets/slideshow.js'); + * $.getScript('/static/notebook/js/celltoolbarpresets/slideshow.js'); * * * @module IPython diff --git a/IPython/frontend/html/notebook/static/js/README.md b/IPython/frontend/html/notebook/static/js/README.md deleted file mode 100644 index 0139463..0000000 --- a/IPython/frontend/html/notebook/static/js/README.md +++ /dev/null @@ -1,48 +0,0 @@ -Documentation -============= - -How to Build/ view the doc for javascript. - -Javascript documentation should follow a style close to JSDoc one, so you -should be able to build them with your favorite documentation builder. - -Still the documentation comment are mainly written to be read with YUI doc. - -You can either build a static version, or start a YUIdoc server that will live -update the doc at every page request. - -To do so, you will need to install YUIdoc. - -## Install NodeJS - -Node is a browser less javascript interpreter. To install it please refer to -the documentation for your platform. Install also NPM (node package manager) if -it does not come bundled with it. - -## Get YUIdoc - -npm does by default install package in `./node_modules` instead of doing a -system wide install. I'll leave you to yuidoc docs if you want to make a system -wide install. - -First, cd into js directory : -```bash -cd IPython/frontend/html/notebook/static/js/ -# install yuidoc -npm install yuidocjs -``` - - -## Run YUIdoc server - -From IPython/frontend/html/notebook/static/js/ -```bash -# run yuidoc for install dir -./node_modules/yuidocjs/lib/cli.js --server . -``` - -Follow the instruction and the documentation should be available on localhost:3000 - -Omitting `--server` will build a static version in the `out` folder by default. - - diff --git a/IPython/frontend/html/notebook/static/less/bootstrap-custom.less b/IPython/frontend/html/notebook/static/less/bootstrap-custom.less deleted file mode 100644 index 1dba16d..0000000 --- a/IPython/frontend/html/notebook/static/less/bootstrap-custom.less +++ /dev/null @@ -1,63 +0,0 @@ -/*! - * Bootstrap v2.2.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -// CSS Reset -@import "../components/bootstrap/less/reset.less"; - -// Core variables and mixins -@import "bootstrap-variables.less"; // Modify this for custom colors, font-sizes, etc -@import "../components/bootstrap/less/mixins.less"; - -// Grid system and page structure -@import "../components/bootstrap/less/scaffolding.less"; -@import "../components/bootstrap/less/grid.less"; -@import "../components/bootstrap/less/layouts.less"; - -// Base CSS -@import "../components/bootstrap/less/type.less"; -//@import "../components/bootstrap/less/code.less"; -@import "../components/bootstrap/less/forms.less"; -@import "../components/bootstrap/less/tables.less"; - -// Components: common -@import "../components/bootstrap/less/sprites.less"; -@import "../components/bootstrap/less/dropdowns.less"; -@import "../components/bootstrap/less/wells.less"; -@import "../components/bootstrap/less/component-animations.less"; -@import "../components/bootstrap/less/close.less"; - -// Components: Buttons & Alerts -@import "../components/bootstrap/less/buttons.less"; -@import "../components/bootstrap/less/button-groups.less"; -@import "../components/bootstrap/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less - -// Components: Nav -@import "../components/bootstrap/less/navs.less"; -@import "../components/bootstrap/less/navbar.less"; -@import "../components/bootstrap/less/breadcrumbs.less"; -@import "../components/bootstrap/less/pagination.less"; -@import "../components/bootstrap/less/pager.less"; - -// Components: Popovers -@import "../components/bootstrap/less/modals.less"; -@import "../components/bootstrap/less/tooltip.less"; -@import "../components/bootstrap/less/popovers.less"; - -// Components: Misc -@import "../components/bootstrap/less/thumbnails.less"; -@import "../components/bootstrap/less/media.less"; -@import "../components/bootstrap/less/labels-badges.less"; -@import "../components/bootstrap/less/progress-bars.less"; -@import "../components/bootstrap/less/accordion.less"; -@import "../components/bootstrap/less/carousel.less"; -@import "../components/bootstrap/less/hero-unit.less"; - -// Utility classes -@import "../components/bootstrap/less/utilities.less"; // Has to be last to override when necessary diff --git a/IPython/frontend/html/notebook/static/less/bootstrap-variables.less b/IPython/frontend/html/notebook/static/less/bootstrap-variables.less deleted file mode 100644 index 0f42775..0000000 --- a/IPython/frontend/html/notebook/static/less/bootstrap-variables.less +++ /dev/null @@ -1,301 +0,0 @@ -// -// Variables -// -------------------------------------------------- - - -// Global values -// -------------------------------------------------- - - -// Grays -// ------------------------- -@black: #000; -@grayDarker: #222; -@grayDark: #333; -@gray: #555; -@grayLight: #999; -@grayLighter: #eee; -@white: #fff; - - -// Accent colors -// ------------------------- -@blue: #049cdb; -@blueDark: #0064cd; -@green: #46a546; -@red: #9d261d; -@yellow: #ffc40d; -@orange: #f89406; -@pink: #c3325f; -@purple: #7a43b6; - - -// Scaffolding -// ------------------------- -@bodyBackground: @white; -@textColor: @black; - - -// Links -// ------------------------- -@linkColor: #08c; -@linkColorHover: darken(@linkColor, 15%); - - -// Typography -// ------------------------- -@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif; -@serifFontFamily: Georgia, "Times New Roman", Times, serif; -@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace; - -@baseFontSize: 13px; -@baseFontFamily: @sansFontFamily; -@baseLineHeight: 20px; -@altFontFamily: @serifFontFamily; - -@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily -@headingsFontWeight: bold; // instead of browser default, bold -@headingsColor: inherit; // empty to use BS default, @textColor - - -// Component sizing -// ------------------------- -// Based on 14px font-size and 20px line-height - -@fontSizeLarge: @baseFontSize * 1.25; // ~18px -@fontSizeSmall: @baseFontSize * 0.85; // ~12px -@fontSizeMini: @baseFontSize * 0.75; // ~11px - -@paddingLarge: 11px 19px; // 44px -@paddingSmall: 2px 10px; // 26px -@paddingMini: 0 6px; // 22px - -@baseBorderRadius: 4px; -@borderRadiusLarge: 6px; -@borderRadiusSmall: 3px; - - -// Tables -// ------------------------- -@tableBackground: transparent; // overall background-color -@tableBackgroundAccent: #f9f9f9; // for striping -@tableBackgroundHover: #f5f5f5; // for hover -@tableBorder: #ddd; // table and cell border - -// Buttons -// ------------------------- -@btnBackground: @white; -@btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: #bbb; - -@btnPrimaryBackground: @linkColor; -@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); - -@btnInfoBackground: #5bc0de; -@btnInfoBackgroundHighlight: #2f96b4; - -@btnSuccessBackground: #62c462; -@btnSuccessBackgroundHighlight: #51a351; - -@btnWarningBackground: lighten(@orange, 15%); -@btnWarningBackgroundHighlight: @orange; - -@btnDangerBackground: #ee5f5b; -@btnDangerBackgroundHighlight: #bd362f; - -@btnInverseBackground: #444; -@btnInverseBackgroundHighlight: @grayDarker; - - -// Forms -// ------------------------- -@inputBackground: @white; -@inputBorder: #ccc; -@inputBorderRadius: @baseBorderRadius; -@inputDisabledBackground: @grayLighter; -@formActionsBackground: #f5f5f5; -@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border - - -// Dropdowns -// ------------------------- -@dropdownBackground: @white; -@dropdownBorder: rgba(0,0,0,.2); -@dropdownDividerTop: #e5e5e5; -@dropdownDividerBottom: @white; - -@dropdownLinkColor: @grayDark; -@dropdownLinkColorHover: @white; -@dropdownLinkColorActive: @white; - -@dropdownLinkBackgroundActive: @linkColor; -@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive; - - - -// COMPONENT VARIABLES -// -------------------------------------------------- - - -// Z-index master list -// ------------------------- -// Used for a bird's eye view of components dependent on the z-axis -// Try to avoid customizing these :) -@zindexDropdown: 1000; -@zindexPopover: 1010; -@zindexTooltip: 1030; -@zindexFixedNavbar: 1030; -@zindexModalBackdrop: 1040; -@zindexModal: 1050; - - -// Sprite icons path -// ------------------------- -@iconSpritePath: "../img/glyphicons-halflings.png"; -@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; - - -// Input placeholder text color -// ------------------------- -@placeholderText: @grayLight; - - -// Hr border color -// ------------------------- -@hrBorder: @grayLighter; - - -// Horizontal forms & lists -// ------------------------- -@horizontalComponentOffset: 180px; - - -// Wells -// ------------------------- -@wellBackground: #f5f5f5; - - -// Navbar -// ------------------------- -@navbarCollapseWidth: 979px; -@navbarCollapseDesktopWidth: @navbarCollapseWidth + 1; - -@navbarHeight: 40px; -@navbarBackgroundHighlight: #ffffff; -@navbarBackground: darken(@navbarBackgroundHighlight, 5%); -@navbarBorder: darken(@navbarBackground, 12%); - -@navbarText: #777; -@navbarLinkColor: #777; -@navbarLinkColorHover: @grayDark; -@navbarLinkColorActive: @gray; -@navbarLinkBackgroundHover: transparent; -@navbarLinkBackgroundActive: darken(@navbarBackground, 5%); - -@navbarBrandColor: @navbarLinkColor; - -// Inverted navbar -@navbarInverseBackground: #111111; -@navbarInverseBackgroundHighlight: #222222; -@navbarInverseBorder: #252525; - -@navbarInverseText: @grayLight; -@navbarInverseLinkColor: @grayLight; -@navbarInverseLinkColorHover: @white; -@navbarInverseLinkColorActive: @navbarInverseLinkColorHover; -@navbarInverseLinkBackgroundHover: transparent; -@navbarInverseLinkBackgroundActive: @navbarInverseBackground; - -@navbarInverseSearchBackground: lighten(@navbarInverseBackground, 25%); -@navbarInverseSearchBackgroundFocus: @white; -@navbarInverseSearchBorder: @navbarInverseBackground; -@navbarInverseSearchPlaceholderColor: #ccc; - -@navbarInverseBrandColor: @navbarInverseLinkColor; - - -// Pagination -// ------------------------- -@paginationBackground: #fff; -@paginationBorder: #ddd; -@paginationActiveBackground: #f5f5f5; - - -// Hero unit -// ------------------------- -@heroUnitBackground: @grayLighter; -@heroUnitHeadingColor: inherit; -@heroUnitLeadColor: inherit; - - -// Form states and alerts -// ------------------------- -@warningText: #c09853; -@warningBackground: #fcf8e3; -@warningBorder: darken(spin(@warningBackground, -10), 3%); - -@errorText: #b94a48; -@errorBackground: #f2dede; -@errorBorder: darken(spin(@errorBackground, -10), 3%); - -@successText: #468847; -@successBackground: #dff0d8; -@successBorder: darken(spin(@successBackground, -10), 5%); - -@infoText: #3a87ad; -@infoBackground: #d9edf7; -@infoBorder: darken(spin(@infoBackground, -10), 7%); - - -// Tooltips and popovers -// ------------------------- -@tooltipColor: #fff; -@tooltipBackground: #000; -@tooltipArrowWidth: 5px; -@tooltipArrowColor: @tooltipBackground; - -@popoverBackground: #fff; -@popoverArrowWidth: 10px; -@popoverArrowColor: #fff; -@popoverTitleBackground: darken(@popoverBackground, 3%); - -// Special enhancement for popovers -@popoverArrowOuterWidth: @popoverArrowWidth + 1; -@popoverArrowOuterColor: rgba(0,0,0,.25); - - - -// GRID -// -------------------------------------------------- - - -// Default 940px grid -// ------------------------- -@gridColumns: 12; -@gridColumnWidth: 60px; -@gridGutterWidth: 20px; -@gridRowWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); - -// 1200px min -@gridColumnWidth1200: 70px; -@gridGutterWidth1200: 30px; -@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1)); - -// 768px-979px -@gridColumnWidth768: 42px; -@gridGutterWidth768: 20px; -@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1)); - - -// Fluid grid -// ------------------------- -@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth); -@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth); - -// 1200px min -@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200); -@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200); - -// 768px-979px -@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768); -@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768); diff --git a/IPython/frontend/html/notebook/static/less/notebook.less b/IPython/frontend/html/notebook/static/less/notebook.less deleted file mode 100644 index 82d837d..0000000 --- a/IPython/frontend/html/notebook/static/less/notebook.less +++ /dev/null @@ -1,513 +0,0 @@ -/** - * Primary styles - * - * Author: IPython Development Team - */ - -@import "variables.less"; -@import "highlight.less"; - -body { - background-color:@notebook_background; -} - -body.notebook_app { - overflow: hidden; -} - -blockquote { - border-left: 4px solid #DDD; - padding: 0 15px; - color: #777; -} - -span#save_widget { - padding: 5px; - margin: 0px 0px 0px 300px; - display:inline-block; -} - -span#checkpoint_status span#autosave_status { - font-size: small; -} - -/*span#save_widget > span#autosave_status { - font-size: x-small; -} -*/ -span#notebook_name { - height: 1em; - line-height: 1em; - padding: 3px; - border: none; - font-size: 146.5%; -} - - -.ui-menubar-item .ui-button .ui-button-text { - padding: 0.4em 1.0em; - font-size: 100%; -} - -.ui-menu { - .box-shadow(0px 6px 10px -1px #adadad); -} - -.ui-menu .ui-menu-item a { - border: 1px solid transparent; - padding: 2px 1.6em; -} - -.ui-menu .ui-menu-item a.ui-state-focus { - margin: 0; -} - -.ui-menu hr { - margin: 0.3em 0; -} - -#menubar_container { - position: relative; -} - -#notification_area { - position: absolute; - right: 0px; - top: 0px; - height: 25px; - padding: 3px 0px; - padding-right: 3px; - z-index: 10; -} - -.notification_widget{ - float : right; - right: 0px; - top: 1px; - height: 25px; - padding: 3px 6px; - z-index: 10; -} - -.toolbar { - padding: 3px 15px; - border-bottom: @borderwidth @border_color solid; - - button { - margin-top:2px; - margin-bottom:2px; - } - - - select, label { - height : 19px; - vertical-align:middle; - margin-right:2px; - margin-bottom:0; - display: inline; - font-size: 92%; - margin-left:0.3em; - margin-right:0.3em; - padding: 0px; - } -} - -.toolbar select{ - width:auto; -} - - -#ipython-main-app { - width: 100%; - position: relative; - font-size: 110%; -} - -span#quick_help_area { - position: static; - padding: 5px 0px; - margin: 0px 0px 0px 0px; -} - -.help_string { - float: right; - width: 170px; - padding: 0px 5px; - text-align: left; - font-size: 85%; -} - -.help_string_label { - float: right; - font-size: 85%; -} - -div#notebook_panel { - margin: 0px 0px 0px 0px; - padding: 0px; -} - -div#notebook { - overflow-y: scroll; - overflow-x: auto; - width: 100%; - /* This spaces the cell away from the edge of the notebook area */ - padding: 5px 5px 15px 5px; - margin: 0px; -} - -div#pager_splitter { - height: 8px; -} - -#pager_container { - position : relative; -} - -div#pager { - padding: 15px; - overflow: auto; - display: none; -} - -div.ui-widget-content { - border: 1px solid @border_color; - outline: none; -} - -.cell { - border: 1px solid transparent; - .vbox(); - - &.selected { - .corner-all; - border : thin @border_color solid; - } -} - -div.cell { - width: 100%; - padding: 5px 5px 5px 0px; - /* This acts as a spacer between cells, that is outside the border */ - margin: 2px 0px 2px 0px; - outline: none; -} - -div.code_cell { -} - -/* any special styling for code cells that are currently running goes here */ -div.code_cell.running { -} - -div.prompt { - /* This needs to be wide enough for 3 digit prompt numbers: In[100]: */ - width: 11ex; - /* This 0.4em is tuned to match the padding on the CodeMirror editor. */ - padding: 0.4em; - margin: 0px; - font-family: monospace; - text-align: right; - /* This has to match that of the the CodeMirror class line-height below */ - line-height: 1.231; -} - -div.input { - page-break-inside: avoid; - .hbox(); -} - -/* input_area and input_prompt must match in top border and margin for alignment */ -div.input_area { - /*color: @fontBaseColor;*/ - border: 1px solid @light_border_color; - .corner-all; - background: @cell_background; -} - -div.input_prompt { - color: navy; - border-top: 1px solid transparent; -} - -div.output_wrapper { - /* This is a spacer between the input and output of each cell */ - margin-top: 5px; - margin-left: 5px; - /* FF needs explicit width to stretch */ - width: 100%; - /* this position must be relative to enable descendents to be absolute within it */ - position: relative; -} - -/* class for the output area when it should be height-limited */ -div.output_scroll { - /* ideally, this would be max-height, but FF barfs all over that */ - height: 24em; - /* FF needs this *and the wrapper* to specify full width, or it will shrinkwrap */ - width: 100%; - - overflow: auto; - .corner-all; - .box-shadow(inset 0 2px 8px rgba(0, 0, 0, .8)); -} - -/* output div while it is collapsed */ -div.output_collapsed { - margin-right: 5px; -} - -div.out_prompt_overlay { - height: 100%; - padding: 0px; - position: absolute; - .corner-all; -} - -div.out_prompt_overlay:hover { - /* use inner shadow to get border that is computed the same on WebKit/FF */ - .box-shadow(inset 0 0 1px #000); - background: rgba(240, 240, 240, 0.5); -} - -div.output_prompt { - color: darkred; - /* 5px right shift to account for margin in parent container */ - margin: 0 5px 0 -5px; -} - -/* This class is the outer container of all output sections. */ -div.output_area { - padding: 0px; - page-break-inside: avoid; - .hbox(); -} - - -/* This is needed to protect the pre formating from global settings such - as that of bootstrap */ -div.output_area pre { - font-family: monospace; - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - vertical-align: baseline; - color: black; -} - -/* This class is for the output subarea inside the output_area and after - the prompt div. */ -div.output_subarea { - padding: 0.44em 0.4em 0.4em 1px; - .box-flex1(); -} - -/* The rest of the output_* classes are for special styling of the different - output types */ - -/* all text output has this class: */ -div.output_text { - text-align: left; - color: @fontBaseColor; - font-family: monospace; - /* This has to match that of the the CodeMirror class line-height below */ - line-height: 1.231; -} - -/* stdout/stderr are 'text' as well as 'stream', but pyout/pyerr are *not* streams */ -div.output_stream { - padding-top: 0.0em; - padding-bottom: 0.0em; -} -div.output_stdout { -} -div.output_stderr { - background: #fdd; /* very light red background for stderr */ -} - -div.output_latex { - text-align: left; -} - -div.output_html { -} - -div.output_png { -} - -div.output_jpeg { -} - -div.text_cell { - padding: 5px 5px 5px 5px; -} - -div.text_cell_input { - color: @fontBaseColor; - border: 1px solid @light_border_color; - .corner-all; - background: @cell_background; -} - -div.text_cell_render { - /*font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;*/ - outline: none; - resize: none; - width: inherit; - border-style: none; - padding: 5px; - color: @fontBaseColor; -} - -/* The following gets added to the if it is detected that the user has a - * monospace font with inconsistent normal/bold/italic height. See - * notebookmain.js. Such fonts will have keywords vertically offset with - * respect to the rest of the text. The user should select a better font. - * See: https://github.com/ipython/ipython/issues/1503 - * - * .CodeMirror span { - * vertical-align: bottom; - * } - */ - -.CodeMirror { - line-height: 1.231; /* Changed from 1em to our global default */ - height: auto; /* Changed to auto to autogrow */ - background: none; /* Changed from white to allow our bg to show through */ -} - -.CodeMirror-scroll { - /* The CodeMirror docs are a bit fuzzy on if overflow-y should be hidden or visible.*/ - /* We have found that if it is visible, vertical scrollbars appear with font size changes.*/ - overflow-y: hidden; - overflow-x: auto; /* Changed from auto to remove scrollbar */ -} - -.CodeMirror-lines { - /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */ - /* we have set a different line-height and want this to scale with that. */ - padding: 0.4em; -} - -.CodeMirror pre { - /* In CM3 this went to 4px from 0 in CM2. We need the 0 value because of how we size */ - /* .CodeMirror-lines */ - padding: 0; -} - -/* CSS font colors for translated ANSI colors. */ - - -.ansiblack {color: @fontBaseColor;} -.ansired {color: darkred;} -.ansigreen {color: darkgreen;} -.ansiyellow {color: brown;} -.ansiblue {color: darkblue;} -.ansipurple {color: darkviolet;} -.ansicyan {color: steelblue;} -.ansigrey {color: grey;} -.ansibold {font-weight: bold;} - -.completions { - position: absolute; - z-index: 10; - overflow: hidden; - border: 1px solid @border_color; - .corner-all; - .box-shadow(0px 6px 10px -1px #adadad); -} - -.completions select { - background: white; - outline: none; - border: none; - padding: 0px; - margin: 0px; - overflow: auto; - font-family: monospace; - font-size: 110%; - color: @fontBaseColor; -} - -.completions select option.context { - color: @blueDark; -} - -pre.dialog { - background-color: @cell_background; - border: 1px solid #ddd; - .corner-all; - padding: 0.4em; - padding-left: 2em; -} - -p.dialog { - padding : 0.2em; -} - -.shortcut_key { - display: inline-block; - width: 15ex; - text-align: right; - font-family: monospace; -} - -.shortcut_descr { -} - -/* Word-wrap output correctly. This is the CSS3 spelling, though Firefox seems - to not honor it correctly. Webkit browsers (Chrome, rekonq, Safari) do. - */ -pre, code, kbd, samp { white-space: pre-wrap; } - -#fonttest { - font-family: monospace; -} - -.js-error { - color: darkred; -} - -a { - text-decoration: underline; -} - -p { - -margin-bottom:0; - -} - -a.heading-anchor:link, a.heading-anchor:visited { - text-decoration: none; - color: inherit; -} - -/* raw_input styles */ - -div.raw_input { - padding-top: 0px; - padding-bottom: 0px; - height: 1em; - line-height: 1em; - font-family: monospace; -} -span.input_prompt { - font-family: inherit; -} -input.raw_input { - font-family: inherit; - font-size: inherit; - color: inherit; - width: auto; - margin: -2px 0px 0px 1px; - padding-left: 1px; - padding-top: 2px; - height: 1em; -} - -p.p-space { - margin-bottom: 10px; -} - diff --git a/IPython/frontend/html/notebook/static/less/style.less b/IPython/frontend/html/notebook/static/less/style.less deleted file mode 100644 index 1b607f1..0000000 --- a/IPython/frontend/html/notebook/static/less/style.less +++ /dev/null @@ -1,6 +0,0 @@ -@import "bootstrap-custom.less"; -@import "variables.less"; -@import "flexible-box-model.less"; -@import "notebook.less"; -@import "renderedhtml.less"; -@import "tooltip.less"; diff --git a/IPython/frontend/html/notebook/static/less/variables.less b/IPython/frontend/html/notebook/static/less/variables.less deleted file mode 100644 index 29692cf..0000000 --- a/IPython/frontend/html/notebook/static/less/variables.less +++ /dev/null @@ -1,18 +0,0 @@ -@corner_radius: 4px; -@notebook_background : white; -@cell_selected_background: darken(@notebook_background, 2%); -@cell_background: darken(@notebook_background, 3.2%); -@border_color: darken(@cell_selected_background, 31%); -@light_border_color: darken(@cell_selected_background, 17%); -@borderwidth : 1px; -@fontBaseColor : black; - - - - - -// utilities mixins - -.corner-all { - border-radius:@corner_radius; -} diff --git a/IPython/frontend/html/notebook/static/notebook/css/override.css b/IPython/frontend/html/notebook/static/notebook/css/override.css new file mode 100644 index 0000000..631930a --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/css/override.css @@ -0,0 +1,9 @@ +/*This file contains any manual css for this page that needs to override the global styles. +This is only required when different pages style the same element differently. This is just +a hack to deal with our current css styles and no new styling should be added in this file.*/ + +#ipython-main-app { + width: 100%; + position: relative; + font-size: 110%; +} \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/js/cell.js b/IPython/frontend/html/notebook/static/notebook/js/cell.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/cell.js rename to IPython/frontend/html/notebook/static/notebook/js/cell.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbar.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbar.js rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbar.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/default.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/default.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbarpresets/default.js rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/default.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/example.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/example.js diff --git a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/slideshow.js b/IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/celltoolbarpresets/slideshow.js rename to IPython/frontend/html/notebook/static/notebook/js/celltoolbarpresets/slideshow.js diff --git a/IPython/frontend/html/notebook/static/js/codecell.js b/IPython/frontend/html/notebook/static/notebook/js/codecell.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/codecell.js rename to IPython/frontend/html/notebook/static/notebook/js/codecell.js diff --git a/IPython/frontend/html/notebook/static/js/codemirror-ipython.js b/IPython/frontend/html/notebook/static/notebook/js/codemirror-ipython.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/codemirror-ipython.js rename to IPython/frontend/html/notebook/static/notebook/js/codemirror-ipython.js diff --git a/IPython/frontend/html/notebook/static/js/completer.js b/IPython/frontend/html/notebook/static/notebook/js/completer.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/completer.js rename to IPython/frontend/html/notebook/static/notebook/js/completer.js diff --git a/IPython/frontend/html/notebook/static/js/config.js b/IPython/frontend/html/notebook/static/notebook/js/config.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/config.js rename to IPython/frontend/html/notebook/static/notebook/js/config.js diff --git a/IPython/frontend/html/notebook/static/js/contexthint.js b/IPython/frontend/html/notebook/static/notebook/js/contexthint.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/contexthint.js rename to IPython/frontend/html/notebook/static/notebook/js/contexthint.js diff --git a/IPython/frontend/html/notebook/static/js/layoutmanager.js b/IPython/frontend/html/notebook/static/notebook/js/layoutmanager.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/layoutmanager.js rename to IPython/frontend/html/notebook/static/notebook/js/layoutmanager.js diff --git a/IPython/frontend/html/notebook/static/js/notebookmain.js b/IPython/frontend/html/notebook/static/notebook/js/main.js similarity index 99% rename from IPython/frontend/html/notebook/static/js/notebookmain.js rename to IPython/frontend/html/notebook/static/notebook/js/main.js index 77ab8de..ae21231 100644 --- a/IPython/frontend/html/notebook/static/js/notebookmain.js +++ b/IPython/frontend/html/notebook/static/notebook/js/main.js @@ -44,7 +44,7 @@ $(document).ready(function () { IPython.page = new IPython.Page(); IPython.layout_manager = new IPython.LayoutManager(); IPython.pager = new IPython.Pager('div#pager', 'div#pager_splitter'); - IPython.quick_help = new IPython.QuickHelp('span#quick_help_area'); + IPython.quick_help = new IPython.QuickHelp(); IPython.login_widget = new IPython.LoginWidget('span#login_widget',{baseProjectUrl:baseProjectUrl}); IPython.notebook = new IPython.Notebook('div#notebook',{baseProjectUrl:baseProjectUrl, read_only:IPython.read_only}); IPython.save_widget = new IPython.SaveWidget('span#save_widget'); diff --git a/IPython/frontend/html/notebook/static/js/maintoolbar.js b/IPython/frontend/html/notebook/static/notebook/js/maintoolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/maintoolbar.js rename to IPython/frontend/html/notebook/static/notebook/js/maintoolbar.js diff --git a/IPython/frontend/html/notebook/static/js/mathjaxutils.js b/IPython/frontend/html/notebook/static/notebook/js/mathjaxutils.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/mathjaxutils.js rename to IPython/frontend/html/notebook/static/notebook/js/mathjaxutils.js diff --git a/IPython/frontend/html/notebook/static/js/menubar.js b/IPython/frontend/html/notebook/static/notebook/js/menubar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/menubar.js rename to IPython/frontend/html/notebook/static/notebook/js/menubar.js diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/notebook/js/notebook.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notebook.js rename to IPython/frontend/html/notebook/static/notebook/js/notebook.js diff --git a/IPython/frontend/html/notebook/static/js/notificationarea.js b/IPython/frontend/html/notebook/static/notebook/js/notificationarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notificationarea.js rename to IPython/frontend/html/notebook/static/notebook/js/notificationarea.js diff --git a/IPython/frontend/html/notebook/static/js/notificationwidget.js b/IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notificationwidget.js rename to IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js diff --git a/IPython/frontend/html/notebook/static/js/outputarea.js b/IPython/frontend/html/notebook/static/notebook/js/outputarea.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/outputarea.js rename to IPython/frontend/html/notebook/static/notebook/js/outputarea.js diff --git a/IPython/frontend/html/notebook/static/js/pager.js b/IPython/frontend/html/notebook/static/notebook/js/pager.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/pager.js rename to IPython/frontend/html/notebook/static/notebook/js/pager.js diff --git a/IPython/frontend/html/notebook/static/js/quickhelp.js b/IPython/frontend/html/notebook/static/notebook/js/quickhelp.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/quickhelp.js rename to IPython/frontend/html/notebook/static/notebook/js/quickhelp.js diff --git a/IPython/frontend/html/notebook/static/js/savewidget.js b/IPython/frontend/html/notebook/static/notebook/js/savewidget.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/savewidget.js rename to IPython/frontend/html/notebook/static/notebook/js/savewidget.js diff --git a/IPython/frontend/html/notebook/static/js/textcell.js b/IPython/frontend/html/notebook/static/notebook/js/textcell.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/textcell.js rename to IPython/frontend/html/notebook/static/notebook/js/textcell.js diff --git a/IPython/frontend/html/notebook/static/js/toolbar.js b/IPython/frontend/html/notebook/static/notebook/js/toolbar.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/toolbar.js rename to IPython/frontend/html/notebook/static/notebook/js/toolbar.js diff --git a/IPython/frontend/html/notebook/static/js/tooltip.js b/IPython/frontend/html/notebook/static/notebook/js/tooltip.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/tooltip.js rename to IPython/frontend/html/notebook/static/notebook/js/tooltip.js diff --git a/IPython/frontend/html/notebook/static/notebook/less/ansicolors.less b/IPython/frontend/html/notebook/static/notebook/less/ansicolors.less new file mode 100644 index 0000000..9ae8d87 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/ansicolors.less @@ -0,0 +1,13 @@ +/* CSS font colors for translated ANSI colors. */ + + +.ansiblack {color: black;} +.ansired {color: darkred;} +.ansigreen {color: darkgreen;} +.ansiyellow {color: brown;} +.ansiblue {color: darkblue;} +.ansipurple {color: darkviolet;} +.ansicyan {color: steelblue;} +.ansigrey {color: grey;} +.ansibold {font-weight: bold;} + diff --git a/IPython/frontend/html/notebook/static/notebook/less/cell.less b/IPython/frontend/html/notebook/static/notebook/less/cell.less new file mode 100644 index 0000000..610a790 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/cell.less @@ -0,0 +1,29 @@ +.cell { + border: 1px solid transparent; + .vbox(); + + &.selected { + .corner-all; + border : thin @border_color solid; + } +} + +div.cell { + width: 100%; + padding: 5px 5px 5px 0px; + /* This acts as a spacer between cells, that is outside the border */ + margin: 2px 0px 2px 0px; + outline: none; +} + +div.prompt { + /* This needs to be wide enough for 3 digit prompt numbers: In[100]: */ + width: 11ex; + /* This 0.4em is tuned to match the padding on the CodeMirror editor. */ + padding: 0.4em; + margin: 0px; + font-family: @monoFontFamily; + text-align: right; + /* This has to match that of the the CodeMirror class line-height below */ + line-height: @baseLineHeight; +} diff --git a/IPython/frontend/html/notebook/static/css/celltoolbar.css b/IPython/frontend/html/notebook/static/notebook/less/celltoolbar.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/celltoolbar.css rename to IPython/frontend/html/notebook/static/notebook/less/celltoolbar.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/codecell.less b/IPython/frontend/html/notebook/static/notebook/less/codecell.less new file mode 100644 index 0000000..2ca1dff --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/codecell.less @@ -0,0 +1,69 @@ +div.code_cell { +} + +/* any special styling for code cells that are currently running goes here */ +div.code_cell.running { +} + +div.input { + page-break-inside: avoid; + .hbox(); +} + +/* input_area and input_prompt must match in top border and margin for alignment */ +div.input_area { + border: 1px solid @light_border_color; + .corner-all; + background: @cell_background; +} + +div.input_prompt { + color: navy; + border-top: 1px solid transparent; +} + +div.output_wrapper { + /* This is a spacer between the input and output of each cell */ + margin-top: 5px; + margin-left: 5px; + /* FF needs explicit width to stretch */ + width: 100%; + /* this position must be relative to enable descendents to be absolute within it */ + position: relative; +} + +/* class for the output area when it should be height-limited */ +div.output_scroll { + /* ideally, this would be max-height, but FF barfs all over that */ + height: 24em; + /* FF needs this *and the wrapper* to specify full width, or it will shrinkwrap */ + width: 100%; + + overflow: auto; + .corner-all; + .box-shadow(inset 0 2px 8px rgba(0, 0, 0, .8)); +} + +/* output div while it is collapsed */ +div.output_collapsed { + margin-right: 5px; +} + +div.out_prompt_overlay { + height: 100%; + padding: 0px; + position: absolute; + .corner-all; +} + +div.out_prompt_overlay:hover { + /* use inner shadow to get border that is computed the same on WebKit/FF */ + .box-shadow(inset 0 0 1px #000); + background: rgba(240, 240, 240, 0.5); +} + +div.output_prompt { + color: darkred; + /* 5px right shift to account for margin in parent container */ + margin: 0 5px 0 -5px; +} diff --git a/IPython/frontend/html/notebook/static/notebook/less/codemirror.less b/IPython/frontend/html/notebook/static/notebook/less/codemirror.less new file mode 100644 index 0000000..52fe51a --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/codemirror.less @@ -0,0 +1,50 @@ +/* The following gets added to the if it is detected that the user has a + * monospace font with inconsistent normal/bold/italic height. See + * notebookmain.js. Such fonts will have keywords vertically offset with + * respect to the rest of the text. The user should select a better font. + * See: https://github.com/ipython/ipython/issues/1503 + * + * .CodeMirror span { + * vertical-align: bottom; + * } + */ + +.CodeMirror { + line-height: @baseLineHeight; /* Changed from 1em to our global default */ + height: auto; /* Changed to auto to autogrow */ + background: none; /* Changed from white to allow our bg to show through */ +} + +.CodeMirror-scroll { + /* The CodeMirror docs are a bit fuzzy on if overflow-y should be hidden or visible.*/ + /* We have found that if it is visible, vertical scrollbars appear with font size changes.*/ + overflow-y: hidden; + overflow-x: auto; /* Changed from auto to remove scrollbar */ +} + +.CodeMirror-lines { + /* In CM2, this used to be 0.4em, but in CM3 it went to 4px. We need the em value because */ + /* we have set a different line-height and want this to scale with that. */ + padding: 0.4em; +} + +.CodeMirror-linenumber { + // This is needed to fine tune the position of the line numbers because we use the 0.4em + // spacing in various places. Fine tuned to look right. + padding: 0 8px 0 4px; +} + +.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: @corner_radius; + border-top-left-radius: @corner_radius; +} + +.CodeMirror pre { + /* In CM3 this went to 4px from 0 in CM2. We need the 0 value because of how we size */ + /* .CodeMirror-lines */ + padding: 0; + border: 0; + .border-radius(0) +} diff --git a/IPython/frontend/html/notebook/static/notebook/less/completer.less b/IPython/frontend/html/notebook/static/notebook/less/completer.less new file mode 100644 index 0000000..7073ec8 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/completer.less @@ -0,0 +1,24 @@ +.completions { + position: absolute; + z-index: 10; + overflow: hidden; + border: 1px solid @border_color; + .corner-all; + .box-shadow(0px 6px 10px -1px #adadad); +} + +.completions select { + background: white; + outline: none; + border: none; + padding: 0px; + margin: 0px; + overflow: auto; + font-family: @monoFontFamily; + font-size: 110%; + color: @textColor; +} + +.completions select option.context { + color: @blueDark; +} diff --git a/IPython/frontend/html/notebook/static/less/highlight.less b/IPython/frontend/html/notebook/static/notebook/less/highlight.less similarity index 100% rename from IPython/frontend/html/notebook/static/less/highlight.less rename to IPython/frontend/html/notebook/static/notebook/less/highlight.less diff --git a/IPython/frontend/html/notebook/static/notebook/less/menubar.less b/IPython/frontend/html/notebook/static/notebook/less/menubar.less new file mode 100644 index 0000000..954f3ea --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/menubar.less @@ -0,0 +1,25 @@ +.ui-menubar-item .ui-button .ui-button-text { + padding: 0.4em 1.0em; + font-size: 100%; +} + +.ui-menu { + .box-shadow(0px 6px 10px -1px #adadad); +} + +.ui-menu .ui-menu-item a { + border: 1px solid transparent; + padding: 2px 1.6em; +} + +.ui-menu .ui-menu-item a.ui-state-focus { + margin: 0; +} + +.ui-menu hr { + margin: 0.3em 0; +} + +#menubar_container { + position: relative; +} diff --git a/IPython/frontend/html/notebook/static/notebook/less/notebook.less b/IPython/frontend/html/notebook/static/notebook/less/notebook.less new file mode 100644 index 0000000..1819465 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/notebook.less @@ -0,0 +1,71 @@ + +body { + background-color: @bodyBackground; +} + +body.notebook_app { + overflow: hidden; +} + +span#notebook_name { + height: 1em; + line-height: 1em; + padding: 3px; + border: none; + font-size: 146.5%; +} + +div#notebook_panel { + margin: 0px 0px 0px 0px; + padding: 0px; +} + +div#notebook { + overflow-y: scroll; + overflow-x: auto; + width: 100%; + /* This spaces the cell away from the edge of the notebook area */ + padding: 5px 5px 15px 5px; + margin: 0px; +} + +div.ui-widget-content { + border: 1px solid @border_color; + outline: none; +} + +pre.dialog { + background-color: @cell_background; + border: 1px solid #ddd; + .corner-all; + padding: 0.4em; + padding-left: 2em; +} + +p.dialog { + padding : 0.2em; +} + +/* Word-wrap output correctly. This is the CSS3 spelling, though Firefox seems + to not honor it correctly. Webkit browsers (Chrome, rekonq, Safari) do. + */ +pre, code, kbd, samp { white-space: pre-wrap; } + +#fonttest { + font-family: @monoFontFamily; +} + +a { + text-decoration: underline; +} + +p { + margin-bottom:0; +} + +a.heading-anchor:link, a.heading-anchor:visited { + text-decoration: none; + outline: none; + color: inherit; +} + diff --git a/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less b/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less new file mode 100644 index 0000000..577ac46 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less @@ -0,0 +1,9 @@ +#notification_area { + position: absolute; + right: 0px; + top: 0px; + height: 25px; + padding: 3px 0px; + padding-right: 3px; + z-index: 10; +} diff --git a/IPython/frontend/html/notebook/static/notebook/less/notificationwidget.less b/IPython/frontend/html/notebook/static/notebook/less/notificationwidget.less new file mode 100644 index 0000000..aefd53e --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/notificationwidget.less @@ -0,0 +1,8 @@ +.notification_widget{ + float : right; + right: 0px; + top: 1px; + height: 25px; + padding: 3px 6px; + z-index: 10; +} diff --git a/IPython/frontend/html/notebook/static/notebook/less/outputarea.less b/IPython/frontend/html/notebook/static/notebook/less/outputarea.less new file mode 100644 index 0000000..a69c3f6 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/outputarea.less @@ -0,0 +1,96 @@ +/* This class is the outer container of all output sections. */ +div.output_area { + padding: 0px; + page-break-inside: avoid; + .hbox(); +} + + +/* This is needed to protect the pre formating from global settings such + as that of bootstrap */ +div.output_area pre { + font-family: @monoFontFamily; + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + vertical-align: baseline; + color: black; + background-color: transparent; + .border-radius(0); + line-height: inherit; +} + +/* This class is for the output subarea inside the output_area and after + the prompt div. */ +div.output_subarea { + padding: 0.44em 0.4em 0.4em 1px; + .box-flex1(); +} + +/* The rest of the output_* classes are for special styling of the different + output types */ + +/* all text output has this class: */ +div.output_text { + text-align: left; + color: @textColor; + font-family: @monoFontFamily; + /* This has to match that of the the CodeMirror class line-height below */ + line-height: @baseLineHeight; +} + +/* stdout/stderr are 'text' as well as 'stream', but pyout/pyerr are *not* streams */ +div.output_stream { + padding-top: 0.0em; + padding-bottom: 0.0em; +} +div.output_stdout { +} +div.output_stderr { + background: #fdd; /* very light red background for stderr */ +} + +div.output_latex { + text-align: left; +} + +div.output_html { +} + +div.output_png { +} + +div.output_jpeg { +} + +.js-error { + color: darkred; +} + +/* raw_input styles */ + +div.raw_input { + padding-top: 0px; + padding-bottom: 0px; + height: 1em; + line-height: 1em; + font-family: @monoFontFamily; +} +span.input_prompt { + font-family: inherit; +} +input.raw_input { + font-family: inherit; + font-size: inherit; + color: inherit; + width: auto; + margin: -2px 0px 0px 1px; + padding-left: 1px; + padding-top: 2px; + height: 1em; +} + +p.p-space { + margin-bottom: 10px; +} \ No newline at end of file diff --git a/IPython/frontend/html/notebook/static/notebook/less/pager.less b/IPython/frontend/html/notebook/static/notebook/less/pager.less new file mode 100644 index 0000000..03c6a60 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/pager.less @@ -0,0 +1,21 @@ +div#pager_splitter { + height: 8px; +} + +#pager_container { + position : relative; +} + +div#pager { + padding: 15px; + overflow: auto; + display: none; + + pre { + font-size: @baseFontSize; + line-height: @baseLineHeight; + color: @textColor; + background-color: @cell_background; + padding: 0.4em; + } +} diff --git a/IPython/frontend/html/notebook/static/notebook/less/quickhelp.less b/IPython/frontend/html/notebook/static/notebook/less/quickhelp.less new file mode 100644 index 0000000..603c92a --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/quickhelp.less @@ -0,0 +1,9 @@ +.shortcut_key { + display: inline-block; + width: 15ex; + text-align: right; + font-family: @monoFontFamily; +} + +.shortcut_descr { +} diff --git a/IPython/frontend/html/notebook/static/less/renderedhtml.less b/IPython/frontend/html/notebook/static/notebook/less/renderedhtml.less similarity index 93% rename from IPython/frontend/html/notebook/static/less/renderedhtml.less rename to IPython/frontend/html/notebook/static/notebook/less/renderedhtml.less index e706c5d..db327b0 100644 --- a/IPython/frontend/html/notebook/static/less/renderedhtml.less +++ b/IPython/frontend/html/notebook/static/notebook/less/renderedhtml.less @@ -31,6 +31,14 @@ margin: 1em 2em; } + pre, code { + border: 0; + background-color: @bodyBackground; + color: @textColor; + font-size: 100%; + padding: 0px; + } + blockquote { margin: 1em 2em; } diff --git a/IPython/frontend/html/notebook/static/notebook/less/savewidget.less b/IPython/frontend/html/notebook/static/notebook/less/savewidget.less new file mode 100644 index 0000000..8056e0f --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/savewidget.less @@ -0,0 +1,9 @@ +span#save_widget { + padding: 5px; + margin: 0px 0px 0px 300px; + display:inline-block; +} + +span#checkpoint_status span#autosave_status { + font-size: small; +} diff --git a/IPython/frontend/html/notebook/static/notebook/less/style.less b/IPython/frontend/html/notebook/static/notebook/less/style.less new file mode 100644 index 0000000..df58625 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/style.less @@ -0,0 +1,20 @@ +@import "variables.less"; +@import "ansicolors.less"; +@import "cell.less"; +@import "celltoolbar.less"; +@import "codecell.less"; +@import "codemirror.less"; +@import "completer.less"; +@import "highlight.less"; +@import "menubar.less"; +@import "notebook.less"; +@import "notificationarea.less"; +@import "notificationwidget.less"; +@import "outputarea.less"; +@import "pager.less"; +@import "quickhelp.less"; +@import "renderedhtml.less"; +@import "savewidget.less"; +@import "textcell.less"; +@import "toolbar.less"; +@import "tooltip.less"; diff --git a/IPython/frontend/html/notebook/static/notebook/less/textcell.less b/IPython/frontend/html/notebook/static/notebook/less/textcell.less new file mode 100644 index 0000000..9d32b49 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/textcell.less @@ -0,0 +1,21 @@ +div.text_cell { + padding: 5px 5px 5px 5px; +} + +div.text_cell_input { + color: @textColor; + border: 1px solid @light_border_color; + .corner-all; + background: @cell_background; +} + +div.text_cell_render { + /*font-family: "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;*/ + outline: none; + resize: none; + width: inherit; + border-style: none; + padding: 5px; + color: @textColor; +} + diff --git a/IPython/frontend/html/notebook/static/notebook/less/toolbar.less b/IPython/frontend/html/notebook/static/notebook/less/toolbar.less new file mode 100644 index 0000000..bd15533 --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/toolbar.less @@ -0,0 +1,26 @@ +.toolbar { + padding: 3px 15px; + border-bottom: @border_width @border_color solid; + + button { + margin-top:2px; + margin-bottom:2px; + } + + + select, label { + height : 19px; + vertical-align:middle; + margin-right:2px; + margin-bottom:0; + display: inline; + font-size: 92%; + margin-left:0.3em; + margin-right:0.3em; + padding: 0px; + } +} + +.toolbar select{ + width:auto; +} diff --git a/IPython/frontend/html/notebook/static/less/tooltip.less b/IPython/frontend/html/notebook/static/notebook/less/tooltip.less similarity index 91% rename from IPython/frontend/html/notebook/static/less/tooltip.less rename to IPython/frontend/html/notebook/static/notebook/less/tooltip.less index cc78517..ba49433 100644 --- a/IPython/frontend/html/notebook/static/less/tooltip.less +++ b/IPython/frontend/html/notebook/static/notebook/less/tooltip.less @@ -101,12 +101,12 @@ background-color: @cell_background; overflow : visible; - border: @border_color @borderwidth solid; + border: @border_color @border_width solid; outline: none; padding: 3px; margin: 0px; padding-left:7px; - font-family: monospace; + font-family: @monoFontFamily; min-height:50px; .dropshadow; @@ -118,7 +118,15 @@ position: absolute; z-index: 2; - + + .tooltiptext { + pre { + border: 0; + .border-radius(0); + font-size: 100%; + background-color: @cell_background; + } + } } .pretooltiparrow { @@ -134,7 +142,7 @@ .pretooltiparrow:before { background-color : @cell_background; - border : @borderwidth @border_color solid; + border : @border_width @border_color solid; z-index:11; content: ""; position: absolute; diff --git a/IPython/frontend/html/notebook/static/notebook/less/variables.less b/IPython/frontend/html/notebook/static/notebook/less/variables.less new file mode 100644 index 0000000..e1f55eb --- /dev/null +++ b/IPython/frontend/html/notebook/static/notebook/less/variables.less @@ -0,0 +1,9 @@ + +// Our own variables for this page + +@cell_selected_background: darken(@bodyBackground, 2%); +@cell_background: darken(@bodyBackground, 3.2%); +@border_color: darken(@cell_selected_background, 31%); +@light_border_color: darken(@cell_selected_background, 17%); +@border_width: 1px; + diff --git a/IPython/frontend/html/notebook/static/js/kernel.js b/IPython/frontend/html/notebook/static/services/kernels/js/kernel.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/kernel.js rename to IPython/frontend/html/notebook/static/services/kernels/js/kernel.js diff --git a/IPython/frontend/html/notebook/static/style/style.less b/IPython/frontend/html/notebook/static/style/style.less new file mode 100644 index 0000000..efaf641 --- /dev/null +++ b/IPython/frontend/html/notebook/static/style/style.less @@ -0,0 +1,16 @@ +// Bootstrap +@import "../components/bootstrap/less/bootstrap.less"; + +// base +@import "../base/less/style.less"; + +// auth +@import "../auth/less/style.less"; + +// tree +@import "../tree/less/style.less"; + +// notebook +@import "../notebook/less/style.less"; + + diff --git a/IPython/frontend/html/notebook/static/css/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css similarity index 80% rename from IPython/frontend/html/notebook/static/css/style.min.css rename to IPython/frontend/html/notebook/static/style/style.min.css index 9228ea1..b03e775 100644 --- a/IPython/frontend/html/notebook/static/css/style.min.css +++ b/IPython/frontend/html/notebook/static/style/style.min.css @@ -1,3 +1,7 @@ +.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:11.231px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]){display:none;} @@ -17,11 +21,7 @@ label,select,button,input[type="button"],input[type="reset"],input[type="submit" input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield;} input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} textarea{overflow:auto;vertical-align:top;} -@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important;} a,a:visited{text-decoration:underline;} a[href]:after{content:" (" attr(href) ")";} abbr[title]:after{content:" (" attr(title) ")";} .ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:"";} pre,blockquote{border:1px solid #999;page-break-inside:avoid;} thead{display:table-header-group;} tr,img{page-break-inside:avoid;} img{max-width:100% !important;} @page {margin:0.5cm;}p,h2,h3{orphans:3;widows:3;} h2,h3{page-break-after:avoid;}}.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;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:20px;color:#000000;background-color:#ffffff;} +@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important;} a,a:visited{text-decoration:underline;} a[href]:after{content:" (" attr(href) ")";} abbr[title]:after{content:" (" attr(title) ")";} .ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:"";} pre,blockquote{border:1px solid #999;page-break-inside:avoid;} thead{display:table-header-group;} tr,img{page-break-inside:avoid;} img{max-width:100% !important;} @page {margin:0.5cm;}p,h2,h3{orphans:3;widows:3;} h2,h3{page-break-after:avoid;}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:1.231;color:#000000;background-color:#ffffff;} a{color:#0088cc;text-decoration:none;} a:hover,a:focus{color:#005580;text-decoration:underline;} .img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} @@ -57,7 +57,7 @@ a:hover,a:focus{color:#005580;text-decoration:underline;} .offset1{margin-left:100px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} .row-fluid:after{clear:both;} -.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;} +.row-fluid [class*="span"]{display:block;width:100%;min-height:11.231px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%;} .row-fluid .span12{width:100%;*width:99.94680851063829%;} @@ -102,8 +102,8 @@ a:hover,a:focus{color:#005580;text-decoration:underline;} .container:after{clear:both;} .container-fluid{padding-right:20px;padding-left:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;} .container-fluid:after{clear:both;} -p{margin:0 0 10px;} -.lead{margin-bottom:20px;font-size:19.5px;font-weight:200;line-height:30px;} +p{margin:0 0 0.6155;} +.lead{margin-bottom:1.231;font-size:19.5px;font-weight:200;line-height:1.8465000000000003;} small{font-size:85%;} strong{font-weight:bold;} em{font-style:italic;} @@ -121,8 +121,8 @@ a.text-success:hover,a.text-success:focus{color:#356635;} .text-left{text-align:left;} .text-right{text-align:right;} .text-center{text-align:center;} -h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;} -h1,h2,h3{line-height:40px;} +h1,h2,h3,h4,h5,h6{margin:0.6155 0;font-family:inherit;font-weight:bold;line-height:1.231;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;} +h1,h2,h3{line-height:2.462;} h1{font-size:35.75px;} h2{font-size:29.25px;} h3{font-size:22.75px;} @@ -133,43 +133,48 @@ h1 small{font-size:22.75px;} h2 small{font-size:16.25px;} h3 small{font-size:13px;} h4 small{font-size:13px;} -.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eeeeee;} -ul,ol{padding:0;margin:0 0 10px 25px;} +.page-header{padding-bottom:-0.38449999999999995;margin:1.231 0 1.8465000000000003;border-bottom:1px solid #eeeeee;} +ul,ol{padding:0;margin:0 0 0.6155 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} -li{line-height:20px;} +li{line-height:1.231;} ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} ul.inline,ol.inline{margin-left:0;list-style:none;}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;*zoom:1;padding-left:5px;padding-right:5px;} -dl{margin-bottom:20px;} -dt,dd{line-height:20px;} +dl{margin-bottom:1.231;} +dt,dd{line-height:1.231;} dt{font-weight:bold;} -dd{margin-left:10px;} +dd{margin-left:0.6155;} .dl-horizontal{*zoom:1;}.dl-horizontal:before,.dl-horizontal:after{display:table;content:"";line-height:0;} .dl-horizontal:after{clear:both;} .dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .dl-horizontal dd{margin-left:180px;} -hr{margin:20px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +hr{margin:1.231 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999999;} abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16.25px;font-weight:300;line-height:1.25;} -blockquote small{display:block;line-height:20px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} +blockquote{padding:0 0 0 15px;margin:0 0 1.231;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16.25px;font-weight:300;line-height:1.25;} +blockquote small{display:block;line-height:1.231;color:#999999;}blockquote small:before{content:'\2014 \00A0';} blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} blockquote.pull-right small:before{content:'';} blockquote.pull-right small:after{content:'\00A0 \2014';} q:before,q:after,blockquote:before,blockquote:after{content:"";} -address{display:block;margin-bottom:20px;font-style:normal;line-height:20px;} -form{margin:0 0 20px;} +address{display:block;margin-bottom:1.231;font-style:normal;line-height:1.231;} +code,pre{padding:0 3px 2px;font-family:monospace;font-size:11px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;white-space:nowrap;} +pre{display:block;padding:0.11550000000000005;margin:0 0 0.6155;font-size:12px;line-height:1.231;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:1.231;} +pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0;} +.pre-scrollable{max-height:340px;overflow-y:scroll;} +form{margin:0 0 1.231;} fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:19.5px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#999999;} -label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:20px;} +legend{display:block;width:100%;padding:0;margin-bottom:1.231;font-size:19.5px;line-height:2.462;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:0.9232500000000001;color:#999999;} +label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:1.231;} input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} label{display:block;margin-bottom:5px;} -select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:13px;line-height:20px;color:#555555;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;vertical-align:middle;} +select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:1.231;padding:4px 6px;margin-bottom:0.6155;font-size:13px;line-height:1.231;color:#555555;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;vertical-align:middle;} input,textarea,.uneditable-input{width:206px;} textarea{height:auto;} textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear .2s, box-shadow linear .2s;-moz-transition:border linear .2s, box-shadow linear .2s;-o-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);} input[type="radio"],input[type="checkbox"]{margin:4px 0 0;*margin-top:0;margin-top:1px \9;line-height:normal;} input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;} -select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px;} +select,input[type="file"]{height:11.231px;*margin-top:4px;line-height:11.231px;} select{width:220px;border:1px solid #cccccc;background-color:#ffffff;} select[multiple],select[size]{height:auto;} select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} @@ -179,7 +184,7 @@ select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="chec input:-moz-placeholder,textarea:-moz-placeholder{color:#999999;} input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999999;} input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999999;} -.radio,.checkbox{min-height:20px;padding-left:20px;} +.radio,.checkbox{min-height:1.231;padding-left:20px;} .radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px;} .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} .radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} @@ -229,14 +234,14 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio .control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7ab5d3;} .control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad;} input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;} +.form-actions{padding:0.2310000000000001 20px 1.231;margin-top:1.231;margin-bottom:1.231;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;} .form-actions:after{clear:both;} .help-block,.help-inline{color:#262626;} -.help-block{display:block;margin-bottom:10px;} +.help-block{display:block;margin-bottom:0.6155;} .help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} -.input-append,.input-prepend{display:inline-block;margin-bottom:10px;vertical-align:middle;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:13px;} +.input-append,.input-prepend{display:inline-block;margin-bottom:0.6155;vertical-align:middle;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:13px;} .input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2;} -.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:13px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;} +.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:1.231;min-width:16px;padding:4px 5px;font-size:13px;font-weight:normal;line-height:1.231;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;} .input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} @@ -260,17 +265,17 @@ input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;pad .form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} .form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} .form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;} -.control-group{margin-bottom:10px;} -legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate;} -.form-horizontal .control-group{margin-bottom:20px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;} +.control-group{margin-bottom:0.6155;} +legend+.control-group{margin-top:1.231;-webkit-margin-top-collapse:separate;} +.form-horizontal .control-group{margin-bottom:1.231;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;} .form-horizontal .control-group:after{clear:both;} .form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right;} .form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:180px;} .form-horizontal .help-block{margin-bottom:0;} -.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px;} +.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:0.6155;} .form-horizontal .form-actions{padding-left:180px;} table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;} -.table{width:100%;margin-bottom:20px;}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} +.table{width:100%;margin-bottom:1.231;}.table th,.table td{padding:8px;line-height:1.231;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} .table th{font-weight:bold;} .table thead th{vertical-align:bottom;} .table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} @@ -458,8 +463,8 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";} .dropdown .caret{margin-top:8px;margin-left:2px;} .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;} -.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} -.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap;} +.dropdown-menu .divider{*width:100%;height:1px;margin:-0.38449999999999995 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.231;color:#333333;white-space:nowrap;} .dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{text-decoration:none;color:#ffffff;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);} .dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#ffffff;text-decoration:none;outline:0;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);} .dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999999;} @@ -482,9 +487,9 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;} .collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;} -.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover,.close:focus{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} +.close{float:right;font-size:20px;font-weight:bold;line-height:1.231;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover,.close:focus{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:13px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #bbbbbb;*border:0;border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} +.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:13px;line-height:1.231;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #cccccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;} .btn:active,.btn.active{background-color:#cccccc \9;} .btn:first-child{*margin-left:0;} .btn:hover,.btn:focus{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} @@ -523,7 +528,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333333;text-decoration:none;} .btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;} .btn-group+.btn-group{margin-left:5px;} -.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;} +.btn-toolbar{font-size:0;margin-top:0.6155;margin-bottom:0.6155;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;} .btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .btn-group>.btn+.btn{margin-left:-1px;} .btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:13px;} @@ -561,10 +566,10 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} .btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;} .btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.alert{padding:8px 35px 8px 14px;margin-bottom:1.231;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .alert,.alert h4{color:#c09853;} .alert h4{margin:0;} -.alert .close{position:relative;top:-2px;right:-21px;line-height:20px;} +.alert .close{position:relative;top:-2px;right:-21px;line-height:1.231;} .alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;} .alert-success h4{color:#468847;} .alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} @@ -574,26 +579,26 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .alert-block{padding-top:14px;padding-bottom:14px;} .alert-block>p,.alert-block>ul{margin-bottom:0;} .alert-block p+p{margin-top:5px;} -.nav{margin-left:0;margin-bottom:20px;list-style:none;} +.nav{margin-left:0;margin-bottom:1.231;list-style:none;} .nav>li>a{display:block;} .nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eeeeee;} .nav>li>a>img{max-width:none;} .nav>.pull-right{float:right;} -.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} +.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:1.231;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} .nav li+.nav-header{margin-top:9px;} .nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} .nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} .nav-list>li>a{padding:3px 15px;} .nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} .nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px;} -.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.nav-list .divider{*width:100%;height:1px;margin:-0.38449999999999995 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} .nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";line-height:0;} .nav-tabs:after,.nav-pills:after{clear:both;} .nav-tabs>li,.nav-pills>li{float:left;} .nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} .nav-tabs{border-bottom:1px solid #ddd;} .nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eeeeee #eeeeee #dddddd;} +.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:1.231;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eeeeee #eeeeee #dddddd;} .nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} .nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} .nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#ffffff;background-color:#0088cc;} @@ -639,12 +644,12 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} .nav>.disabled>a{color:#999999;} .nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;background-color:transparent;cursor:default;} -.navbar{overflow:visible;margin-bottom:20px;*position:relative;*z-index:2;} +.navbar{overflow:visible;margin-bottom:1.231;*position:relative;*z-index:2;} .navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top, #ffffff, #f2f2f2);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));background-image:-webkit-linear-gradient(top, #ffffff, #f2f2f2);background-image:-o-linear-gradient(top, #ffffff, #f2f2f2);background-image:linear-gradient(to bottom, #ffffff, #f2f2f2);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;} .navbar-inner:after{clear:both;} .navbar .container{width:auto;} .nav-collapse.collapse{height:auto;overflow:visible;} -.navbar .brand{float:left;display:block;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777777;text-shadow:0 1px 0 #ffffff;}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none;} +.navbar .brand{float:left;display:block;padding:19.3845px 20px 19.3845px;margin-left:-20px;font-size:20px;font-weight:200;color:#777777;text-shadow:0 1px 0 #ffffff;}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none;} .navbar-text{margin-bottom:0;line-height:40px;color:#777777;} .navbar-link{color:#777777;}.navbar-link:hover,.navbar-link:focus{color:#333333;} .navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #f2f2f2;border-right:1px solid #ffffff;} @@ -669,7 +674,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} .navbar .nav.pull-right{float:right;margin-right:0;} .navbar .nav>li{float:left;} -.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777777;text-decoration:none;text-shadow:0 1px 0 #ffffff;} +.navbar .nav>li>a{float:none;padding:19.3845px 15px 19.3845px;color:#777777;text-decoration:none;text-shadow:0 1px 0 #ffffff;} .navbar .nav .dropdown-toggle .caret{margin-top:8px;} .navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#333333;text-decoration:none;} .navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);-moz-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);} @@ -706,12 +711,12 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} .navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e0e0e;background-image:-moz-linear-gradient(top, #151515, #040404);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));background-image:-webkit-linear-gradient(top, #151515, #040404);background-image:-o-linear-gradient(top, #151515, #040404);background-image:linear-gradient(to bottom, #151515, #040404);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);border-color:#040404 #040404 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#040404;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#040404;*background-color:#000000;} .navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000000 \9;} -.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.breadcrumb>li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;}.breadcrumb>li>.divider{padding:0 5px;color:#ccc;} +.breadcrumb{padding:8px 15px;margin:0 0 1.231;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.breadcrumb>li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;}.breadcrumb>li>.divider{padding:0 5px;color:#ccc;} .breadcrumb>.active{color:#999999;} -.pagination{margin:20px 0;} +.pagination{margin:1.231 0;} .pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} .pagination ul>li{display:inline;} -.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;} +.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:1.231;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;} .pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5;} .pagination ul>.active>a,.pagination ul>.active>span{color:#999999;cursor:default;} .pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999999;background-color:transparent;cursor:default;} @@ -726,7 +731,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;-moz-border-radius-topright:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;-moz-border-radius-bottomright:3px;border-bottom-right-radius:3px;} .pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.049999999999999px;} .pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:9.75px;} -.pager{margin:20px 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;} +.pager{margin:1.231 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;} .pager:after{clear:both;} .pager li{display:inline;} .pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} @@ -774,8 +779,8 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";line-height:0;} .thumbnails:after{clear:both;} .row-fluid .thumbnails{margin-left:0;} -.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px;} -.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;} +.thumbnails>li{float:left;margin-bottom:1.231;margin-left:20px;} +.thumbnail{display:block;padding:4px;line-height:1.231;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;} a.thumbnail:hover,a.thumbnail:focus{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} .thumbnail .caption{padding:9px;color:#555555;} @@ -804,7 +809,7 @@ a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#ffffff;text-decor .label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;} .btn .label,.btn .badge{position:relative;top:-1px;} .btn-mini .label,.btn-mini .badge{top:0;} -@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(to bottom, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:1.231;margin-bottom:1.231;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(to bottom, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .progress .bar{width:0%;height:100%;color:#ffffff;float:left;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(to bottom, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} .progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);} .progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} @@ -817,13 +822,13 @@ a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#ffffff;text-decor .progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);} .progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.accordion{margin-bottom:20px;} +.accordion{margin-bottom:1.231;} .accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .accordion-heading{border-bottom:0;} .accordion-heading .accordion-toggle{display:block;padding:8px 15px;} .accordion-toggle{cursor:pointer;} .accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} -.carousel{position:relative;margin-bottom:20px;line-height:1;} +.carousel{position:relative;margin-bottom:1.231;line-height:1;} .carousel-inner{overflow:hidden;width:100%;position:relative;} .carousel-inner>.item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1;} .carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block;} @@ -839,17 +844,18 @@ a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#ffffff;text-decor .carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none;}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255, 255, 255, 0.25);border-radius:5px;} .carousel-indicators .active{background-color:#fff;} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#333333;background:rgba(0, 0, 0, 0.75);} -.carousel-caption h4,.carousel-caption p{color:#ffffff;line-height:20px;} +.carousel-caption h4,.carousel-caption p{color:#ffffff;line-height:1.231;} .carousel-caption h4{margin:0 0 5px;} .carousel-caption p{margin-bottom:0;} -.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} -.hero-unit li{line-height:30px;} +.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:1.8465000000000003;color:inherit;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit li{line-height:1.8465000000000003;} .pull-right{float:right;} .pull-left{float:left;} .hide{display:none;} .show{display:block;} .invisible{visibility:hidden;} .affix{position:fixed;} +.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;} .hbox>*{-webkit-box-flex:0;-moz-box-flex:0;box-flex:0;} @@ -865,7 +871,83 @@ a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#ffffff;text-decor .start{-webkit-box-pack:start;-moz-box-pack:start;box-pack:start;} .end{-webkit-box-pack:end;-moz-box-pack:end;box-pack:end;} .center{-webkit-box-pack:center;-moz-box-pack:center;box-pack:center;} -.corner-all{border-radius:4px;} +body{background-color:white;position:absolute;left:0px;right:0px;top:0px;bottom:0px;overflow:visible;} +div#header{display:none;position:relative;height:40px;padding:5px;margin:0px;width:100%;} +span#ipython_notebook{position:absolute;padding:2px 2px 2px 5px;} +span#ipython_notebook img{font-family:Verdana,"Helvetica Neue",Arial,Helvetica,Geneva,sans-serif;height:24px;text-decoration:none;display:inline;color:black;} +#site{width:100%;display:none;} +.ui-widget{font-family:"Lucinda Grande","Lucinda Sans Unicode",Helvetica,Arial,Verdana,sans-serif;} +.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:"Lucinda Grande","Lucinda Sans Unicode",Helvetica,Arial,Verdana,sans-serif;} +.ui-button .ui-button-text{padding:0.2em 0.8em;font-size:77%;} +input.ui-button{padding:0.3em 0.9em;} +span#login_widget{float:right;} +.alternate_upload{background-color:none;display:inline;} +.alternate_upload.form{padding:0;margin:0;} +.alternate_upload input.fileinput{background-color:red;position:relative;opacity:0;z-index:2;width:295px;margin-left:163px;cursor:pointer;} +#tabs{border-style:none;} +#tab1,#tab2{padding:1em 0em;} +.list_toolbar{padding:5px;height:25px;line-height:25px;} +.toolbar_info{float:left;} +.toolbar_buttons{float:right;} +.list_header{height:25px;line-height:25px;padding:3px 5px;} +.list_item{height:25px;line-height:25px;padding:3px 5px;} +.notebook_item a{text-decoration:none;} +.status_col{float:right;width:325px;} +.engines_col{float:right;width:325px;} +.action_col{float:right;} +.item_buttons{float:right;} +.item_buttons .upload_button{color:darkred;} +.highlight_text{color:blue;} +.ui-tabs .ui-tabs-nav li a{padding:.3em .5em;} +#project_name>.breadcrumb{padding:0;background-color:transparent;} +input.engine_num_input{height:20px;margin-bottom:2px;padding-top:0;padding-bottom:0;width:90px;} +.ansiblack{color:black;} +.ansired{color:darkred;} +.ansigreen{color:darkgreen;} +.ansiyellow{color:brown;} +.ansiblue{color:darkblue;} +.ansipurple{color:darkviolet;} +.ansicyan{color:steelblue;} +.ansigrey{color:grey;} +.ansibold{font-weight:bold;} +.cell{border:1px solid transparent;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;width:100%;}.cell.selected{border-radius:4px;border:thin #ababab solid;} +div.cell{width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 0px;outline:none;} +div.prompt{width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231;} +.celltoolbar{border:thin solid #CFCFCF;border-bottom:none;background:#EEE;border-top-right-radius:3px;border-top-left-radius:3px;width:100%;-webkit-box-pack:end;height:20px;} +.no_input_radius{border-top-right-radius:0px;border-top-left-radius:0px;} +.text_cell .ctb_prompt{display:none;} +.code_cell .ctb_prompt{display:block;} +.ctb_hideshow{display:none;vertical-align:bottom;padding-right:2px;} +.celltoolbar>div{padding-top:0px;} +.ctb_area{margin:0;padding:0;width:100%;} +.ctb_show.ctb_hideshow,.ctb_show .ctb_hideshow{display:block;} +.ctb_show .input_area,.ctb_show .ctb_hideshow+div.text_cell_input{border-top-right-radius:0px;border-top-left-radius:0px;} +.ctb_show>.celltoolbar{border-bottom-right-radius:0px;border-bottom-left-radius:0px;} +.button_container{margin-top:0;margin-bottom:0;} +.ui-button{min-width:30px;} +.celltoolbar .button_container select{margin:10px;margin-top:1px;margin-bottom:0px;padding:0;font-size:87%;width:auto;display:inline-block;height:18px;line-height:18px;vertical-align:top;} +.celltoolbar label{display:inline-block;height:15px;line-height:15px;vertical-align:top;} +.celltoolbar label span{font-size:85%;} +.celltoolbar input[type=checkbox]{margin:0px;margin-left:4px;margin-right:4px;} +.celltoolbar .ui-button{border:none;vertical-align:top;height:20px;} +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;} +div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;} +div.input_prompt{color:navy;border-top:1px solid transparent;} +div.output_wrapper{margin-top:5px;margin-left:5px;width:100%;position:relative;} +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);} +div.output_collapsed{margin-right:5px;} +div.out_prompt_overlay{height:100%;padding:0px;position:absolute;border-radius:4px;} +div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000000;-moz-box-shadow:inset 0 0 1px #000000;box-shadow:inset 0 0 1px #000000;background:rgba(240, 240, 240, 0.5);} +div.output_prompt{color:darkred;margin:0 5px 0 -5px;} +.CodeMirror{line-height:1.231;height:auto;background:none;} +.CodeMirror-scroll{overflow-y:hidden;overflow-x:auto;} +.CodeMirror-lines{padding:0.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;} +.completions{position:absolute;z-index:10;overflow:hidden;border:1px solid #ababab;border-radius:4px;-webkit-box-shadow:0px 6px 10px -1px #adadad;-moz-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;} +.completions select{background:white;outline:none;border:none;padding:0px;margin:0px;overflow:auto;font-family:monospace;font-size:110%;color:#000000;} +.completions select option.context{color:#0064cd;} pre code{display:block;padding:0.5em;} .highlight-base,pre code,pre .subst,pre .tag .title,pre .lisp .title,pre .clojure .built_in,pre .nginx .title{color:black;} .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;} @@ -886,84 +968,43 @@ pre .coffeescript .javascript,pre .javascript .xml,pre .tex .formula,pre .xml .j .cm-s-ipython span.cm-error{color:#f00;} .cm-s-ipython span.cm-operator{color:#AA22FF;font-weight:bold;} .cm-s-ipython span.cm-meta{color:#AA22FF;} -body{background-color:#ffffff;} -body.notebook_app{overflow:hidden;} -blockquote{border-left:4px solid #DDD;padding:0 15px;color:#777;} -span#save_widget{padding:5px;margin:0px 0px 0px 300px;display:inline-block;} -span#checkpoint_status span#autosave_status{font-size:small;} -span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;} .ui-menubar-item .ui-button .ui-button-text{padding:0.4em 1.0em;font-size:100%;} .ui-menu{-webkit-box-shadow:0px 6px 10px -1px #adadad;-moz-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;} .ui-menu .ui-menu-item a{border:1px solid transparent;padding:2px 1.6em;} .ui-menu .ui-menu-item a.ui-state-focus{margin:0;} .ui-menu hr{margin:0.3em 0;} #menubar_container{position:relative;} -#notification_area{position:absolute;right:0px;top:0px;height:25px;padding:3px 0px;padding-right:3px;z-index:10;} -.notification_widget{float:right;right:0px;top:1px;height:25px;padding:3px 6px;z-index:10;} -.toolbar{padding:3px 15px;border-bottom:1px #ababab solid;}.toolbar button{margin-top:2px;margin-bottom:2px;} -.toolbar select,.toolbar label{height:19px;vertical-align:middle;margin-right:2px;margin-bottom:0;display:inline;font-size:92%;margin-left:0.3em;margin-right:0.3em;padding:0px;} -.toolbar select{width:auto;} -#ipython-main-app{width:100%;position:relative;font-size:110%;} -span#quick_help_area{position:static;padding:5px 0px;margin:0px 0px 0px 0px;} -.help_string{float:right;width:170px;padding:0px 5px;text-align:left;font-size:85%;} -.help_string_label{float:right;font-size:85%;} +body{background-color:#ffffff;} +body.notebook_app{overflow:hidden;} +span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:146.5%;} div#notebook_panel{margin:0px 0px 0px 0px;padding:0px;} div#notebook{overflow-y:scroll;overflow-x:auto;width:100%;padding:5px 5px 15px 5px;margin:0px;} -div#pager_splitter{height:8px;} -#pager_container{position:relative;} -div#pager{padding:15px;overflow:auto;display:none;} div.ui-widget-content{border:1px solid #ababab;outline:none;} -.cell{border:1px solid transparent;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;width:100%;}.cell.selected{border-radius:4px;border:thin #ababab solid;} -div.cell{width:100%;padding:5px 5px 5px 0px;margin:2px 0px 2px 0px;outline:none;} -div.prompt{width:11ex;padding:0.4em;margin:0px;font-family:monospace;text-align:right;line-height:1.231;} -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;} -div.input_area{border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;} -div.input_prompt{color:navy;border-top:1px solid transparent;} -div.output_wrapper{margin-top:5px;margin-left:5px;width:100%;position:relative;} -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);} -div.output_collapsed{margin-right:5px;} -div.out_prompt_overlay{height:100%;padding:0px;position:absolute;border-radius:4px;} -div.out_prompt_overlay:hover{-webkit-box-shadow:inset 0 0 1px #000000;-moz-box-shadow:inset 0 0 1px #000000;box-shadow:inset 0 0 1px #000000;background:rgba(240, 240, 240, 0.5);} -div.output_prompt{color:darkred;margin:0 5px 0 -5px;} +pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:0.4em;padding-left:2em;} +p.dialog{padding:0.2em;} +pre,code,kbd,samp{white-space:pre-wrap;} +#fonttest{font-family:monospace;} +a{text-decoration:underline;} +p{margin-bottom:0;} +a.heading-anchor:link,a.heading-anchor:visited{text-decoration:none;outline:none;color:inherit;} +#notification_area{position:absolute;right:0px;top:0px;height:25px;padding:3px 0px;padding-right:3px;z-index:10;} +.notification_widget{float:right;right:0px;top:1px;height:25px;padding:3px 6px;z-index:10;} div.output_area{padding:0px;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;} -div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;} +div.output_area pre{font-family:monospace;margin:0;padding:0;border:0;font-size:100%;vertical-align:baseline;color:black;background-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;line-height:inherit;} div.output_subarea{padding:0.44em 0.4em 0.4em 1px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;} div.output_text{text-align:left;color:#000000;font-family:monospace;line-height:1.231;} div.output_stream{padding-top:0.0em;padding-bottom:0.0em;} div.output_stderr{background:#fdd;} div.output_latex{text-align:left;} -div.text_cell{padding:5px 5px 5px 5px;} -div.text_cell_input{color:#000000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;} -div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:5px;color:#000000;} -.CodeMirror{line-height:1.231;height:auto;background:none;} -.CodeMirror-scroll{overflow-y:hidden;overflow-x:auto;} -.CodeMirror-lines{padding:0.4em;} -.CodeMirror pre{padding:0;} -.ansiblack{color:#000000;} -.ansired{color:darkred;} -.ansigreen{color:darkgreen;} -.ansiyellow{color:brown;} -.ansiblue{color:darkblue;} -.ansipurple{color:darkviolet;} -.ansicyan{color:steelblue;} -.ansigrey{color:grey;} -.ansibold{font-weight:bold;} -.completions{position:absolute;z-index:10;overflow:hidden;border:1px solid #ababab;border-radius:4px;-webkit-box-shadow:0px 6px 10px -1px #adadad;-moz-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;} -.completions select{background:white;outline:none;border:none;padding:0px;margin:0px;overflow:auto;font-family:monospace;font-size:110%;color:#000000;} -.completions select option.context{color:#0064cd;} -pre.dialog{background-color:#f7f7f7;border:1px solid #ddd;border-radius:4px;padding:0.4em;padding-left:2em;} -p.dialog{padding:0.2em;} -.shortcut_key{display:inline-block;width:15ex;text-align:right;font-family:monospace;} -pre,code,kbd,samp{white-space:pre-wrap;} -#fonttest{font-family:monospace;} .js-error{color:darkred;} -a{text-decoration:underline;} -p{margin-bottom:0;} -a.heading-anchor:link,a.heading-anchor:visited{text-decoration:none;color:inherit;} div.raw_input{padding-top:0px;padding-bottom:0px;height:1em;line-height:1em;font-family:monospace;} span.input_prompt{font-family:inherit;} input.raw_input{font-family:inherit;font-size:inherit;color:inherit;width:auto;margin:-2px 0px 0px 1px;padding-left:1px;padding-top:2px;height:1em;} p.p-space{margin-bottom:10px;} +div#pager_splitter{height:8px;} +#pager_container{position:relative;} +div#pager{padding:15px;overflow:auto;display:none;}div#pager pre{font-size:13px;line-height:1.231;color:#000000;background-color:#f7f7f7;padding:0.4em;} +.shortcut_key{display:inline-block;width:15ex;text-align:right;font-family:monospace;} .rendered_html{color:black;}.rendered_html em{font-style:italic;} .rendered_html strong{font-weight:bold;} .rendered_html u{text-decoration:underline;} @@ -985,17 +1026,26 @@ p.p-space{margin-bottom:10px;} .rendered_html ol ol ol ol ol{list-style:decimal;margin:0em 2em;} .rendered_html hr{color:black;background-color:black;} .rendered_html pre{margin:1em 2em;} +.rendered_html pre,.rendered_html code{border:0;background-color:#ffffff;color:#000000;font-size:100%;padding:0px;} .rendered_html blockquote{margin:1em 2em;} .rendered_html table,.rendered_html tr,.rendered_html th,.rendered_html td{border:1px solid black;border-collapse:collapse;margin:1em 2em;} .rendered_html td,.rendered_html th{text-align:left;vertical-align:middle;padding:4px;} .rendered_html th{font-weight:bold;} .rendered_html p{text-align:justify;} .rendered_html p+p{margin-top:1em;} -.corner-all{border-radius:4px;} +span#save_widget{padding:5px;margin:0px 0px 0px 300px;display:inline-block;} +span#checkpoint_status span#autosave_status{font-size:small;} +div.text_cell{padding:5px 5px 5px 5px;} +div.text_cell_input{color:#000000;border:1px solid #cfcfcf;border-radius:4px;background:#f7f7f7;} +div.text_cell_render{outline:none;resize:none;width:inherit;border-style:none;padding:5px;color:#000000;} +.toolbar{padding:3px 15px;border-bottom:1px #ababab solid;}.toolbar button{margin-top:2px;margin-bottom:2px;} +.toolbar select,.toolbar label{height:19px;vertical-align:middle;margin-right:2px;margin-bottom:0;display:inline;font-size:92%;margin-left:0.3em;margin-right:0.3em;padding:0px;} +.toolbar select{width:auto;} @-moz-keyframes fadeOut{from{opacity:1;} to{opacity:0;}}@-webkit-keyframes fadeOut{from{opacity:1;} to{opacity:0;}}@-moz-keyframes fadeIn{from{opacity:0;} to{opacity:1;}}@-webkit-keyframes fadeIn{from{opacity:0;} to{opacity:1;}}.bigtooltip{overflow:auto;height:200px;-webkit-transition-property:height;-webkit-transition-duration:500ms;-moz-transition-property:height;-moz-transition-duration:500ms;transition-property:height;transition-duration:500ms;} .smalltooltip{-webkit-transition-property:height;-webkit-transition-duration:500ms;-moz-transition-property:height;-moz-transition-duration:500ms;transition-property:height;transition-duration:500ms;text-overflow:ellipsis;overflow:hidden;height:80px;} .tooltipbuttons{position:absolute;padding-right:15px;top:0px;right:0px;} .tooltiptext{padding-right:30px;} .ipython_tooltip{max-width:700px;-webkit-animation:fadeOut 400ms;-moz-animation:fadeOut 400ms;animation:fadeOut 400ms;-webkit-animation:fadeIn 400ms;-moz-animation:fadeIn 400ms;animation:fadeIn 400ms;vertical-align:middle;background-color:#f7f7f7;overflow:visible;border:#ababab 1px solid;outline:none;padding:3px;margin:0px;padding-left:7px;font-family:monospace;min-height:50px;-moz-box-shadow:0px 6px 10px -1px #adadad;-webkit-box-shadow:0px 6px 10px -1px #adadad;box-shadow:0px 6px 10px -1px #adadad;border-radius:4px;position:absolute;z-index:2;}.ipython_tooltip a{float:right;} +.ipython_tooltip .tooltiptext pre{border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;font-size:100%;background-color:#f7f7f7;} .pretooltiparrow{left:0px;margin:0px;top:-16px;width:40px;height:16px;overflow:hidden;position:absolute;} .pretooltiparrow:before{background-color:#f7f7f7;border:1px #ababab solid;z-index:11;content:"";position:absolute;left:15px;top:10px;width:25px;height:25px;-webkit-transform:rotate(45deg);-moz-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);} diff --git a/IPython/frontend/html/notebook/static/tree/css/override.css b/IPython/frontend/html/notebook/static/tree/css/override.css new file mode 100644 index 0000000..8ad84b2 --- /dev/null +++ b/IPython/frontend/html/notebook/static/tree/css/override.css @@ -0,0 +1,8 @@ +/*This file contains any manual css for this page that needs to override the global styles. +This is only required when different pages style the same element differently. This is just +a hack to deal with our current css styles and no new styling should be added in this file.*/ + +#ipython-main-app { + width: 920px; + margin: 30px auto 0px auto; +} diff --git a/IPython/frontend/html/notebook/static/js/clusterlist.js b/IPython/frontend/html/notebook/static/tree/js/clusterlist.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/clusterlist.js rename to IPython/frontend/html/notebook/static/tree/js/clusterlist.js diff --git a/IPython/frontend/html/notebook/static/js/projectdashboardmain.js b/IPython/frontend/html/notebook/static/tree/js/main.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/projectdashboardmain.js rename to IPython/frontend/html/notebook/static/tree/js/main.js diff --git a/IPython/frontend/html/notebook/static/js/notebooklist.js b/IPython/frontend/html/notebook/static/tree/js/notebooklist.js similarity index 100% rename from IPython/frontend/html/notebook/static/js/notebooklist.js rename to IPython/frontend/html/notebook/static/tree/js/notebooklist.js diff --git a/IPython/frontend/html/notebook/static/css/alternateuploadform.css b/IPython/frontend/html/notebook/static/tree/less/altuploadform.less similarity index 100% rename from IPython/frontend/html/notebook/static/css/alternateuploadform.css rename to IPython/frontend/html/notebook/static/tree/less/altuploadform.less diff --git a/IPython/frontend/html/notebook/static/tree/less/style.less b/IPython/frontend/html/notebook/static/tree/less/style.less new file mode 100644 index 0000000..a9c5763 --- /dev/null +++ b/IPython/frontend/html/notebook/static/tree/less/style.less @@ -0,0 +1,2 @@ +@import "../tree/less/altuploadform.less"; +@import "../tree/less/tree.less"; diff --git a/IPython/frontend/html/notebook/static/css/projectdashboard.css b/IPython/frontend/html/notebook/static/tree/less/tree.less similarity index 97% rename from IPython/frontend/html/notebook/static/css/projectdashboard.css rename to IPython/frontend/html/notebook/static/tree/less/tree.less index fb0694f..247df0d 100644 --- a/IPython/frontend/html/notebook/static/css/projectdashboard.css +++ b/IPython/frontend/html/notebook/static/tree/less/tree.less @@ -5,11 +5,6 @@ * Author: IPython Development Team */ -#ipython-main-app { - width: 920px; - margin: 30px auto 0px auto; -} - #tabs { border-style: none; } diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html index c5afd27..0a3764c 100644 --- a/IPython/frontend/html/notebook/templates/login.html +++ b/IPython/frontend/html/notebook/templates/login.html @@ -1,16 +1,14 @@ -{% extends "base.html" %} +{% extends "page.html" %} -{% block stylesheet %} - - +{% block stylesheet %} +{{super()}} + {% endblock %} - {% block login_widget %} {% endblock %} - {% block site %}
@@ -37,6 +35,6 @@ {% block script %} - + {% endblock %} diff --git a/IPython/frontend/html/notebook/templates/logout.html b/IPython/frontend/html/notebook/templates/logout.html index 3a4920d..4289c4b 100644 --- a/IPython/frontend/html/notebook/templates/logout.html +++ b/IPython/frontend/html/notebook/templates/logout.html @@ -1,12 +1,10 @@ -{% extends "base.html" %} +{% extends "page.html" %} {% block stylesheet %} - - - +{{super()}} + {% endblock %} - {% block login_widget %} {% endblock %} @@ -35,6 +33,6 @@ {% block script %} - + {% endblock %} diff --git a/IPython/frontend/html/notebook/templates/notebooks.html b/IPython/frontend/html/notebook/templates/notebook.html similarity index 84% rename from IPython/frontend/html/notebook/templates/notebooks.html rename to IPython/frontend/html/notebook/templates/notebook.html index 897074d..f5339bd 100644 --- a/IPython/frontend/html/notebook/templates/notebooks.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "page.html" %} {% block stylesheet %} @@ -13,10 +13,10 @@ window.mathjax_url = "{{mathjax_url}}"; - - {{super()}} + + {% endblock %} {% block params %} @@ -196,7 +196,7 @@ class="notebook_app" - + @@ -210,33 +210,33 @@ class="notebook_app" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% endblock %} diff --git a/IPython/frontend/html/notebook/templates/base.html b/IPython/frontend/html/notebook/templates/page.html similarity index 72% rename from IPython/frontend/html/notebook/templates/base.html rename to IPython/frontend/html/notebook/templates/page.html index 816038e..e9354dd 100644 --- a/IPython/frontend/html/notebook/templates/base.html +++ b/IPython/frontend/html/notebook/templates/page.html @@ -10,20 +10,20 @@ {% block title %}IPython Notebook{% endblock %} + - - + {% block stylesheet %} {% block lesscss %} - {% if use_less %} - - {% else %} - - {% endif %} - {% endblock lesscss%} + {% if use_less %} + + {% else %} + + {% endif %} + {% endblock %} {% endblock %} - + {% block meta %} @@ -34,7 +34,7 @@