diff --git a/app/components/app/App.css b/app/components/app/App.css index 03fd663..213a663 100644 --- a/app/components/app/App.css +++ b/app/components/app/App.css @@ -153,3 +153,30 @@ a:focus { padding-top: 50px; padding-bottom: 50px; } + +.btn--secondary { + font-weight: normal; + border-radius: 4px; + font-size: 1.2em; + color: whitesmoke; + padding: 5px 15px; + background-color: transparent; + border: solid 2px #5A180C; + transition: all .1s ease-in-out; + cursor: pointer; + text-decoration: none !important; +} +.btn--secondary:hover { + background-color: #5A180C; + transition: all .1s ease-in-out; +} +.btn--secondary .glyphicon { + margin-right: 5px; +} + +/* + * Utillities + */ +.u-inlineBlock { + display: inline-block; +} \ No newline at end of file diff --git a/app/components/public/Characters/Characters.css b/app/components/public/Characters/Characters.css index ab0ac0c..a06e673 100644 --- a/app/components/public/Characters/Characters.css +++ b/app/components/public/Characters/Characters.css @@ -46,6 +46,12 @@ width: 100%; padding: 10px; } +.wikiButton { + top: 25px; + position: absolute; + right: 20px; +} + .list-group-item { background: #333; border: none; @@ -64,7 +70,10 @@ .character-container .map-wrapper { padding-bottom: 100%; } - + .wikiButton { + top: -50px; + right: 10px; + } } diff --git a/app/components/public/Characters/Characters.jsx b/app/components/public/Characters/Characters.jsx index 3daaac6..a3378f4 100644 --- a/app/components/public/Characters/Characters.jsx +++ b/app/components/public/Characters/Characters.jsx @@ -4,7 +4,7 @@ import React from 'react'; let {Component} = React; import $ from 'jquery'; import './Characters.css'; -import { Row, Col, Image, ProgressBar } from 'react-bootstrap'; +import { Row, Col, Image, ProgressBar, Glyphicon } from 'react-bootstrap'; import MapComp from '../../common/MapComp/MapComp.jsx'; import Store from '../../../stores/CharactersStore'; @@ -61,7 +61,13 @@ export default class Character extends Component {
-

{this.state.character.name}

+

{this.state.character.name}

+ + + Wiki +