diff --git a/js/components/ascribe_accordion_list/accordion_list_item.js b/js/components/ascribe_accordion_list/accordion_list_item.js index 69d4bae5..d68c5ce4 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item.js +++ b/js/components/ascribe_accordion_list/accordion_list_item.js @@ -59,15 +59,16 @@ let AccordionListItem = React.createClass({ overlay={{this.props.content.title}}>

{this.props.content.title}

-

{getLangText('by %s', this.props.content.artist_name)}

+

{getLangText('by %s', this.props.content.artist_name)}

+
+ {this.props.content.date_created.split('-')[0]} +
- {this.props.content.date_created.split('-')[0]} {/* {getLangText('%s license', this.props.content.license_type.code)} */} -
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js index 92a8a1c4..cf285da3 100644 --- a/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js +++ b/js/components/ascribe_accordion_list/accordion_list_item_edition_widget.js @@ -75,15 +75,24 @@ let AccordionListItemEditionWidget = React.createClass({ - {', ' + editionMapping + ' ' + getLangText('Edition')} {this.getGlyphicon()} + {editionMapping + ' ' + getLangText('Edition')} {this.getGlyphicon()} ); - } else { + } else if(numEditions === 0){ return ( - {', ' + numEditions + ' ' + getLangText('Editions')} {this.getGlyphicon()} + {'+ Editions'} + + ); + } + else { + return ( + + {numEditions + ' ' + getLangText('Editions')} {this.getGlyphicon()} ); } diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js index 94f6e507..73da8e65 100644 --- a/js/components/ascribe_detail/edition.js +++ b/js/components/ascribe_detail/edition.js @@ -275,7 +275,7 @@ let EditionPersonalNote = React.createClass({ label={getLangText('Personal note (private)')} editable={true}> { diff --git a/sass/ascribe_accordion_list.scss b/sass/ascribe_accordion_list.scss index 4e86db75..fa77522e 100644 --- a/sass/ascribe_accordion_list.scss +++ b/sass/ascribe_accordion_list.scss @@ -19,7 +19,7 @@ $ascribe-accordion-list-font: 'Source Sans Pro'; border-right: 0.1em solid rgba(0,0,0,.2); border-top: 0.1em solid rgba(0,0,0,.2); border-radius: 1px; - border-bottom: 0.1em solid rgba(0,0,0,.2); + border-bottom: 0.1em solid rgba(0,0,0,0); .wrapper { &:hover{ background-color: rgba(2, 182, 163, 0.05); @@ -44,13 +44,14 @@ $ascribe-accordion-list-font: 'Source Sans Pro'; } } h1 { - margin-top: .3em; - font-size: 2.25em; + margin: .1em 0 .1em 0; + font-size: 2.2em; cursor: pointer; } h3 { - font-size: 1.1em; - margin: .2em 0 0 0; + font-size: 1.3em; + margin: .2em 0 .3em 0; + cursor: pointer; } a { color: #666; @@ -88,6 +89,7 @@ $ascribe-accordion-list-font: 'Source Sans Pro'; } } border-left: 3px solid rgba(0,0,0,0); + border-top: 1px solid rgba(0,0,0,.1); border-bottom: 1px solid rgba(0,0,0,.05); } tbody { @@ -143,9 +145,12 @@ span.ascribe-accordion-list-table-toggle { .ascribe-accordion-list-item-edition-widget { cursor: pointer; - //margin-left: 0.3em; &:hover { - color: $ascribe-color-full; + color: $ascribe-color-dark; + } + .glyphicon { + top: 1px !important; + font-size: 0.8em; } } \ No newline at end of file diff --git a/sass/ascribe_edition.scss b/sass/ascribe_edition.scss index 4af3168f..ee082a04 100644 --- a/sass/ascribe_edition.scss +++ b/sass/ascribe_edition.scss @@ -11,8 +11,8 @@ .ascribe-edition-collapsible-wrapper > div:first-child { width: 100%; cursor: pointer; - background-color: #F5F5F5; - padding: 10px; + background-color: rgba(0,0,0,0); + padding: 0 10px 10px 0; margin-top: 20px; } .ascribe-edition-collapsible-wrapper > div > span {