ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

Fix buttons for cc

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-10-21 14:52:25 +02:00
parent 61cb4c87a9
commit a9fa60eaf2
5 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,12 +116,12 @@ let AccordionListItemEditionWidget = React.createClass({
if(piece.first_edition === null) { if(piece.first_edition === null) {
// user has deleted all his editions and only the piece is showing // user has deleted all his editions and only the piece is showing
return ( return (
<Button <button
disabled disabled
title={getLangText('All editions for this have been deleted already.')} title={getLangText('All editions for this have been deleted already.')}
className={classNames('btn', 'btn-secondary', 'btn-sm', 'ascribe-accordion-list-item-edition-widget', this.props.className)}> className={classNames('btn', 'btn-default', 'btn-secondary', 'btn-sm', 'ascribe-accordion-list-item-edition-widget', this.props.className)}>
{'0 ' + getLangText('Editions')} {'0 ' + getLangText('Editions')}
</Button> </button>
); );
} else { } else {
let editionMapping = piece && piece.first_edition ? piece.first_edition.num_editions_available + '/' + piece.num_editions : ''; let editionMapping = piece && piece.first_edition ? piece.first_edition.num_editions_available + '/' + piece.num_editions : '';

4
js/components/ascribe_buttons/create_editions_button.js
View File

@ -77,7 +77,7 @@ let CreateEditionsButton = React.createClass({
return ( return (
<button <button
disabled disabled
className={classNames('btn', 'btn-default', this.props.className)}> className={classNames('btn', this.props.className)}>
{getLangText('Creating editions')} <AscribeSpinner {getLangText('Creating editions')} <AscribeSpinner
size='sm' size='sm'
color='white' color='white'
@ -87,7 +87,7 @@ let CreateEditionsButton = React.createClass({
} else { } else {
return ( return (
<button <button
className={classNames('btn', 'btn-default', this.props.className)} className={classNames('btn', this.props.className)}
onClick={this.props.toggleCreateEditionsDialog}> onClick={this.props.toggleCreateEditionsDialog}>
{this.props.label} {this.props.label}
</button> </button>

2
js/components/ascribe_uploader/react_s3_fine_uploader.js
View File

@ -326,7 +326,7 @@ let ReactS3FineUploader = React.createClass({
.then((res) => { .then((res) => {
return res.json(); return res.json();
}) })
.then((res) =>{ .then((res) => {
if(res.otherdata) { if(res.otherdata) {
file.s3Url = res.otherdata.url_safe; file.s3Url = res.otherdata.url_safe;
file.s3UrlSafe = res.otherdata.url_safe; file.s3UrlSafe = res.otherdata.url_safe;

5
sass/ascribe_custom_style.scss
View File

@ -238,6 +238,10 @@ hr {
// thought of the day: // thought of the day:
// "every great atrocity is the result of people just following orders" // "every great atrocity is the result of people just following orders"
.btn {
font-weight: $ascribe--font-weight-light;
}
// disabled buttons // disabled buttons
.btn-default.disabled, .btn-default.disabled,
.btn-default.disabled:hover, .btn-default.disabled:hover,
@ -264,7 +268,6 @@ fieldset[disabled] .btn-default.active {
.btn-default { .btn-default {
background-color: $ascribe--button-default-color; background-color: $ascribe--button-default-color;
border-color: $ascribe--button-default-color; border-color: $ascribe--button-default-color;
font-weight: $ascribe--font-weight-light;
&:hover, &:hover,
&:active, &:active,

27
sass/whitelabel/wallet/cc/cc_custom_style.scss
View File

@ -70,6 +70,7 @@ $cc--button-color: $cc--nav-fg-prim-color;
// disabled buttons // disabled buttons
.client--cc { .client--cc {
// disabled buttons
.btn-default.disabled, .btn-default.disabled,
.btn-default.disabled:hover, .btn-default.disabled:hover,
.btn-default.disabled:focus, .btn-default.disabled:focus,
@ -88,8 +89,30 @@ $cc--button-color: $cc--nav-fg-prim-color;
fieldset[disabled] .btn-default.focus, fieldset[disabled] .btn-default.focus,
fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default:active,
fieldset[disabled] .btn-default.active { fieldset[disabled] .btn-default.active {
background-color: darken($cc--button-color, 20%); background-color: $cc--nav-bg-color;
border-color: darken($cc--button-color, 20%); color: $cc--nav-fg-prim-color;
}
}
.client--cc {
.btn-secondary {
background-color: $cc--nav-bg-color;
border-color: $cc--nav-fg-prim-color;
color: $cc--nav-fg-prim-color;
&:hover,
&:active,
&:focus,
&:active:hover,
&:active:focus,
&:active.focus,
&.active:hover,
&.active:focus,
&.active.focus {
background-color: $cc--nav-fg-prim-color;
border-color: $cc--nav-fg-prim-color;
color: $cc--nav-bg-color;
}
} }
} }