From c2b57985e2a08c6ec85f386b88677c47a3ee2140 2013-06-12 17:31:18 From: MinRK <benjaminrk@gmail.com> Date: 2013-06-12 17:31:18 Subject: [PATCH] bootstrapify notification widget --- diff --git a/IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js b/IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js index a6626de..40a9514 100644 --- a/IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js +++ b/IPython/frontend/html/notebook/static/notebook/js/notificationwidget.js @@ -30,7 +30,7 @@ var IPython = (function (IPython) { NotificationWidget.prototype.style = function () { - this.element.addClass('notification_widget ui-widget ui-widget-content ui-corner-all'); + this.element.addClass('notification_widget pull-right'); this.element.addClass('border-box-sizing'); }; diff --git a/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less b/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less index 577ac46..d9dc0fa 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less +++ b/IPython/frontend/html/notebook/static/notebook/less/notificationarea.less @@ -1,9 +1,3 @@ #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 index aefd53e..b35dc14 100644 --- a/IPython/frontend/html/notebook/static/notebook/less/notificationwidget.less +++ b/IPython/frontend/html/notebook/static/notebook/less/notificationwidget.less @@ -1,8 +1,9 @@ .notification_widget{ - float : right; - right: 0px; - top: 1px; - height: 25px; - padding: 3px 6px; + padding: 6px 12px; + margin-top: 1px; z-index: 10; + border: 1px solid #ccc; + border-radius: @corner_radius; + background: rgba(240, 240, 240, 0.5); + } diff --git a/IPython/frontend/html/notebook/static/style/style.min.css b/IPython/frontend/html/notebook/static/style/style.min.css index 8e6549d..e3218ff 100644 --- a/IPython/frontend/html/notebook/static/style/style.min.css +++ b/IPython/frontend/html/notebook/static/style/style.min.css @@ -1496,8 +1496,8 @@ p.dialog{padding:0.2em;} pre,code,kbd,samp{white-space:pre-wrap;} #fonttest{font-family:monospace;} p{margin-bottom:0;} -#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;} +#notification_area{z-index:10;} +.notification_widget{padding:6px 12px;margin-top:1px;z-index:10;border:1px solid #ccc;border-radius:4px;background:rgba(240, 240, 240, 0.5);} 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;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;margin-left:6px;-webkit-box-flex:1;-moz-box-flex:1;box-flex:1;} diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html index c43472d..16b3667 100644 --- a/IPython/frontend/html/notebook/templates/notebook.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -167,11 +167,10 @@ class="notebook_app" </ul> </li> </ul> + <div id="notification_area"></div> </div> </div> </div> - <div id="notification_area"> - </div> </div> <div id="maintoolbar" class="navbar navbar-static-top"> <div class="navbar-inner navbar-nobg">