| Index: trunk/extensions/VisualEditor/demo/index.html |
| — | — | @@ -61,7 +61,6 @@ |
| 62 | 62 | <body> |
| 63 | 63 | <div id="es-base"> |
| 64 | 64 | <div id="es-toolbar" class="es-toolbar"> |
| 65 | | - <div style="clear:both"></div> |
| 66 | 65 | <div id="es-toolbar-shadow"></div> |
| 67 | 66 | </div> |
| 68 | 67 | <div id="es-panes"> |
| — | — | @@ -75,7 +74,6 @@ |
| 76 | 75 | <div id="es-preview-render" class="es-preview es-render"></div> |
| 77 | 76 | <div id="es-preview-history" class="es-preview es-history"></div> |
| 78 | 77 | </div> |
| 79 | | - <div style="clear:both"></div> |
| 80 | 78 | </div> |
| 81 | 79 | </div> |
| 82 | 80 | |
| Index: trunk/extensions/VisualEditor/modules/es/views/es.ToolbarView.js |
| — | — | @@ -7,8 +7,9 @@ |
| 8 | 8 | $window = $( window ); |
| 9 | 9 | |
| 10 | 10 | this.surfaceView = surfaceView; |
| 11 | | - this.$spacer = $('<div>'); |
| | 11 | + this.$spacer = $('<div></div>'); |
| 12 | 12 | this.$ = $container; |
| | 13 | + this.$groups = $( '<div class="es-toolbarGroups"></div>' ).prependTo( this.$ ); |
| 13 | 14 | this.$.after( this.$spacer ); |
| 14 | 15 | |
| 15 | 16 | /* |
| — | — | @@ -52,7 +53,7 @@ |
| 53 | 54 | es.ToolbarView.tools = {}; |
| 54 | 55 | |
| 55 | 56 | es.ToolbarView.prototype.setup = function() { |
| 56 | | - for ( var i = this.config.length - 1; i >= 0; i-- ) { |
| | 57 | + for ( var i = 0; i < this.config.length; i++ ) { |
| 57 | 58 | var $group = $( '<div>' ) |
| 58 | 59 | .addClass( 'es-toolbarGroup' ) |
| 59 | 60 | .addClass( 'es-toolbarGroup-' + this.config[i].name ) |
| — | — | @@ -65,7 +66,7 @@ |
| 66 | 67 | $group.append( tool.$ ); |
| 67 | 68 | } |
| 68 | 69 | |
| 69 | | - this.$.prepend( $group ); |
| | 70 | + this.$groups.append( $group ); |
| 70 | 71 | } |
| 71 | 72 | }; |
| 72 | 73 | |
| Index: trunk/extensions/VisualEditor/modules/sandbox/sandbox.css |
| — | — | @@ -46,6 +46,14 @@ |
| 47 | 47 | .es-showData #es-editor { |
| 48 | 48 | border-right: solid 1px #cccccc; |
| 49 | 49 | } |
| | 50 | +.es-toolbarGroups:after, |
| | 51 | +.es-toolbarGroup:after { |
| | 52 | + content: "."; |
| | 53 | + display: block; |
| | 54 | + height: 0; |
| | 55 | + clear: both; |
| | 56 | + visibility: hidden; |
| | 57 | +} |
| 50 | 58 | .es-toolbarGroup { |
| 51 | 59 | float: left; |
| 52 | 60 | padding: 0.25em; |