From 4f0555d3e6883874bba8b16a83ba2613cfb26415 2014-09-03 02:35:45
From: Min RK <benjaminrk@gmail.com>
Date: 2014-09-03 02:35:45
Subject: [PATCH] Merge pull request #6267 from Carreau/less-jq-ui

Remove some jquery-UI classes.
---

diff --git a/IPython/html/static/notebook/js/celltoolbar.js b/IPython/html/static/notebook/js/celltoolbar.js
index 8776ab3..a85c1af 100644
--- a/IPython/html/static/notebook/js/celltoolbar.js
+++ b/IPython/html/static/notebook/js/celltoolbar.js
@@ -397,7 +397,7 @@ define([
         return function(div, cell, celltoolbar) {
             var button_container = $(div);
             var lbl = $("<label/>").append($('<span/>').text(label));
-            var select = $('<select/>').addClass('ui-widget ui-widget-content');
+            var select = $('<select/>');
             for(var i=0; i < list_list.length; i++){
                 var opt = $('<option/>')
                     .attr('value', list_list[i][1])
diff --git a/IPython/html/static/notebook/js/maintoolbar.js b/IPython/html/static/notebook/js/maintoolbar.js
index 294d9c7..593704a 100644
--- a/IPython/html/static/notebook/js/maintoolbar.js
+++ b/IPython/html/static/notebook/js/maintoolbar.js
@@ -136,7 +136,6 @@ define([
             .append($('<select/>')
                 .attr('id','cell_type')
                 .addClass('form-control select-xs')
-                // .addClass('ui-widget-content')
                 .append($('<option/>').attr('value','code').text('Code'))
                 .append($('<option/>').attr('value','markdown').text('Markdown'))
                 .append($('<option/>').attr('value','raw').text('Raw NBConvert'))
@@ -153,7 +152,6 @@ define([
     MainToolBar.prototype.add_celltoolbar_list = function () {
         var label = $('<span/>').addClass("navbar-text").text('Cell Toolbar:');
         var select = $('<select/>')
-            // .addClass('ui-widget-content')
             .attr('id', 'ctb_select')
             .addClass('form-control select-xs')
             .append($('<option/>').attr('value', '').text('None'));
diff --git a/IPython/html/static/notebook/js/notificationarea.js b/IPython/html/static/notebook/js/notificationarea.js
index 2426cef..8c406ad 100644
--- a/IPython/html/static/notebook/js/notificationarea.js
+++ b/IPython/html/static/notebook/js/notificationarea.js
@@ -33,8 +33,6 @@ define([
     };
 
     NotificationArea.prototype.temp_message = function (msg, timeout, css_class) {
-        if( css_class == 'danger') {css_class = 'ui-state-error';}
-        if( css_class == 'warning') {css_class = 'ui-state-highlight';}
         var tdiv = $('<div>')
             .addClass('notification_widget')
             .addClass(css_class)
diff --git a/IPython/html/static/notebook/js/savewidget.js b/IPython/html/static/notebook/js/savewidget.js
index 3cfefe1..72cddf9 100644
--- a/IPython/html/static/notebook/js/savewidget.js
+++ b/IPython/html/static/notebook/js/savewidget.js
@@ -30,11 +30,6 @@ define([
         this.element.find('span#notebook_name').click(function () {
             that.rename_notebook();
         });
-        this.element.find('span#notebook_name').hover(function () {
-            $(this).addClass("ui-state-hover");
-        }, function () {
-            $(this).removeClass("ui-state-hover");
-        });
         this.events.on('notebook_loaded.Notebook', function () {
             that.update_notebook_name();
             that.update_document_title();
diff --git a/IPython/html/static/notebook/less/celltoolbar.less b/IPython/html/static/notebook/less/celltoolbar.less
index f1b11e1..b19577f 100644
--- a/IPython/html/static/notebook/less/celltoolbar.less
+++ b/IPython/html/static/notebook/less/celltoolbar.less
@@ -39,8 +39,13 @@
 }
 
 .celltoolbar select {
+    .form-control();
+    .input-sm();
+    width: inherit;
     font-size: 87%;
     height: 22px;
+    display: inline-block;
+
 }
 
 .celltoolbar label {
diff --git a/IPython/html/static/notebook/less/notebook.less b/IPython/html/static/notebook/less/notebook.less
index 1592fa3..87f1503 100644
--- a/IPython/html/static/notebook/less/notebook.less
+++ b/IPython/html/static/notebook/less/notebook.less
@@ -25,6 +25,12 @@ span#notebook_name {
     padding: 3px;
     border: none;
     font-size: 146.5%;
+    &:hover{
+        // ensure body is lighter on dark palette, 
+        // and vice versa
+        background-color:contrast(@body-bg, lighten(@body-bg,30%), darken(@body-bg,10%));
+    }
+    .corner-all;
 }
 
 div#notebook_panel {
diff --git a/IPython/html/static/style/style.min.css b/IPython/html/static/style/style.min.css
index 82f3949..41b21ce 100644
--- a/IPython/html/static/style/style.min.css
+++ b/IPython/html/static/style/style.min.css
@@ -9637,6 +9637,10 @@ span#notebook_name {
   padding: 3px;
   border: none;
   font-size: 146.5%;
+  border-radius: 4px;
+}
+span#notebook_name:hover {
+  background-color: #e6e6e6;
 }
 div#notebook_panel {
   margin: 0px 0px 0px 0px;
@@ -9751,8 +9755,64 @@ p {
   padding-top: 3px;
 }
 .celltoolbar select {
+  display: block;
+  width: 100%;
+  height: 32px;
+  padding: 6px 12px;
+  font-size: 13px;
+  line-height: 1.42857143;
+  color: #555555;
+  background-color: #ffffff;
+  background-image: none;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+  -webkit-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-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+  width: inherit;
   font-size: 87%;
   height: 22px;
+  display: inline-block;
+}
+.celltoolbar select:focus {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+.celltoolbar select::-moz-placeholder {
+  color: #999999;
+  opacity: 1;
+}
+.celltoolbar select:-ms-input-placeholder {
+  color: #999999;
+}
+.celltoolbar select::-webkit-input-placeholder {
+  color: #999999;
+}
+.celltoolbar select[disabled],
+.celltoolbar select[readonly],
+fieldset[disabled] .celltoolbar select {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+  opacity: 1;
+}
+textarea.celltoolbar select {
+  height: auto;
+}
+select.celltoolbar select {
+  height: 30px;
+  line-height: 30px;
+}
+textarea.celltoolbar select,
+select[multiple].celltoolbar select {
+  height: auto;
 }
 .celltoolbar label {
   margin-left: 5px;