Skip to content

Commit

Permalink
RNMobile: Remove unneeded/duplicate css (#18759)
Browse files Browse the repository at this point in the history
* Remove unneeded/duplicate css

* Remove min-height-paragraph from gallery caption
  • Loading branch information
mchowning authored Jan 16, 2020
1 parent 80e1a5a commit 434f32f
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 27 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
$floating-toolbar-height: 44;

.floatingToolbar {
background-color: $dark-gray-500;
margin: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ $get-caption-background-color: rgba(0, 0, 0, 0.4);
background-color: #0000;
color: #fff;
font-family: $default-regular-font;
min-height: $min-height-paragraph;
text-align: center;
}

Expand Down
6 changes: 1 addition & 5 deletions packages/block-library/src/heading/edit.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* Internal dependencies
*/
import HeadingToolbar from './heading-toolbar';
import styles from './editor.scss';

/**
* External dependencies
Expand Down Expand Up @@ -38,10 +37,7 @@ const HeadingEdit = ( {
identifier="content"
tagName={ 'h' + attributes.level }
value={ attributes.content }
style={ {
...style,
minHeight: styles[ 'wp-block-heading' ].minHeight,
} }
style={ style }
onChange={ ( value ) => setAttributes( { content: value } ) }
onMerge={ mergeBlocks }
onSplit={ ( value ) => {
Expand Down
4 changes: 0 additions & 4 deletions packages/block-library/src/heading/editor.native.scss

This file was deleted.

4 changes: 0 additions & 4 deletions packages/block-library/src/heading/style.native.scss

This file was deleted.

4 changes: 0 additions & 4 deletions packages/block-library/src/paragraph/style.native.scss

This file was deleted.

4 changes: 2 additions & 2 deletions packages/editor/src/components/post-title/style.native.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
.titleContainer {
padding-left: 16;
padding-right: 16;
padding-top: $title-block-padding-top;
padding-bottom: $title-block-padding-bottom;
padding-top: 12;
padding-bottom: 12;
margin-top: 24;
}

Expand Down
7 changes: 1 addition & 6 deletions packages/rich-text/src/component/index.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -662,11 +662,6 @@ export class RichText extends Component {
const record = this.getRecord();
const html = this.getHtmlToRender( record, tagName );

let minHeight = styles.richText.minHeight;
if ( style && style.minHeight ) {
minHeight = style.minHeight;
}

const placeholderStyle = getStylesFromColorScheme( styles.richTextPlaceholder, styles.richTextPlaceholderDark );

const {
Expand Down Expand Up @@ -742,7 +737,7 @@ export class RichText extends Component {
} }
style={ {
...style,
minHeight: Math.max( minHeight, this.state.height ),
minHeight: this.state.height,
} }
text={ { text: html, eventCount: this.lastEventCount, selection } }
placeholder={ this.props.placeholder }
Expand Down
1 change: 0 additions & 1 deletion packages/rich-text/src/component/style.native.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

.richText {
font-family: $default-regular-font;
min-height: $min-height-paragraph;
color: $gray-900;
text-decoration-color: $blue-500;
}
Expand Down

0 comments on commit 434f32f

Please sign in to comment.