| Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.css |
| — | — | @@ -9,13 +9,13 @@ |
| 10 | 10 | textarea#wpTextbox1 { |
| 11 | 11 | border: solid silver 1px; |
| 12 | 12 | padding: 0; |
| 13 | | - margin-top: -2px; |
| | 13 | + margin: 0; |
| 14 | 14 | } |
| 15 | 15 | /* ... */ |
| 16 | 16 | div#edittoolbar { |
| 17 | 17 | border: solid silver 1px; |
| 18 | 18 | border-bottom-width: 0; |
| 19 | | - background-color: #EEEEEE; |
| | 19 | + background-color: #F3F3F3; |
| 20 | 20 | } |
| 21 | 21 | div#edittoolbar div.tabs, |
| 22 | 22 | div#edittoolbar div.group { |
| — | — | @@ -91,6 +91,7 @@ |
| 92 | 92 | } |
| 93 | 93 | body.rtl div#edittoolbar div.group > select { |
| 94 | 94 | float: right; |
| | 95 | + font-size: 0.9em; |
| 95 | 96 | } |
| 96 | 97 | div#edittoolbar div.index { |
| 97 | 98 | float: left; |
| Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js |
| — | — | @@ -266,14 +266,6 @@ |
| 267 | 267 | .appendTo( pageDiv ); |
| 268 | 268 | for ( character in section.pages[page].characters ) { |
| 269 | 269 | switch( section.pages[page].characters[character].type ) { |
| 270 | | - case 'break': |
| 271 | | - /* |
| 272 | | - pageDiv.append( |
| 273 | | - $( '<div />' ) |
| 274 | | - .css( 'clear', 'both' ) |
| 275 | | - ); |
| 276 | | - */ |
| 277 | | - break; |
| 278 | 270 | case 'link': |
| 279 | 271 | var context = { |
| 280 | 272 | 'tool' : section.pages[page].characters[character], |
| — | — | @@ -282,7 +274,7 @@ |
| 283 | 275 | charsDiv.append( |
| 284 | 276 | $( '<a />' ) |
| 285 | 277 | .attr( 'href', '#' ) |
| 286 | | - .text( section.pages[page].characters[character].text ) |
| | 278 | + .text( section.pages[page].characters[character].label ) |
| 287 | 279 | .data( 'context', context) |
| 288 | 280 | .click( action ) |
| 289 | 281 | .click( function() { return false; } ) |
| — | — | @@ -363,7 +355,7 @@ |
| 364 | 356 | for( character in charinsert[page][line] ) { |
| 365 | 357 | var tool = { |
| 366 | 358 | type: 'link', |
| 367 | | - text: '', |
| | 359 | + label: '', |
| 368 | 360 | action: { |
| 369 | 361 | type: 'encapsulate', |
| 370 | 362 | options: { |
| — | — | @@ -378,10 +370,9 @@ |
| 379 | 371 | } else { |
| 380 | 372 | tool.action.options.pre = charinsert[page][line][character]; |
| 381 | 373 | } |
| 382 | | - tool.text = tool.action.options.pre + tool.action.options.post; |
| | 374 | + tool.label = tool.action.options.pre + tool.action.options.post; |
| 383 | 375 | characters[i++] = tool; |
| 384 | 376 | } |
| 385 | | - characters[i++] = { type: 'break' }; |
| 386 | 377 | } |
| 387 | 378 | retval[pageKey] = { |
| 388 | 379 | label: page, |