Merge "Cleanup borders of wikiEditor"

This commit is contained in:
jenkins-bot 2014-04-16 19:50:20 +00:00 committed by Gerrit Code Review
commit 3bd860d220
4 changed files with 10 additions and 18 deletions

View file

@ -15,15 +15,10 @@ form#editform {
.wikiEditor-ui textarea#wpTextbox1 {
border: none;
padding: 0;
margin: -1px;
line-height: 1.5em;
resize: vertical;
}
.wikiEditor-ui .wikiEditor-ui-text > textarea#wpTextbox1 {
margin: 0;
}
/* Hide vanilla MediaWiki's "Editing help" link, as we provide it in the toolbar */
.editButtons .editHelp,
.editButtons .mw-editButtons-pipe-separator {

View file

@ -3,24 +3,23 @@
*/
.wikiEditor-ui {
float: left;
position: relative;
clear: both;
width: 100%;
background-color: #E0EEf7;
border: 1px solid silver;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.wikiEditor-ui textarea {
width: 100%;
border: 0;
}
.wikiEditor-ui textarea:focus {
outline: none;
}
.wikiEditor-ui .wikiEditor-ui-text {
line-height: 0;
.wikiEditor-ui .wikiEditor-ui-clear {
clear: both;
}
.wikiEditor-ui .wikiEditor-ui-view {
border: 1px solid silver;
}
.wikiEditor-ui .wikiEditor-ui-top {
position: relative;
@ -43,13 +42,11 @@
float: left;
width: 100%;
background-color: white;
margin-top: -1px;
border-bottom: 1px solid silver;
}
.wikiEditor-ui-tabs {
float: left;
height: 2.5em;
margin-left: -1px;
margin-right: -1px;
background-color: white;
border-left: 1px solid silver;
border-top: 1px solid silver;

View file

@ -518,15 +518,16 @@ if ( !context || typeof context === 'undefined' ) {
.append( $( '<div>' ).addClass( 'wikiEditor-ui-tabs' ).hide() )
.append( $( '<div>' ).addClass( 'wikiEditor-ui-buttons' ) )
)
.before( $( '<div style="clear: both;"></div>' ) );
.before( $( '<div>' ).addClass( 'wikiEditor-ui-clear' ) );
// Get references to some of the newly created containers
context.$controls = context.$ui.find( '.wikiEditor-ui-buttons' ).hide();
context.$buttons = context.$ui.find( '.wikiEditor-ui-buttons' );
context.$tabs = context.$ui.find( '.wikiEditor-ui-tabs' );
// Clear all floating after the UI
context.$ui.after( $( '<div style="clear: both;"></div>' ) );
context.$ui.after( $( '<div>' ).addClass( 'wikiEditor-ui-clear' ) );
// Attach a right container
context.$wikitext.append( $( '<div>' ).addClass( 'wikiEditor-ui-right' ) );
context.$wikitext.append( $( '<div>' ).addClass( 'wikiEditor-ui-clear' ) );
// Attach a top container to the left pane
context.$wikitext.find( '.wikiEditor-ui-left' ).prepend( $( '<div>' ).addClass( 'wikiEditor-ui-top' ) );
// Setup the intial view

View file

@ -4,7 +4,6 @@
.wikiEditor-ui-toolbar {
position: relative;
width: 100%;
}
/* Expandable Sections */
.wikiEditor-ui-toolbar .sections {