Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fixes currency symbol font size in Shapeshift modal #2840

Merged
merged 3 commits into from
Oct 24, 2016
Merged

Fixes currency symbol font size in Shapeshift modal #2840

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
985f37d
Fix case error in Dapps import
ngotchac Oct 24, 2016
1f3637c
Fixed big input in modal and currency symbols size (#2718)
ngotchac Oct 24, 2016
90dcade
`em` instead of `rem`
ngotchac Oct 24, 2016
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
2 changes: 1 addition & 1 deletion js/src/modals/Shapeshift/OptionsStep/optionsStep.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

.accept {
padding: 1.5em 0;
margin: 1.5em 0;
}

.coinselector {
Expand Down
6 changes: 6 additions & 0 deletions js/src/modals/Shapeshift/Value/value.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@
.amount {
display: inline-block;
}

.symbol {
font-variant: small-caps;
margin-left: 0.1rem;
font-size: 0.7rem;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should preferably be a percentage of the parent (e.g. 70%). By doing this, you can easily change the font size of the parent without breaking the font size of .symbol.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep I guess em should do the trick. Will fix

}
3 changes: 2 additions & 1 deletion js/src/modals/Shapeshift/Value/value.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ export default class Value extends Component {

return (
<div className={ styles.body }>
<span>{ value }</span><small>{ symbol || 'ETH' }</small>
<span>{ value } </span>
<span className={ styles.symbol }>{ symbol || 'ETH' }</span>
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion js/src/views/Dapps/AddDapps/AddDapps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Checkbox from 'material-ui/Checkbox';

import { Modal, Button } from '../../../ui';

import styles from './addDapps.css';
import styles from './AddDapps.css';

export default class AddDapps extends Component {
static propTypes = {
Expand Down
2 changes: 1 addition & 1 deletion js/src/views/Dapps/AddDapps/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

export default from './addDapps';
export default from './AddDapps';