Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Fix regression of about:styles #7387

Merged
merged 1 commit into from
Feb 27, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions js/about/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

const React = require('react')
const ImmutableComponent = require('../components/immutableComponent')
const {StyleSheet, css} = require('aphrodite')
const {StyleSheet, css} = require('aphrodite/no-important')
const globalStyles = require('../../app/renderer/components/styles/global')

// Stylesheets go here
Expand Down Expand Up @@ -87,23 +87,23 @@ class AboutStyle extends ImmutableComponent {
</Code></Pre>
</Container>

<div className='container'>
<Container>
<h2>Plain textarea</h2>
<TextArea placeholder='TextArea' />
<pre><code>
<Pre><Code>
const { '{TextArea}' } = require('../../app/renderer/components/textbox'){'\n'}
&lt;TextArea />
</code></pre>
</div>
</Code></Pre>
</Container>

<div className='container'>
<Container>
<h2>Default textarea; font size is specified</h2>
<DefaultTextArea placeholder='DefaultTextArea' />
<pre><code>
<Pre><Code>
const { '{DefaultTextArea}' } = require('../../app/renderer/components/textbox'){'\n'}
&lt;DefaultTextArea />
</code></pre>
</div>
</Code></Pre>
</Container>

<hr />

Expand Down