http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61606
Revision: 61606
Author: adam
Date: 2010-01-27 21:12:22 +0000 (Wed, 27 Jan 2010)
Log Message:
-----------
Namespacing css for wikieditor dialogs in response to Mdale's comment on
r61300. Also adding new button styles from Hannes.
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
trunk/extensions/UsabilityInitiative/css/combined.css
trunk/extensions/UsabilityInitiative/css/combined.min.css
trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-01-27 20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-01-27 21:12:22 UTC (rev 61606)
@@ -22,18 +22,18 @@
array( 'src' =>
'css/vector.collapsibleNav.css', 'version' => 7 ),
array( 'src' => 'css/vector.footerCleanup.css',
'version' => 1 ),
array( 'src' => 'css/wikiEditor.css', 'version'
=> 8 ),
- array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 15 ),
+ array( 'src' => 'css/wikiEditor.dialogs.css',
'version' => 16 ),
array( 'src' => 'css/wikiEditor.preview.css',
'version' => 1 ),
array( 'src' => 'css/wikiEditor.toc.css',
'version' => 28 ),
array( 'src' => 'css/wikiEditor.toolbar.css',
'version' => 10 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'combined' => array(
- array( 'src' => 'css/combined.css', 'version'
=> 58 ),
+ array( 'src' => 'css/combined.css', 'version'
=> 59 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
'minified' => array(
- array( 'src' => 'css/combined.min.css',
'version' => 58 ),
+ array( 'src' => 'css/combined.min.css',
'version' => 59 ),
array( 'src' =>
'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
),
)
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-01-27 20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
2010-01-27 21:12:22 UTC (rev 61606)
@@ -1124,6 +1124,7 @@
},
dialog: {
width: 500,
+ dialogClass: 'wikiEditor-toolbar-dialog',
buttons: {
'wikieditor-toolbar-tool-link-insert':
function() {
function escapeInternalText( s ) {
@@ -1401,6 +1402,7 @@
},
dialog: {
resizable: false,
+ dialogClass: 'wikiEditor-toolbar-dialog',
width: 590,
buttons: {
'wikieditor-toolbar-tool-table-insert':
function() {
@@ -1633,6 +1635,7 @@
},
dialog: {
width: 500,
+ dialogClass: 'wikiEditor-toolbar-dialog',
buttons: {
'wikieditor-toolbar-tool-replace-button-findnext': function( e ) {
$j(this).closest( '.ui-dialog' ).data(
'dialogaction', e.target );
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-01-27 20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
2010-01-27 21:12:22 UTC (rev 61606)
@@ -1173,6 +1173,7 @@
},
dialog: {
width: 500,
+ dialogClass: 'wikiEditor-toolbar-dialog',
buttons: {
'wikieditor-toolbar-tool-link-insert':
function() {
function escapeInternalText( s ) {
@@ -1450,6 +1451,7 @@
},
dialog: {
resizable: false,
+ dialogClass: 'wikiEditor-toolbar-dialog',
width: 590,
buttons: {
'wikieditor-toolbar-tool-table-insert':
function() {
@@ -1682,6 +1684,7 @@
},
dialog: {
width: 500,
+ dialogClass: 'wikiEditor-toolbar-dialog',
buttons: {
'wikieditor-toolbar-tool-replace-button-findnext': function( e ) {
$j(this).closest( '.ui-dialog' ).data(
'dialogaction', e.target );
Modified:
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-01-27 20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
2010-01-27 21:12:22 UTC (rev 61606)
@@ -51,7 +51,7 @@
updateExistence();});$j('#wikieditor-toolbar-link-int-target').data('suggcache',{}).suggestions({fetch:function(query){var
that=this;var
title=$j(this).val();if(isExternalLink(title)||title.indexOf('|')!=-1||title==''){$j(this).suggestions('suggestions',[]);return;}
var cache=$j(this).data('suggcache');if(typeof
cache[title]!='undefined'){$j(this).suggestions('suggestions',cache[title]);return;}
var
request=$j.ajax({url:wgScriptPath+'/api.php',data:{'action':'opensearch','search':title,'namespace':0,'suggest':'','format':'json'},dataType:'json',success:function(data){cache[title]=data[1];$j(that).suggestions('suggestions',data[1]);}});$j(this).data('request',request);},cancel:function(){var
request=$j(this).data('request');if(request)
-request.abort();}});},dialog:{width:500,buttons:{'wikieditor-toolbar-tool-link-insert':function(){function
escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}
+request.abort();}});},dialog:{width:500,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-toolbar-tool-link-insert':function(){function
escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}
function escapeExternalTarget(s){return s.replace(/
/g,'%20').replace(/]/g,'%5D');}
function escapeExternalText(s){return
s.replace(/(]+)/g,'<nowiki>$1</nowiki>');}
var insertText='';var
whitespace=$j('#wikieditor-toolbar-link-dialog').data('whitespace');var
target=$j('#wikieditor-toolbar-link-int-target').val();var
text=$j('#wikieditor-toolbar-link-int-text').val();var
u=mw.usability;if(target==''){alert(u.getMsg('wikieditor-toolbar-tool-link-empty'));return;}
@@ -129,7 +129,7 @@
</div>\
</div></div>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(mw.usability.getMsg($j(this).attr('rel')));});$j('#wikieditor-toolbar-table-dimensions-rows').val(4);$j('#wikieditor-toolbar-table-dimensions-columns').val(3);$j('#wikieditor-toolbar-table-wikitable').click(function(){$j('.wikieditor-toolbar-table-preview').toggleClass('wikitable');});$j('#wikieditor-toolbar-table-preview').clone().attr('id','wikieditor-toolbar-table-preview2').addClass('sortable').insertAfter($j('#wikieditor-toolbar-table-preview')).hide();if(typeof
ts_makeSortable=='function')
ts_makeSortable($j('#wikieditor-toolbar-table-preview2').get(0));$j('#wikieditor-toolbar-table-sortable').click(function(){$j('#wikieditor-toolbar-table-preview').hide().attr('id','wikieditor-toolbar-table-preview3');$j('#wikieditor-toolbar-table-preview2').attr('id','wikieditor-toolbar-table-preview').show();$j('#wikieditor-toolbar-table-preview3').attr('id','wikieditor-toolbar-table-preview2');});$j('#wikieditor-toolbar-table-dimensions-header').click(function(){var
headerHTML=$j('.wikieditor-toolbar-table-preview-header').html();var
hiddenHTML=$j('.wikieditor-toolbar-table-preview-hidden').html();$j('.wikieditor-toolbar-table-preview-header').html(hiddenHTML);$j('.wikieditor-toolbar-table-preview-hidden').html(headerHTML);if(typeof
ts_makeSortable=='function')
-ts_makeSortable($j('#wikieditor-toolbar-table-preview,
#wikieditor-toolbar-table-preview2').filter('.sortable').get(0));});},dialog:{resizable:false,width:590,buttons:{'wikieditor-toolbar-tool-table-insert':function(){var
rowsVal=$j('#wikieditor-toolbar-table-dimensions-rows').val();var
colsVal=$j('#wikieditor-toolbar-table-dimensions-columns').val();var
rows=parseInt(rowsVal,10);var cols=parseInt(colsVal,10);var
header=Math.min(1,$j('#wikieditor-toolbar-table-dimensions-header:checked').size());var
u=mw.usability;if(isNaN(rows)||isNaN(cols)||rows!=rowsVal||cols!=colsVal){alert(u.getMsg('wikieditor-toolbar-tool-table-invalidnumber'));return;}
+ts_makeSortable($j('#wikieditor-toolbar-table-preview,
#wikieditor-toolbar-table-preview2').filter('.sortable').get(0));});},dialog:{resizable:false,dialogClass:'wikiEditor-toolbar-dialog',width:590,buttons:{'wikieditor-toolbar-tool-table-insert':function(){var
rowsVal=$j('#wikieditor-toolbar-table-dimensions-rows').val();var
colsVal=$j('#wikieditor-toolbar-table-dimensions-columns').val();var
rows=parseInt(rowsVal,10);var cols=parseInt(colsVal,10);var
header=Math.min(1,$j('#wikieditor-toolbar-table-dimensions-header:checked').size());var
u=mw.usability;if(isNaN(rows)||isNaN(cols)||rows!=rowsVal||cols!=colsVal){alert(u.getMsg('wikieditor-toolbar-tool-table-invalidnumber'));return;}
if(rows+header==0||cols==0){alert(u.getMsg('wikieditor-toolbar-tool-table-zero'));return;}
if(rows*cols>1000){alert(u.getMsg('wikieditor-toolbar-tool-table-toomany',1000));return;}
var headerText=u.getMsg('wikieditor-toolbar-tool-table-example-header');var
normalText=u.getMsg('wikieditor-toolbar-tool-table-example');var
table="";for(var r=0;r<rows+header;r++){table+="|-\n";for(var
c=0;c<cols;c++){var isHeader=(r+1==header);var
delim=isHeader?'!':'|';if(c>0){delim+=delim;}
@@ -174,6 +174,6 @@
if(!match){$j('#wikieditor-toolbar-replace-nomatch').show();}else
if(mode=='replaceAll'){var index;for(var
i=0;i<match.length;i++){index=s.indexOf(match[i]);if(index==-1){break;}
s=s.substr(index+match[i].length);var start=index+offset;var
end=start+match[i].length;var
newEnd=start+replaceStr.length;$textarea.textSelection('setSelection',{'start':start,'end':end}).textSelection('encapsulateSelection',{'peri':replaceStr,'replace':true}).textSelection('setSelection',{'start':start,'end':newEnd});offset=newEnd;}
$j('#wikieditor-toolbar-replace-success').text(u.getMsg('wikieditor-toolbar-tool-replace-success',match.length)).show();$j(this).data('offset',0);}else{var
start=match.index+offset;var end=start+match[0].length;var
newEnd=start+replaceStr.length;$textarea.textSelection('setSelection',{'start':start,'end':end});if(mode=='replace'){$textarea.textSelection('encapsulateSelection',{'peri':replaceStr,'replace':true}).textSelection('setSelection',{'start':start,'end':newEnd});}
-$textarea.textSelection('scrollToCaretPosition');$j(this).data('offset',mode=='replace'?newEnd:end);}});},dialog:{width:500,buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch,
#wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch,
#wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){var
button=$j(this).data('dialogaction')||$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
+$textarea.textSelection('scrollToCaretPosition');$j(this).data('offset',mode=='replace'?newEnd:end);}});},dialog:{width:500,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch,
#wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch,
#wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){var
button=$j(this).data('dialogaction')||$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
var dialog=$j(this).closest('.ui-dialog');var
that=this;$j($j(this).data('context').$iframe[0].contentWindow.document).bind('keypress.srdialog',function(e){if((e.keyCode||e.which)==13){var
button=dialog.data('dialogaction')||dialog.find('button:first');button.click();e.preventDefault();}else
if((e.keyCode||e.which)==27){$j(that).dialog('close');}});},close:function(){$j($j(this).data('context').$iframe[0].contentWindow.document).unbind('keypress.srdialog');$j(this).data('context').$iframe[0].contentWindow.focus();$j(this).closest('.ui-dialog').data('dialogaction',false);}}}}});}});$j(document).ready(function(){if(!wgWikiEditorEnabledModules.templateEditor){return
true;}
if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','templateEditor');}});
\ No newline at end of file
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-01-27 20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-01-27 21:12:22 UTC (rev 61606)
@@ -16,14 +16,14 @@
array( 'src' => 'Modules/Preview/Preview.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Publish/Publish.js', 'version'
=> 6 ),
array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ),
- array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 37 ),
+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 38 ),
array( 'src' =>
'Modules/TemplateEditor/TemplateEditor.js', 'version' => 4 ),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
39 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
40 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 39 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 40 ),
),
);
static $messages = array(
Modified: trunk/extensions/UsabilityInitiative/css/combined.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.css 2010-01-27
20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/css/combined.css 2010-01-27
21:12:22 UTC (rev 61606)
@@ -224,38 +224,32 @@
}
/* wikiEditor dialogs module */
-.ui-widget table {
+.wikiEditor-toolbar-dialog table {
margin-top: 0.75em;
}
-.ui-widget table td {
+.wikiEditor-toolbar-dialog table td {
padding: 0.5em;
height: 3em;
overflow: visible;
}
-
-
-
/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
div.suggestions {
z-index: 1099;
}
-
-.ui-dialog .ui-dialog-titlebar-close:hover {
+.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close:hover {
text-decoration: none;
}
-.ui-dialog-content .status-invalid input {
+.wikiEditor-toolbar-dialog .ui-dialog-content .status-invalid input {
border: 2px solid red;
padding: 2px 1px;
}
-
-
-.ui-dialog .ui-dialog-titlebar {
+.wikiEditor-toolbar-dialog .ui-dialog-titlebar {
padding: 0.9em 1.4em 0.6em !important;
}
-.ui-widget table td {
+.wikiEditor-toolbar-dialog table td {
padding: 0 !important;
}
-.ui-dialog .ui-dialog-buttonpane button {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
padding: 0.2em 0.6em 0.15em !important;
@@ -263,54 +257,55 @@
border: 1px solid #a6a6a6 !important;
background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button:hover {
- background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover {
+ border-color: #6e7273;
+ background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button:active,
-.ui-dialog .ui-dialog-buttonpane button:focus {
-
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active,
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus {
+ border-color: #707271;
background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button.disabled {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled {
color: #7f7f7f;
border-color: #cccccc;
background: #f2f2f2 url(
../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100%
!important;
}
/* Disables the annoying dashed border Firefox puts on active buttons */
-.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
border: 0;
}
-.ui-widget-header {
+.wikiEditor-toolbar-dialog .ui-widget-header {
background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png
) repeat-x scroll 50% 100% !important;
}
/* FIXME: Should just update the icon sprite if we're keeping this X */
-.ui-icon-closethick {
+.wikiEditor-toolbar-dialog .ui-icon-closethick {
background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat
50% 50% !important;
}
-.ui-dialog .ui-dialog-buttonpane {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane {
margin-top: 0 !important;
padding:0.3em 1.4em 0.5em 1.4em !important;
}
-.ui-dialog-content fieldset{
+.wikiEditor-toolbar-dialog .ui-dialog-content fieldset{
border: none !important;
margin: 0 !important;
padding: 0 !important;
}
-.ui-widget-header {
+.wikiEditor-toolbar-dialog .ui-widget-header {
border-bottom:1px solid #6bc8f3 !important;
}
-.ui-dialog-content input[type=text] {
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text] {
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
-webkit-box-sizing: border-box;
-khtml-box-sizing: border-box;
}
-.ui-dialog-content input[type="radio"],
-.ui-dialog-content input[type="checkbox"] {
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"],
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"] {
margin-left: 0;
}
-body.ltr .ui-dialog .ui-dialog-titlebar-close {
+body.ltr .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
right: 0.9em;
}
.wikieditor-toolbar-field-wrapper {
@@ -340,21 +335,21 @@
body.rtl #wikieditor-toolbar-table-dialog
.wikieditor-toolbar-table-preview-wrapper {
float: left;
}
-body.rtl .ui-widget .wikieditor-toolbar-table-preview-wrapper table {
+body.rtl .wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper
table {
margin-left: 1em;
margin-right: 0;
}
.wikieditor-toolbar-table-preview-content * {
cursor: default;
}
-.ui-widget .wikieditor-toolbar-table-preview-wrapper table {
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table {
width: 100% !important;
}
-.ui-widget .wikieditor-toolbar-table-preview-content table td {
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td {
padding: 10px 4px !important;
height: auto !important;
}
-.ui-widget .wikieditor-toolbar-table-preview-content table th {
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th {
padding: 7px 3px !important;
}
.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
@@ -367,7 +362,7 @@
margin-right: 0px;
margin-left: 20px;
}
-.ui-dialog .ui-dialog-content {
+.wikiEditor-toolbar-dialog .ui-dialog-content {
padding: 30px 20px 0 !important;
}
.wikieditor-toolbar-dialog-wrapper {
@@ -376,15 +371,15 @@
/* REPLACE Dialog */
/* RTL Changes */
-body.rtl .ui-dialog .ui-dialog-buttonpane button {
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
float: left;
margin: 0.5em 0.4em 0.5em 0 !important;
}
-body.rtl .ui-dialog .ui-dialog-titlebar-close {
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
left: 0.9em;
right: auto;
}
-body.rtl .ui-dialog .ui-dialog-title {
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-title {
float:right;
}
/* Self Clearing Floats */
Modified: trunk/extensions/UsabilityInitiative/css/combined.min.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/combined.min.css 2010-01-27
20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/css/combined.min.css 2010-01-27
21:12:22 UTC (rev 61606)
@@ -213,10 +213,10 @@
.wikiEditor-ui-tabs div.current a:hover{
text-decoration:none;
}
-.ui-widget table{
+.wikiEditor-toolbar-dialog table{
margin-top:0.75em;
}
-.ui-widget table td{
+.wikiEditor-toolbar-dialog table td{
padding:0.5em;
height:3em;
overflow:visible;
@@ -224,20 +224,20 @@
div.suggestions{
z-index:1099;
}
-.ui-dialog .ui-dialog-titlebar-close:hover{
+.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close:hover{
text-decoration:none;
}
-.ui-dialog-content .status-invalid input{
+.wikiEditor-toolbar-dialog .ui-dialog-content .status-invalid input{
border:2px solid red;
padding:2px 1px;
}
-.ui-dialog .ui-dialog-titlebar{
+.wikiEditor-toolbar-dialog .ui-dialog-titlebar{
padding:0.9em 1.4em 0.6em !important;
}
-.ui-widget table td{
+.wikiEditor-toolbar-dialog table td{
padding:0 !important;
}
-.ui-dialog .ui-dialog-buttonpane button{
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button{
-moz-border-radius:4px;
-webkit-border-radius:4px;
padding:0.2em 0.6em 0.15em !important;
@@ -245,50 +245,52 @@
border:1px solid #a6a6a6 !important;
background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x
scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button:hover{
-background:#ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover{
+border-color:#6e7273;
+background:#e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button:active,
-.ui-dialog .ui-dialog-buttonpane button:focus{
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active,
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus{
+border-color:#707271;
background:#bfbfbf url( ../images/wikiEditor/dialogs/button_down.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button.disabled{
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled{
color:#7f7f7f;
border-color:#cccccc;
background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner{
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner{
border:0;
}
-.ui-widget-header{
+.wikiEditor-toolbar-dialog .ui-widget-header{
background:#f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png )
repeat-x scroll 50% 100% !important;
}
-.ui-icon-closethick{
+.wikiEditor-toolbar-dialog .ui-icon-closethick{
background:url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50%
!important;
}
-.ui-dialog .ui-dialog-buttonpane{
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane{
margin-top:0 !important;
padding:0.3em 1.4em 0.5em 1.4em !important;
}
-.ui-dialog-content fieldset{
+.wikiEditor-toolbar-dialog .ui-dialog-content fieldset{
border:none !important;
margin:0 !important;
padding:0 !important;
}
-.ui-widget-header{
+.wikiEditor-toolbar-dialog .ui-widget-header{
border-bottom:1px solid #6bc8f3 !important;
}
-.ui-dialog-content input[type=text]{
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text]{
-moz-box-sizing:border-box;
-ms-box-sizing:border-box;
-webkit-box-sizing:border-box;
-khtml-box-sizing:border-box;
}
-.ui-dialog-content input[type="radio"],
-.ui-dialog-content input[type="checkbox"]{
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"],
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"]{
margin-left:0;
}
-body.ltr .ui-dialog .ui-dialog-titlebar-close{
+body.ltr .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close{
right:0.9em;
}
.wikieditor-toolbar-field-wrapper{
@@ -316,21 +318,21 @@
body.rtl #wikieditor-toolbar-table-dialog
.wikieditor-toolbar-table-preview-wrapper{
float:left;
}
-body.rtl .ui-widget .wikieditor-toolbar-table-preview-wrapper table{
+body.rtl .wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper
table{
margin-left:1em;
margin-right:0;
}
.wikieditor-toolbar-table-preview-content *{
cursor:default;
}
-.ui-widget .wikieditor-toolbar-table-preview-wrapper table{
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table{
width:100% !important;
}
-.ui-widget .wikieditor-toolbar-table-preview-content table td{
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td{
padding:10px 4px !important;
height:auto !important;
}
-.ui-widget .wikieditor-toolbar-table-preview-content table th{
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th{
padding:7px 3px !important;
}
.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper{
@@ -343,21 +345,21 @@
margin-right:0px;
margin-left:20px;
}
-.ui-dialog .ui-dialog-content{
+.wikiEditor-toolbar-dialog .ui-dialog-content{
padding:30px 20px 0 !important;
}
.wikieditor-toolbar-dialog-wrapper{
width:100%;
}
-body.rtl .ui-dialog .ui-dialog-buttonpane button{
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button{
float:left;
margin:0.5em 0.4em 0.5em 0 !important;
}
-body.rtl .ui-dialog .ui-dialog-titlebar-close{
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close{
left:0.9em;
right:auto;
}
-body.rtl .ui-dialog .ui-dialog-title{
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-title{
float:right;
}
.wikieditor-toolbar-table-dimension-fields:after,
Modified: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
===================================================================
--- trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2010-01-27 20:54:04 UTC (rev 61605)
+++ trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
2010-01-27 21:12:22 UTC (rev 61606)
@@ -1,37 +1,31 @@
/* wikiEditor dialogs module */
-.ui-widget table {
+.wikiEditor-toolbar-dialog table {
margin-top: 0.75em;
}
-.ui-widget table td {
+.wikiEditor-toolbar-dialog table td {
padding: 0.5em;
height: 3em;
overflow: visible;
}
-
-
-
/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
div.suggestions {
z-index: 1099;
}
-
-.ui-dialog .ui-dialog-titlebar-close:hover {
+.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close:hover {
text-decoration: none;
}
-.ui-dialog-content .status-invalid input {
+.wikiEditor-toolbar-dialog .ui-dialog-content .status-invalid input {
border: 2px solid red;
padding: 2px 1px;
}
-
-
-.ui-dialog .ui-dialog-titlebar {
+.wikiEditor-toolbar-dialog .ui-dialog-titlebar {
padding: 0.9em 1.4em 0.6em !important;
}
-.ui-widget table td {
+.wikiEditor-toolbar-dialog table td {
padding: 0 !important;
}
-.ui-dialog .ui-dialog-buttonpane button {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
padding: 0.2em 0.6em 0.15em !important;
@@ -39,54 +33,55 @@
border: 1px solid #a6a6a6 !important;
background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button:hover {
- background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover {
+ border-color: #6e7273;
+ background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button:active,
-.ui-dialog .ui-dialog-buttonpane button:focus {
-
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active,
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus {
+ border-color: #707271;
background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png )
repeat-x scroll 50% 100% !important;
}
-.ui-dialog .ui-dialog-buttonpane button.disabled {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled {
color: #7f7f7f;
border-color: #cccccc;
background: #f2f2f2 url(
../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100%
!important;
}
/* Disables the annoying dashed border Firefox puts on active buttons */
-.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
border: 0;
}
-.ui-widget-header {
+.wikiEditor-toolbar-dialog .ui-widget-header {
background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png
) repeat-x scroll 50% 100% !important;
}
/* FIXME: Should just update the icon sprite if we're keeping this X */
-.ui-icon-closethick {
+.wikiEditor-toolbar-dialog .ui-icon-closethick {
background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat
50% 50% !important;
}
-.ui-dialog .ui-dialog-buttonpane {
+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane {
margin-top: 0 !important;
padding:0.3em 1.4em 0.5em 1.4em !important;
}
-.ui-dialog-content fieldset{
+.wikiEditor-toolbar-dialog .ui-dialog-content fieldset{
border: none !important;
margin: 0 !important;
padding: 0 !important;
}
-.ui-widget-header {
+.wikiEditor-toolbar-dialog .ui-widget-header {
border-bottom:1px solid #6bc8f3 !important;
}
-.ui-dialog-content input[type=text] {
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text] {
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
-webkit-box-sizing: border-box;
-khtml-box-sizing: border-box;
}
-.ui-dialog-content input[type="radio"],
-.ui-dialog-content input[type="checkbox"] {
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"],
+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"] {
margin-left: 0;
}
-body.ltr .ui-dialog .ui-dialog-titlebar-close {
+body.ltr .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
right: 0.9em;
}
.wikieditor-toolbar-field-wrapper {
@@ -116,21 +111,21 @@
body.rtl #wikieditor-toolbar-table-dialog
.wikieditor-toolbar-table-preview-wrapper {
float: left;
}
-body.rtl .ui-widget .wikieditor-toolbar-table-preview-wrapper table {
+body.rtl .wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper
table {
margin-left: 1em;
margin-right: 0;
}
.wikieditor-toolbar-table-preview-content * {
cursor: default;
}
-.ui-widget .wikieditor-toolbar-table-preview-wrapper table {
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table {
width: 100% !important;
}
-.ui-widget .wikieditor-toolbar-table-preview-content table td {
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td {
padding: 10px 4px !important;
height: auto !important;
}
-.ui-widget .wikieditor-toolbar-table-preview-content table th {
+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th {
padding: 7px 3px !important;
}
.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
@@ -143,7 +138,7 @@
margin-right: 0px;
margin-left: 20px;
}
-.ui-dialog .ui-dialog-content {
+.wikiEditor-toolbar-dialog .ui-dialog-content {
padding: 30px 20px 0 !important;
}
.wikieditor-toolbar-dialog-wrapper {
@@ -152,15 +147,15 @@
/* REPLACE Dialog */
/* RTL Changes */
-body.rtl .ui-dialog .ui-dialog-buttonpane button {
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
float: left;
margin: 0.5em 0.4em 0.5em 0 !important;
}
-body.rtl .ui-dialog .ui-dialog-titlebar-close {
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
left: 0.9em;
right: auto;
}
-body.rtl .ui-dialog .ui-dialog-title {
+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-title {
float:right;
}
/* Self Clearing Floats */
Modified:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png
===================================================================
(Binary files differ)
Modified:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
===================================================================
(Binary files differ)
Modified:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
===================================================================
(Binary files differ)
Modified:
trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
===================================================================
(Binary files differ)
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
