diff --git a/js/app.js b/js/app.js index bd9e79be..30a57d2b 100644 --- a/js/app.js +++ b/js/app.js @@ -71,6 +71,9 @@ class AppGateway { type = settings.type; subdomain = settings.subdomain; } + + window.document.body.classList.add('client--' + subdomain); + EventActions.applicationWillBoot(settings); window.appRouter = Router.run(getRoutes(type, subdomain), Router.HistoryLocation, (App) => { React.render( diff --git a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js index 33478fbf..053d21b3 100644 --- a/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js +++ b/js/components/whitelabel/wallet/components/ikonotv/ikonotv_piece_list.js @@ -37,11 +37,17 @@ let IkonotvPieceList = React.createClass({ accordionListItemType={IkonotvAccordionListItem} filterParams={[{ label: getLangText('Show works I have'), - items: [{ - key: 'acl_loaned', - label: getLangText('loaned to IkonoTV') - }] - }]}/> + items: [ + { + key: 'submitted', + label: getLangText('submitted') + }, + { + key: 'accepted', + label: getLangText('loaned') + } + ] + }]}/> ); } diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js index efddadc0..2a235cef 100644 --- a/js/components/whitelabel/wallet/wallet_app.js +++ b/js/components/whitelabel/wallet/wallet_app.js @@ -32,7 +32,7 @@ let WalletApp = React.createClass({ } return ( -
+
{header} diff --git a/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss b/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss index df1cf39c..01b85598 100644 --- a/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss +++ b/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss @@ -1,5 +1,6 @@ -$ikono--bg-color: #0066cc; -$ikono--button-color: #993399; +$ikono--landing-bg-color: #06c; +$ikono--bg-color: #939; +$ikono--button-color: $ikono--bg-color; $ikono--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ikono_tv.png'; @@ -81,27 +82,17 @@ $ikono--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ik } - -.client--ikonotv.route--landing .btn-default, -.client--ikonotv.route--signup .ascribe-btn-login, -.client--ikonotv.route--login .ascribe-btn-login { - background-color: $ikono--button-color; - border: none; -} - - - -.client--ikonotv.route--landing { - background-color: $ikono--bg-color; +.client--ikonotv .route--landing { + background-color: $ikono--landing-bg-color; margin: 0; width: 100%; padding: 5em 1em; } -.client--ikonotv.route--login, -.client--ikonotv.route--signup { - background-color: $ikono--bg-color; +.client--ikonotv .route--login, +.client--ikonotv .route--signup { + background-color: $ikono--landing-bg-color; .ascribe-btn-login { display: block; @@ -298,3 +289,94 @@ $ikono--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ik } } } + +// buttons! +// thought of the day: +// "every great atrocity is the result of people just following orders" +.client--ikonotv { + .ascribe-piece-list-toolbar-filter-widget button { + background-color: transparent; + border: 1px solid transparent; + color: $ikono--button-color; + + &:hover, + &:active { + background-color: $ikono--button-color !important; + border-color: $ikono--button-color !important; + color: white; + } + } + + .ascribe-btn-login, + .btn-default { + background-color: $ikono--button-color; + border-color: $ikono--button-color; + + &:active:hover, + &:active:focus, + &:active.focus, + &.active:hover, + &.active:focus, + &.active.focus { + background-color: darken($ikono--button-color, 20%); + border-color: darken($ikono--button-color, 20%); + } + } + + .open > .btn-default.dropdown-toggle:hover, + .open > .btn-default.dropdown-toggle:focus, + .open > .btn-default.dropdown-toggle.focus { + background-color: darken($ikono--button-color, 20%); + border-color: darken($ikono--button-color, 20%); + } + + .pager li > a, .pager li > span { + background-color: $ikono--button-color; + border-color: $ikono--button-color; + } +} + +// inputs! +.client--ikonotv { + + .ascribe-input-glyph > .form-group > .input-group > .input-group-addon > .filter-glyph { + color: $ikono--button-color; + } + + .ascribe-input-glyph > .form-group > .input-group > .input-group-addon, + .ascribe-input-glyph > .form-group > .input-group input { + border-color: $ikono--button-color; + } + + .ascribe-settings-property-collapsible-toggle [type=checkbox]:checked + .checkbox:before, + .ascribe-checkbox-wrapper [type=checkbox]:checked + .checkbox:before { + color: $ikono--button-color; + } +} + + +// properties! +.client--ikonotv { + .is-focused { + border-left-color: $ikono--button-color !important; + background-color: rgba($ikono--button-color, .05); + } + .ascribe-settings-wrapper:hover { + border-left-color: rgba($ikono--button-color, .5); + } +} + +.client--ikonotv { + .ascribe-accordion-list-item .wrapper:hover { + background-color: rgba($ikono--button-color, .05); + } +} + + +// intercom stuff +.client--ikonotv { + #intercom-container .intercom-launcher-button { + background-color: $ikono--button-color; + border-color: $ikono--button-color; + } +}