ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity

add ellipsis again

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-07-27 18:19:55 +02:00
parent c2d76034af
commit 1a1ba8bbb1
7 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/components/ascribe_accordion_list/accordion_list_item.js
View File

@ -20,8 +20,6 @@ import EditionListActions from '../../actions/edition_list_actions';
import GlobalNotificationModel from '../../models/global_notification_model';
import GlobalNotificationActions from '../../actions/global_notification_actions';
import FlowType from '../react_flow_type/react_flow_type';
import AclProxy from '../acl_proxy';
import SubmitToPrizeButton from '../ascribe_buttons/submit_to_prize_button';
@ -161,9 +159,6 @@ let AccordionListItem = React.createClass({
</div>
</div>
<div className="col-xs-8 col-sm-9 col-md-9 col-lg-9 col-md-offset-1 col-lg-offset-1 accordion-list-item-header">
<FlowType
minimum={350}
maximum={500}>
<Link {...linkData}>
<h1>{this.props.content.title}</h1>
</Link>
@ -200,7 +195,6 @@ let AccordionListItem = React.createClass({
</AclProxy>
{this.getLicences()}
</div>
</FlowType>
</div>
<span style={{'clear': 'both'}}></span>

19
js/components/ascribe_detail/detail_property.js
View File

@ -11,26 +11,35 @@ let DetailProperty = React.createClass({
]),
separator: React.PropTypes.string,
labelClassName: React.PropTypes.string,
valueClassName: React.PropTypes.string
valueClassName: React.PropTypes.string,
breakWord: React.PropTypes.bool
},
getDefaultProps() {
return {
separator: ':',
labelClassName: 'col-xs-3 col-sm-4 col-md-3 col-lg-3',
valueClassName: 'col-xs-9 col-sm-8 col-md-9 col-lg-9'
labelClassName: 'col-xs-3 col-sm-3 col-md-2 col-lg-2',
valueClassName: 'col-xs-9 col-sm-9 col-md-10 col-lg-10'
};
},
render() {
let value = this.props.value;
let style;
if(this.props.breakWord) {
style = {
wordBreak: 'break-all'
};
}
if (this.props.children){
value = (
<div className="row-same-height">
<div className="col-xs-6 col-xs-height col-bottom no-padding">
{ this.props.value }
</div>
<div className="col-xs-6 col-xs-height">
<div className="col-xs-6 col-xs-height" style={style}>
{ this.props.children }
</div>
</div>);
@ -41,7 +50,7 @@ let DetailProperty = React.createClass({
<div className={this.props.labelClassName + ' col-xs-height col-bottom ascribe-detail-property-label'}>
{ this.props.label + this.props.separator}
</div>
<div className={this.props.valueClassName + ' col-xs-height col-bottom ascribe-detail-property-value'}>
<div style={style} className={this.props.valueClassName + ' col-xs-height col-bottom ascribe-detail-property-value'}>
{value}
</div>
</div>

3
js/components/ascribe_detail/edition.js
View File

@ -98,7 +98,8 @@ let Edition = React.createClass({
</Col>
<Col md={6} className="ascribe-edition-details">
<div className="ascribe-detail-header">
<EditionDetailProperty label="TITLE" value={<div className="ascribe-detail-title">{this.props.edition.title}</div>} />
<h1 className="ascribe-detail-title">{this.props.edition.title}</h1>
<hr/>
<EditionDetailProperty label="BY" value={this.props.edition.artist_name} />
<EditionDetailProperty label="DATE" value={ this.props.edition.date_created.slice(0, 4) } />
<hr/>

3
js/components/ascribe_detail/piece.js
View File

@ -131,7 +131,8 @@ let Piece = React.createClass({
</Col>
<Col md={6} className="ascribe-edition-details">
<div className="ascribe-detail-header">
<EditionDetailProperty label="TITLE" value={<div className="ascribe-detail-title">{this.props.piece.title}</div>} />
<h1 className="ascribe-detail-title">{this.props.piece.title}</h1>
<hr/>
<EditionDetailProperty label="BY" value={this.props.piece.artist_name} />
<EditionDetailProperty label="DATE" value={ this.props.piece.date_created.slice(0, 4) } />
{this.props.piece.num_editions > 0 ? <EditionDetailProperty label="EDITIONS" value={ this.props.piece.num_editions } /> : null}

3
sass/ascribe_accordion_list.scss
View File

@ -48,6 +48,9 @@ $ascribe-accordion-list-font: 'Source Sans Pro';
margin: .1em 0 .1em 0;
font-size: 2.2em;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
h3 {
font-size: 1.3em;

7
sass/main.scss
View File

@ -215,7 +215,8 @@ hr {
.ascribe-detail-title {
font-size: 2em;
margin-bottom: -0.2em;
font-weight: bold;
margin-top: 0;
}
.ascribe-detail-property {
@ -227,8 +228,8 @@ hr {
}
.ascribe-detail-property-value {
white-space: nowrap;
overflow: hidden;
/* white-space: nowrap;
overflow: hidden; */
text-overflow: ellipsis;
}