diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js index c9791dbe..68a23fa7 100644 --- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js +++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_filter_widget.js @@ -87,7 +87,7 @@ let PieceListToolbarFilterWidget = React.createClass({ id="ascribe-piece-list-toolbar-filter-widget-dropdown" pullRight={true} title={filterIcon} - className="ascribe-piece-list-toolbar-filter-widget"> + className="ascribe-piece-list-toolbar-widget"> {/* We iterate over filterParams, to receive the label and then for each label also iterate over its items, to get all filterable options */} {this.props.filterParams.map(({ label, items }, i) => { @@ -121,7 +121,7 @@ let PieceListToolbarFilterWidget = React.createClass({
  • + className="ascribe-piece-list-toolbar-widget-item">
    {getLangText(itemLabel)} diff --git a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js index da9bae43..d689c7fe 100644 --- a/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js +++ b/js/components/ascribe_piece_list_toolbar/piece_list_toolbar_order_widget.js @@ -57,7 +57,7 @@ let PieceListToolbarOrderWidget = React.createClass({
  • {getLangText('Sort by')}: @@ -67,7 +67,7 @@ let PieceListToolbarOrderWidget = React.createClass({
  • + className="ascribe-piece-list-toolbar-widget-item">
    {getLangText(param.replace('_', ' '))} diff --git a/js/components/piece_list.js b/js/components/piece_list.js index 431422d8..3513d325 100644 --- a/js/components/piece_list.js +++ b/js/components/piece_list.js @@ -306,12 +306,7 @@ let PieceList = React.createClass({ orderBy={this.state.orderBy} applyFilterBy={this.applyFilterBy} applyOrderBy={this.applyOrderBy}> - {customSubmitButton ? - customSubmitButton : - - } + {customSubmitButton} span { - position: absolute; - left: 0; - top: 2px; - width: 30px; - height: 30px; - color: $ascribe-dark-blue; - padding: 0.4em; - &:hover { - color: white; - } - } -} // buttons! // thought of the day: // "every great atrocity is the result of people just following orders" @@ -374,19 +344,6 @@ fieldset[disabled] .btn-secondary.active { } } -.ascribe-piece-list-toolbar-filter-widget button { - background-color: transparent; - border: 1px solid transparent; - color: $ascribe--button-default-color; - - &:hover, - &:active { - background-color: $ascribe--button-default-color !important; - border-color: $ascribe--button-default-color !important; - color: white; - } -} - .btn-wide { font-weight: $ascribe--font-weight-light; } diff --git a/sass/ascribe_piece_list_toolbar.scss b/sass/ascribe_piece_list_toolbar.scss index 06cbd1a7..a83447fb 100644 --- a/sass/ascribe_piece_list_toolbar.scss +++ b/sass/ascribe_piece_list_toolbar.scss @@ -1,4 +1,3 @@ - .ascribe-piece-list-toolbar { padding-left: 15px; padding-right: 15px; @@ -30,17 +29,17 @@ } } -.ascribe-piece-list-toolbar-filter-widget { - +.ascribe-piece-list-toolbar-widget { button { - background-color: rgba(0, 0, 0, 0); - border: 1px solid rgba(0, 0, 0, 0); - color: #02b6a3; + background-color: transparent; + border: 1px solid transparent; + color: $ascribe--button-default-color; padding: 6px 4px 6px 8px; &:hover, &:active { - background-color: #02b6a3 !important; + background-color: $ascribe--button-default-color !important; + border-color: $ascribe--button-default-color !important; color: white; } .caret { @@ -48,7 +47,7 @@ } } - .filter-widget-item { + .ascribe-piece-list-toolbar-widget-item { a { padding-left: 0; padding-right: 0; diff --git a/sass/whitelabel/prize/sluice/sluice_custom_style.scss b/sass/whitelabel/prize/sluice/sluice_custom_style.scss index bcc4978c..7165e64e 100644 --- a/sass/whitelabel/prize/sluice/sluice_custom_style.scss +++ b/sass/whitelabel/prize/sluice/sluice_custom_style.scss @@ -60,10 +60,6 @@ color: $simple-prize--button-color; } -.client--sluice .ascribe-piece-list-toolbar .btn-ascribe-add{ - display: none; -} - // disabled buttons .client--sluice { .btn-default.disabled, diff --git a/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss b/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss index 4b6ff089..d9060fa4 100644 --- a/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss +++ b/sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss @@ -248,10 +248,6 @@ $vivi23--highlight-color: #2882fa; } /** Other components **/ - .ascribe-piece-list-toolbar .btn-ascribe-add { - display: none; - } - .ascribe-accordion-list-table-toggle:hover { color: $vivi23--fg-color; } diff --git a/sass/whitelabel/wallet/cc/cc_custom_style.scss b/sass/whitelabel/wallet/cc/cc_custom_style.scss index 348fca1f..21c66449 100644 --- a/sass/whitelabel/wallet/cc/cc_custom_style.scss +++ b/sass/whitelabel/wallet/cc/cc_custom_style.scss @@ -59,10 +59,6 @@ $cc--button-color: $cc--nav-fg-prim-color; color: $cc--button-color; } -.client--cc .ascribe-piece-list-toolbar .btn-ascribe-add { - display: none; -} - // disabled buttons .client--cc { // disabled buttons diff --git a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss index 0a7226ac..b5cc5c4f 100644 --- a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss +++ b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss @@ -60,10 +60,6 @@ $cyland--button-sec-color: #515151; color: $cyland--button-color; } -.client--cyland .ascribe-piece-list-toolbar .btn-ascribe-add { - display: none; -} - // buttons! // thought of the day: // "every great atrocity is the result of people just following orders" diff --git a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss index 1d7a4461..3b2f0c96 100644 --- a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss +++ b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss @@ -225,10 +225,6 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important; color: $ikono--button-color; } -.client--ikonotv .ascribe-piece-list-toolbar .btn-ascribe-add { - display: none; -} - // spinner! .client--ikonotv {