@@ -138,12 +139,12 @@ let PasswordResetForm = React.createClass({
buttons={
-
+
+
}>
diff --git a/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js b/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
index 0fd023c2..c9a928e5 100644
--- a/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
+++ b/js/components/whitelabel/wallet/components/cyland/ascribe_forms/cyland_additional_data_form.js
@@ -84,7 +84,7 @@ let CylandAdditionalDataForm = React.createClass({
buttons = (
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js
index b9bb518a..eac8eda2 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artist_details_form.js
@@ -66,7 +66,7 @@ let IkonotvArtistDetailsForm = React.createClass({
buttons = (
diff --git a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js b/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js
index bab4ceca..289fb606 100644
--- a/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js
+++ b/js/components/whitelabel/wallet/components/ikonotv/ascribe_forms/ikonotv_artwork_details_form.js
@@ -65,7 +65,7 @@ let IkonotvArtworkDetailsForm = React.createClass({
buttons = (
diff --git a/sass/ascribe_custom_style.scss b/sass/ascribe_custom_style.scss
index 0e479b8b..e9f730dd 100644
--- a/sass/ascribe_custom_style.scss
+++ b/sass/ascribe_custom_style.scss
@@ -16,26 +16,31 @@ $ascribe--nav-bg-color: $ascribe-dark-blue;
$ascribe--button-default-color: $ascribe--bg-color;
$ascribe--button-secondary-fg-color: $ascribe--bg-color;
$ascribe--button-secondary-bg-color: white;
-$ascribe--font-weight: 300;
+
$ascribe--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ikono_tv.png';
-$ascribe--font: 'canada-type-gibson';
+
+$ascribe--font: 'canada-type-gibson', sans-serif !important;
+$ascribe--font-weight: 300 !important;
html,
body {
- //font-family: 'Helvetica Neue', 'Helvetica', sans-serif;
- font-family: 'canada-type-gibson', sans-serif !important;
- font-weight: $ascribe--font-weight !important;
+ font-family: $ascribe--font;
+ font-weight: $ascribe--font-weight;
background-color: #fcfcfc !important;
}
h1, h3 {
- font-family: 'canada-type-gibson', sans-serif !important;
- font-weight: $ascribe--font-weight !important;
+ font-family: $ascribe--font;
+ font-weight: $ascribe--font-weight;
}
h1 {
font-size: 30px;
}
+hr {
+ border-top: 1px solid $ascribe-blue-border;
+}
+
.nav .open > a,
.nav .open > a:hover,
.nav .open > a:focus {
@@ -219,17 +224,15 @@ h1 {
.route--login,
.route--signup {
- .ascribe-btn-login {
+ .btn-wide {
display: block;
margin: 50px auto 0;
width: auto;
padding: 10px 30px;
text-transform: uppercase;
- font-weight: bold;
- width: 180px;
}
- .ascribe-btn-login-spinner {
+ .btn-spinner {
background-color: $ascribe--button-default-color;
}
@@ -384,7 +387,21 @@ fieldset[disabled] .btn-default.active {
}
}
-.ascribe-btn-login,
+.btn-wide {
+ font-weight: $ascribe--font-weight;
+}
+
+.btn-spinner, .btn-spinner:hover {
+ background-color: $ascribe--button-default-color;
+ border-color: $ascribe--button-default-color;
+ [class^="spinner-wrapper-"] {
+ color: white;
+ .spinner-circle {
+ border-color: white;
+ }
+ }
+}
+
.btn-default {
background-color: $ascribe--button-default-color;
border-color: $ascribe--button-default-color;
@@ -398,8 +415,8 @@ fieldset[disabled] .btn-default.active {
&.active:hover,
&.active:focus,
&.active.focus {
- background-color: darken($ascribe--button-default-color, 20%);
- border-color: darken($ascribe--button-default-color, 20%);
+ background-color: lighten($ascribe--button-default-color, 20%);
+ border-color: lighten($ascribe--button-default-color, 20%);
}
}
@@ -504,11 +521,6 @@ fieldset[disabled] .btn-secondary.active {
font-style: normal;
}
- //input::-webkit-input-placeholder { color:transparent }
- //input::-moz-placeholder { color:transparent; } /* firefox 19+ */
- //input:-ms-input-placeholder { color:transparent; } /* ie */
- //input:-moz-placeholder { color:transparent; }
-
}
.ascribe-property-collapsible-toggle [type=checkbox]:checked + .checkbox:before,
@@ -516,6 +528,14 @@ fieldset[disabled] .btn-secondary.active {
color: $ascribe--button-default-color;
}
+.ascribe-form-header {
+ background-color: transparent;
+ border-color: transparent;
+}
+
+.ascribe-form-bordered {
+ border-color: transparent;
+}
// properties!
.is-focused {
@@ -523,14 +543,78 @@ fieldset[disabled] .btn-secondary.active {
background-color: rgba($ascribe--button-default-color, .05);
}
.ascribe-property-wrapper:hover {
- border-left-color: rgba($ascribe--button-default-color, .5);
+ //border-left-color: rgba($ascribe--button-default-color, .5);
+ border-left-color: rgba($ascribe-blue, .5);
}
.ascribe-accordion-list-item .wrapper:hover {
background-color: rgba($ascribe--button-default-color, .05);
}
+.ascribe-property {
+ > div,
+ > input,
+ > pre,
+ > select,
+ > span:not(.glyphicon),
+ > textarea {
+ font-family: $ascribe--font;
+ font-weight: $ascribe--font-weight;
+ }
+ > div {
+ > div:not(.file-drag-and-drop div) {
+ font-family: $ascribe--font;
+ font-weight: $ascribe--font-weight;
+ }
+ }
+ > span:not(.glyphicon) {
+ color: $ascribe-pink;
+ //font-weight: normal !important;
+ }
+ textarea::-webkit-input-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+ textarea::-moz-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+ /* firefox 19+ */
+ textarea:-ms-input-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+ /* ie */
+ textarea:-moz-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+
+ input::-webkit-input-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+ input::-moz-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+ /* firefox 19+ */
+ input:-ms-input-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+ /* ie */
+ input:-moz-placeholder {
+ color: rgba($ascribe-dark-blue, 0.5);
+ font-style: normal;
+ }
+}
+
+// panel
+.ascribe-panel-wrapper {
+ border: 1px solid $ascribe-blue-border;
+}
// intercom stuff
#intercom-container .intercom-launcher-button {
background-color: $ascribe--button-default-color !important;
diff --git a/sass/ascribe_login.scss b/sass/ascribe_login.scss
index ca067242..28100efa 100644
--- a/sass/ascribe_login.scss
+++ b/sass/ascribe_login.scss
@@ -1,28 +1,18 @@
$break-small: 764px;
-.ascribe-btn-login {
+.btn-wide {
background-color: rgba(2, 182, 163, 1);
- border: none;
- border-radius: 0;
color: white;
font-size: 1.2em;
- font-weight: 500;
padding: .5em;
text-align: center;
width: 100%;
//margin-left: 1.2em;
- &:hover {
- opacity: .3;
- border: 0;
- color: white;
- }
-
&:active,
&:focus {
background-color: rgba(2, 182, 163, .6);
- border: 0;
color: white;
}
@@ -31,7 +21,7 @@ $break-small: 764px;
}
}
-.ascribe-btn-login-spinner {
+.btn-spinner {
background-color: rgba(2, 182, 163, .4);
padding: .4em;
diff --git a/sass/main.scss b/sass/main.scss
index 11015e41..d03eb7be 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -172,51 +172,6 @@ hr {
border: 1px solid $ascribe-brand-danger;
}
}
-.btn-ascribe {
- border: 1px solid #444;
- border-radius: 0 !important;
- font-family: sans-serif !important;
- line-height: 2em;
- margin-left: 0 !important;
- font-family: sans-serif !important;
- border-radius: 0 !important;
- color: #222 !important;
-}
-
-.btn-ascribe:active, .btn-ascribe:hover {
- color: #FFF !important;
- background-color: #444;
-}
-
-.btn-ascribe-sm {
- font-size: 12px;
- line-height: 1.3em;
-}
-
-.btn-ascribe-green,
-.btn-ascribe-green-inv {
- border: 1px solid #48dacb;
- border-radius: 0 !important;
- font-family: sans-serif !important;
- line-height: 2em;
- margin-left: 0 !important;
-}
-
-.btn-ascribe-green,
-.btn-ascribe-green-inv:active,
-.btn-ascribe-green-inv:hover {
- background-color: #fff;
- border: 1px solid rgba(2, 182, 163, .5);
- color: rgba(2, 182, 163, 0.5);
-}
-
-.btn-ascribe-green:active,
-.btn-ascribe-green:hover,
-.btn-ascribe-green-inv {
- background-color: rgba(2, 182, 163, .5);
- border: 1px solid rgba(2, 182, 163, .5);
- color: white;
-}
.ascribe-detail-title {
font-size: 2em;
diff --git a/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss b/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss
index 9a873da2..5a587a99 100644
--- a/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss
+++ b/sass/whitelabel/wallet/ikonotv/ikonotv_landing.scss
@@ -105,7 +105,7 @@ $ikono--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ik
.client--ikonotv .route--signup {
background-color: $ikono--landing-bg-color;
- .ascribe-btn-login {
+ .btn-wide {
display: block;
margin: 50px auto 0;
width: auto;
@@ -115,7 +115,7 @@ $ikono--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ik
width: 180px;
}
- .ascribe-btn-login-spinner {
+ .btn-spinner {
background-color: $ikono--button-color;
}
@@ -348,7 +348,7 @@ $ikono--logo: 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/ikonotv/ik
}
}
- .ascribe-btn-login,
+ .btn-wide,
.btn-default {
background-color: $ikono--button-color;
border-color: $ikono--button-color;