yellow team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~gary/juju-gui/bug1068035 into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)
Related bugs:
  Bug #1068035 in juju-ui: "Search field text is italicised when typing"
  https://bugs.launchpad.net/juju-gui/+bug/1068035

For more details, see:
https://code.launchpad.net/~gary/juju-gui/bug1068035/+merge/130407

Quick fix for bug 1068035

Looks like we lost some small styling in the move over to the new location.  This reinstates it, and fixes some lint on trunk.
-- 
https://code.launchpad.net/~gary/juju-gui/bug1068035/+merge/130407
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~gary/juju-gui/bug1068035 into lp:juju-gui.

=== modified file 'app/views/environment.js'
--- app/views/environment.js	2012-10-18 15:54:06 +0000
+++ app/views/environment.js	2012-10-18 17:56:19 +0000
@@ -116,9 +116,9 @@
               self.set('potential_drop_point_service', null);
               self.set('potential_drop_point_rect', null);
               self.removeSVGClass(rect, 'hover');
-              
+
               if (self.dragline) {
-                self.dragline.attr('class', 
+                self.dragline.attr('class',
                     'relation pending-relation dragline dragging');
               }
             }
@@ -1068,7 +1068,7 @@
           // Get rid of our drag line
           self.dragline.remove();
           self.buildingRelation = false;
-          self.cursorBox = null
+          self.cursorBox = null;
 
           // If we landed on a rect, add relation, otherwise, cancel.
           if (rect) {

=== modified file 'lib/views/stylesheet.less'
--- lib/views/stylesheet.less	2012-10-18 15:54:06 +0000
+++ lib/views/stylesheet.less	2012-10-18 17:56:19 +0000
@@ -80,11 +80,13 @@
                     padding: 3px 3px 3px 26px;
                     font-style: italic;
                     font-family: @font-family;
-                    font-size: 0.9em; fill: #333333;
+                    font-size: 0.9em;
                     &:focus {
                         background: white;
                         padding: 3px;
                         width: 151px;
+                        font-style: normal;
+                        font-size: 1em;
                     }
                 }