diff --git a/js/components/whitelabel/wallet/components/cyland/cyland_hero.js b/js/components/whitelabel/wallet/components/cyland/cyland_hero.js index b98f407e..c1f6c494 100644 --- a/js/components/whitelabel/wallet/components/cyland/cyland_hero.js +++ b/js/components/whitelabel/wallet/components/cyland/cyland_hero.js @@ -10,7 +10,7 @@ let Hero = React.createClass({
Sluice Art Prize
); diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js index bbc58689..b99cd9f8 100644 --- a/js/components/whitelabel/wallet/wallet_app.js +++ b/js/components/whitelabel/wallet/wallet_app.js @@ -26,7 +26,7 @@ let WalletApp = React.createClass({ let header = null; if ((this.isActive('landing') || this.isActive('login') || this.isActive('signup') || this.isActive('contract_notifications')) - && (['ikonotv', 'cyland']).indexOf(subdomain) > -1) { + && (['ikonotv']).indexOf(subdomain) > -1) { header = (
); } else { diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss index 2d799397..b521858d 100644 --- a/sass/ascribe_custom_style.scss +++ b/sass/ascribe_custom_style.scss @@ -213,10 +213,6 @@ hr { } .route--landing { - animation: color-loop 20s; - -moz-animation: color-loop 20s infinite; - -webkit-animation: color-loop 20s infinite; - margin: 0; width: 100%; padding: 5em 1em; @@ -226,85 +222,9 @@ hr { .route--login, .route--signup { - .btn-wide { - display: block; - margin: 50px auto 0; - width: auto; - padding: 10px 30px; - text-transform: uppercase; - } - .btn-spinner { background-color: $ascribe--button-default-color; } - - .ascribe-form-header { - background-image: url($ascribe--logo); - background-color: transparent; - background-position: center 0; - background-repeat: no-repeat; - background-size: 300px; - margin-bottom: 0; - height: 150px; - position: relative; - - h3 { - position: absolute; - bottom: 0; - left: 0; - right: 0; - color: white; - text-align: center; - font-size: 22px; - text-indent: -99999px; - font-size: 0; - } - } - - .ascribe-property-wrapper { - background-color: transparent; - - &:hover { - border-left: 3px solid transparent; - } - - &.is-focused { - border-left: 3px solid transparent !important; - } - } - - .ascribe-property { - border: none; - } - - .ascribe-property > span { - color: white; - } - - .ascribe-property > input { - padding: 10px; - background-color: #fff; - margin-top: .1em; - - &:focus { - background-color: #ffff00; - } - } - - .checkbox, - .checkbox a { - color: white !important; - } - - .ascribe-login-text { - color: white; - text-align: center; - - a { - color: white; - text-decoration: underline; - } - } } .ascribe-accordion-list-item-table { diff --git a/sass/whitelabel/wallet/cc/cc_custom_style.scss b/sass/whitelabel/wallet/cc/cc_custom_style.scss new file mode 100644 index 00000000..35f38145 --- /dev/null +++ b/sass/whitelabel/wallet/cc/cc_custom_style.scss @@ -0,0 +1,172 @@ +$cc--nav-bg-color: #fcfcfc; +$cc--nav-fg-prim-color: #1E1E1E; +$cc--button-color: $cc--nav-fg-prim-color; + +.client--cc { + .navbar-default { + background-color: $cc--nav-bg-color; + box-shadow: none; + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + } + .navbar-nav > li > a, + .navbar-nav > li > .active a { + color: $cc--nav-fg-prim-color; + background-color: $cc--nav-bg-color; + } + .navbar-nav > li > a:hover { + color: lighten($cc--nav-fg-prim-color, 40%); + } + .navbar-nav > .active a, + .navbar-nav > .active a:hover, + .navbar-nav > .active a:focus { + color: $cc--nav-fg-prim-color; + border-bottom-color: $cc--nav-fg-prim-color; + background-color: $cc--nav-bg-color; + } + .dropdown-menu > li > a:hover, + .dropdown-menu > li > a:focus { + color: lighten($cc--nav-fg-prim-color, 40%); + background-color: $cc--nav-bg-color; + } + .navbar-nav > .open > a, + .navbar-nav > .open > a:hover, + .navbar-nav > .open > a:focus, + .dropdown-menu > .active > a, + .dropdown-menu > .active > a:hover, + .dropdown-menu > .active > a:focus { + color: lighten($cc--nav-fg-prim-color, 40%); + background-color: $cc--nav-bg-color; + } + .dropdown-menu { + background-color: $cc--nav-bg-color; + } + + .dropdown-menu > li > a { + color: $cc--nav-fg-prim-color; + } + + .navbar-toggle .icon-bar { + background-color: $cc--nav-fg-prim-color; + } + + .navbar-toggle:hover, + .navbar-toggle:focus { + background-color: $cc--nav-bg-color; + } +} + +.client--cc .ascribe-footer { + display: none; +} + + +.client--cc .icon-ascribe-search{ + color: $cc--button-color; +} + +.client--cc .ascribe-piece-list-toolbar .btn-ascribe-add{ + display: none; +} + +// disabled buttons +.client--cc { + .btn-default.disabled, + .btn-default.disabled:hover, + .btn-default.disabled:focus, + .btn-default.disabled.focus, + .btn-default.disabled:active, + .btn-default.disabled.active, + .btn-default[disabled], + .btn-default[disabled]:hover, + .btn-default[disabled]:focus, + .btn-default[disabled].focus, + .btn-default[disabled]:active, + .btn-default[disabled].active, + fieldset[disabled] .btn-default, + fieldset[disabled] .btn-default:hover, + fieldset[disabled] .btn-default:focus, + fieldset[disabled] .btn-default.focus, + fieldset[disabled] .btn-default:active, + fieldset[disabled] .btn-default.active { + background-color: darken($cc--button-color, 20%); + border-color: darken($cc--button-color, 20%); + } +} + +// buttons! +// thought of the day: +// "every great atrocity is the result of people just following orders" +.client--cc { + .ascribe-piece-list-toolbar-filter-widget button { + color: $cc--button-color !important; + background-color: transparent !important; + border-color: transparent !important; + + &:hover, + &:active { + background-color: $cc--button-color !important; + border-color: $cc--button-color !important; + color: white !important; + } + } + + .btn-wide, + .btn-default { + background-color: $cc--button-color; + border-color: $cc--button-color; + + &:active:hover, + &:active:focus, + &:active.focus, + &.active:hover, + &.active:focus, + &.active.focus { + background-color: darken($cc--button-color, 20%); + border-color: darken($cc--button-color, 20%); + } + } + + .open > .btn-default.dropdown-toggle:hover, + .open > .btn-default.dropdown-toggle:focus, + .open > .btn-default.dropdown-toggle.focus, + .open > .btn-default.dropdown-toggle.dropdown-toggle { + background-color: darken($cc--button-color, 20%); + border-color: darken($cc--button-color, 20%); + } + + .pager li > a, .pager li > span { + background-color: $cc--button-color; + border-color: $cc--button-color; + } +} + +// spinner! +.client--cc { + .btn-spinner { + color: $cc--button-color; + } + .spinner-circle { + border-color: $cc--button-color; + } + .spinner-inner { + color: $cc--button-color; + } +} + +// intercom stuff +.client--cc { + #intercom-container .intercom-launcher-button { + background-color: $cc--button-color !important;; + border-color: $cc--button-color !important;; + } +} + +// notifications +.client--cc .ascribe-global-notification-success { + background-color: lighten($cc--button-color, 50%); +} + +// progress bar +.client--cc .ascribe-progress-bar > .progress-bar { + background-color: $cc--button-color; +} diff --git a/sass/whitelabel/wallet/cyland/cyland_custom_style.scss b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss new file mode 100644 index 00000000..70d8ea3d --- /dev/null +++ b/sass/whitelabel/wallet/cyland/cyland_custom_style.scss @@ -0,0 +1,172 @@ +$cyland--nav-bg-color: #fcfcfc; +$cyland--nav-fg-prim-color: #1E1E1E; +$cyland--button-color: $cyland--nav-fg-prim-color; + +.client--cyland { + .navbar-default { + background-color: $cyland--nav-bg-color; + box-shadow: none; + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + } + .navbar-nav > li > a, + .navbar-nav > li > .active a { + color: $cyland--nav-fg-prim-color; + background-color: $cyland--nav-bg-color; + } + .navbar-nav > li > a:hover { + color: lighten($cyland--nav-fg-prim-color, 40%); + } + .navbar-nav > .active a, + .navbar-nav > .active a:hover, + .navbar-nav > .active a:focus { + color: $cyland--nav-fg-prim-color; + border-bottom-color: $cyland--nav-fg-prim-color; + background-color: $cyland--nav-bg-color; + } + .dropdown-menu > li > a:hover, + .dropdown-menu > li > a:focus { + color: lighten($cyland--nav-fg-prim-color, 40%); + background-color: $cyland--nav-bg-color; + } + .navbar-nav > .open > a, + .navbar-nav > .open > a:hover, + .navbar-nav > .open > a:focus, + .dropdown-menu > .active > a, + .dropdown-menu > .active > a:hover, + .dropdown-menu > .active > a:focus { + color: lighten($cyland--nav-fg-prim-color, 40%); + background-color: $cyland--nav-bg-color; + } + .dropdown-menu { + background-color: $cyland--nav-bg-color; + } + + .dropdown-menu > li > a { + color: $cyland--nav-fg-prim-color; + } + + .navbar-toggle .icon-bar { + background-color: $cyland--nav-fg-prim-color; + } + + .navbar-toggle:hover, + .navbar-toggle:focus { + background-color: $cyland--nav-bg-color; + } +} + +.client--cyland .ascribe-footer { + display: none; +} + + +.client--cyland .icon-ascribe-search{ + color: $cyland--button-color; +} + +.client--cyland .ascribe-piece-list-toolbar .btn-ascribe-add{ + display: none; +} + +// disabled buttons +.client--cyland { + .btn-default.disabled, + .btn-default.disabled:hover, + .btn-default.disabled:focus, + .btn-default.disabled.focus, + .btn-default.disabled:active, + .btn-default.disabled.active, + .btn-default[disabled], + .btn-default[disabled]:hover, + .btn-default[disabled]:focus, + .btn-default[disabled].focus, + .btn-default[disabled]:active, + .btn-default[disabled].active, + fieldset[disabled] .btn-default, + fieldset[disabled] .btn-default:hover, + fieldset[disabled] .btn-default:focus, + fieldset[disabled] .btn-default.focus, + fieldset[disabled] .btn-default:active, + fieldset[disabled] .btn-default.active { + background-color: darken($cyland--button-color, 20%); + border-color: darken($cyland--button-color, 20%); + } +} + +// buttons! +// thought of the day: +// "every great atrocity is the result of people just following orders" +.client--cyland { + .ascribe-piece-list-toolbar-filter-widget button { + color: $cyland--button-color !important; + background-color: transparent !important; + border-color: transparent !important; + + &:hover, + &:active { + background-color: $cyland--button-color !important; + border-color: $cyland--button-color !important; + color: white !important; + } + } + + .btn-wide, + .btn-default { + background-color: $cyland--button-color; + border-color: $cyland--button-color; + + &:active:hover, + &:active:focus, + &:active.focus, + &.active:hover, + &.active:focus, + &.active.focus { + background-color: darken($cyland--button-color, 20%); + border-color: darken($cyland--button-color, 20%); + } + } + + .open > .btn-default.dropdown-toggle:hover, + .open > .btn-default.dropdown-toggle:focus, + .open > .btn-default.dropdown-toggle.focus, + .open > .btn-default.dropdown-toggle.dropdown-toggle { + background-color: darken($cyland--button-color, 20%); + border-color: darken($cyland--button-color, 20%); + } + + .pager li > a, .pager li > span { + background-color: $cyland--button-color; + border-color: $cyland--button-color; + } +} + +// spinner! +.client--cyland { + .btn-spinner { + color: $cyland--button-color; + } + .spinner-circle { + border-color: $cyland--button-color; + } + .spinner-inner { + color: $cyland--button-color; + } +} + +// intercom stuff +.client--cyland { + #intercom-container .intercom-launcher-button { + background-color: $cyland--button-color !important;; + border-color: $cyland--button-color !important;; + } +} + +// notifications +.client--cyland .ascribe-global-notification-success { + background-color: lighten($cyland--button-color, 50%); +} + +// progress bar +.client--cyland .ascribe-progress-bar > .progress-bar { + background-color: $cyland--button-color; +} diff --git a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss index fa3a1063..ea159acf 100644 --- a/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss +++ b/sass/whitelabel/wallet/ikonotv/ikonotv_custom_style.scss @@ -161,7 +161,6 @@ $ikono--font: 'Helvetica Neue', 'Helvetica', sans-serif !important; text-align: center; font-size: 22px; text-indent: -99999px; - font-size: 0; } } diff --git a/sass/whitelabel/wallet/index.scss b/sass/whitelabel/wallet/index.scss index fbabfb29..024fb3cc 100644 --- a/sass/whitelabel/wallet/index.scss +++ b/sass/whitelabel/wallet/index.scss @@ -1,3 +1,5 @@ +@import 'cc/cc_custom_style'; +@import 'cyland/cyland_custom_style'; @import 'ikonotv/ikonotv_custom_style'; .ascribe-wallet-app {