From 751f3e35725ad167fbcd509df266f825d879643d Mon Sep 17 00:00:00 2001 From: tim Date: Mon, 7 Nov 2016 14:38:03 +0100 Subject: [PATCH 1/4] Revert "Added default admin bokk email in forms." This reverts commit f190009850ea34a8a8f748ddc9564e131dd4bff4. --- js/components/ascribe_forms/form_consign.js | 1 - js/components/ascribe_forms/form_loan.js | 1 - js/components/ascribe_forms/form_share_email.js | 1 - js/components/ascribe_forms/form_transfer.js | 1 - 4 files changed, 4 deletions(-) diff --git a/js/components/ascribe_forms/form_consign.js b/js/components/ascribe_forms/form_consign.js index fa79bd1e..346d45c0 100644 --- a/js/components/ascribe_forms/form_consign.js +++ b/js/components/ascribe_forms/form_consign.js @@ -105,7 +105,6 @@ let ConsignForm = React.createClass({ type="email" value={email} placeholder={getLangText('Email of the consignee')} - value="admin@bokk.io" required/> Date: Mon, 7 Nov 2016 09:38:49 +0100 Subject: [PATCH 2/4] Added default email(admin) in forms. --- js/constants/languages.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/constants/languages.js b/js/constants/languages.js index 090ec3ce..5212bbf0 100644 --- a/js/constants/languages.js +++ b/js/constants/languages.js @@ -228,7 +228,8 @@ const languages = { 'Submitted to prize': 'Submitted to prize', 'Welcome to ascribe': 'Welcome to ascribe', 'CREATE EDITIONS': 'CREATE EDITIONS', - 'Remove Piece': 'Remove Piece' + 'Remove Piece': 'Remove Piece', + 'Admin email': 'admin@bokk.io' }, 'de': { 'ID': 'ID', @@ -457,7 +458,8 @@ const languages = { 'Submitted to prize': 'Submitted to prize', 'Welcome to ascribe': 'Welcome to ascribe', 'CREATE EDITIONS': 'CREATE EDITIONS', - 'Remove Piece': 'Remove Piece' + 'Remove Piece': 'Remove Piece', + 'Admin email': 'admin@bokk.io' }, 'fr': { 'ID': 'ID', @@ -686,7 +688,8 @@ const languages = { 'Submitted to prize': 'Submitted to prize', 'Welcome to ascribe': 'Welcome to ascribe', 'CREATE EDITIONS': 'CREATE EDITIONS', - 'Remove Piece': 'Remove Piece' + 'Remove Piece': 'Remove Piece', + 'Admin email': 'admin@bokk.io' } }; From 9b62751e084a86c1e96762a03f16fb5c37bb746a Mon Sep 17 00:00:00 2001 From: Oscar Rezo Date: Mon, 7 Nov 2016 11:53:31 +0100 Subject: [PATCH 3/4] Added new scss for book custom styles. --- sass/bokk_custom_styles.scss | 222 +++++++++++++++++++++++++++++++++++ sass/main.scss | 2 + 2 files changed, 224 insertions(+) create mode 100644 sass/bokk_custom_styles.scss diff --git a/sass/bokk_custom_styles.scss b/sass/bokk_custom_styles.scss new file mode 100644 index 00000000..cc6842ca --- /dev/null +++ b/sass/bokk_custom_styles.scss @@ -0,0 +1,222 @@ +$bokk--nav-bg-color: #4d2e80; +$bokk--nav-fg-prim-color: #1E1E1E; +$bokk--button-color: #ab52bd; +$bokk--hover-color: ; + +.client--bokk { + .navbar-default { + background-color: $bokk--nav-bg-color; + box-shadow: none; + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + } + a { + color: $bokk--nav-bg-color; + } + .navbar-nav > li > a, + .navbar-nav > li > .active a { + color: $bokk--nav-fg-prim-color; + background-color: $bokk--nav-bg-color; + } + .navbar-nav > li > a:hover { + color: lighten($bokk--nav-fg-prim-color, 40%); + } + .navbar-nav > .active a, + .navbar-nav > .active a:hover, + .navbar-nav > .active a:focus { + color: $bokk--nav-fg-prim-color; + border-bottom-color: $bokk--nav-fg-prim-color; + background-color: $bokk--nav-bg-color; + } + .dropdown-menu > li > a:hover, + .dropdown-menu > li > a:focus { + color: lighten($bokk--nav-fg-prim-color, 40%); + background-color: $bokk--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($bokk--nav-fg-prim-color, 40%); + background-color: $bokk--nav-bg-color; + } + .dropdown-menu { + background-color: $bokk--nav-bg-color; + } + + .dropdown-menu > li > a { + color: $bokk--nav-fg-prim-color; + } + + .navbar-toggle .icon-bar { + background-color: $bokk--nav-fg-prim-color; + } + + .navbar-toggle:hover, + .navbar-toggle:focus { + background-color: $bokk--nav-bg-color; + } +} + +.client--bokk .icon-ascribe-search { + color: $bokk--button-color; +} + +// disabled buttons +.client--bokk { + // disabled buttons + .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: $bokk--nav-bg-color; + color: $bokk--nav-fg-prim-color; + } +} + +.client--bokk { + .btn-secondary { + background-color: $bokk--nav-bg-color; + border-color: $bokk--nav-fg-prim-color; + color: $bokk--nav-fg-prim-color; + + &:hover, + &:active, + &:focus, + &:active:hover, + &:active:focus, + &:active.focus, + &.active:hover, + &.active:focus, + &.active.focus { + background-color: $bokk--nav-fg-prim-color; + border-color: $bokk--nav-fg-prim-color; + color: $bokk--nav-bg-color; + } + } +} + +// buttons! +// thought of the day: +// "every great atrocity is the result of people just following orders" +.client--bokk { + .ascribe-piece-list-toolbar-widget button { + color: $bokk--button-color !important; + background-color: transparent !important; + border-color: transparent !important; + + &:hover, + &:active { + background-color: $bokk--button-color !important; + border-color: $bokk--button-color !important; + color: white !important; + } + } + + .btn-wide, + .btn-default { + background-color: $bokk--button-color; + border-color: $bokk--button-color; + + &:hover, + &:active, + &:focus, + &:active:hover, + &:active:focus, + &:active.focus, + &.active:hover, + &.active:focus, + &.active.focus { + background-color: lighten($bokk--button-color, 20%); + border-color: lighten($bokk--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($bokk--button-color, 20%); + border-color: darken($bokk--button-color, 20%); + } + + .pager li > a, + .pager li > span { + background-color: $bokk--button-color; + border-color: $bokk--button-color; + } + + .pager li.disabled > a, + .pager li.disabled > span { + background-color: $bokk--button-color !important; + border-color: $bokk--button-color; + } +} + +// spinner! +.client--bokk { + .btn-spinner { + color: $bokk--button-color; + } + .spinner-circle { + border-color: $bokk--button-color; + } + .spinner-inner { + color: $bokk--button-color; + display: none; + } +} + +// intercom stuff +.client--bokk { + #intercom-container .intercom-launcher-button { + background-color: $bokk--button-color !important;; + border-color: $bokk--button-color !important;; + } +} + +// notifications +.client--bokk .ascribe-global-notification-success { + background-color: lighten($bokk--button-color, 50%); +} + +// progress bar +.client--bokk .ascribe-progress-bar > .progress-bar { + background-color: $bokk--button-color; +} + +.client--bokk .acl-information-dropdown-list .title { + color: $bokk--button-color; +} + +.client--bokk .action-file.icon-ascribe-ok, +.client--bokk .action-file.icon-ascribe-ok:hover { + color: $bokk--button-color; +} + +.client--bokk .ascribe-progress-bar span { + text-shadow: -1px 0 $bokk--button-color, + 0 1px $bokk--button-color, + 1px 0 $bokk--button-color, + 0 -1px $bokk--button-color; +} + +.client--bokk .upload-button-wrapper > span { + color: $bokk--button-color; +} diff --git a/sass/main.scss b/sass/main.scss index 9ca2a07a..2e1859f7 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -46,6 +46,8 @@ $BASE_URL: '<%= BASE_URL %>'; @import 'ascribe_print'; +@import 'bokk_custom_styles'; + html, body { From 4b8992ea4e2df7577091cf335321dfcfee5a3028 Mon Sep 17 00:00:00 2001 From: Oscar Rezo Date: Mon, 7 Nov 2016 13:28:52 +0100 Subject: [PATCH 4/4] Modified Loan button text. --- js/constants/acl_information_text.js | 4 ++-- js/constants/languages.js | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/js/constants/acl_information_text.js b/js/constants/acl_information_text.js index 6a04d360..35fbd72f 100644 --- a/js/constants/acl_information_text.js +++ b/js/constants/acl_information_text.js @@ -3,8 +3,8 @@ export const AclInformationText = { 'titles': { 'acl_consign': 'CONSIGN', - 'acl_loan': 'LOAN', - 'acl_loan_request': 'LOAN', + 'acl_loan': 'PARTAGER AVEC BOKK', + 'acl_loan_request': 'PARTAGER AVEC BOKK', 'acl_share': 'EMAIL', 'acl_transfer': 'TRANSFER', 'acl_delete': 'DELETE', diff --git a/js/constants/languages.js b/js/constants/languages.js index 5212bbf0..a0a5a0e1 100644 --- a/js/constants/languages.js +++ b/js/constants/languages.js @@ -160,6 +160,7 @@ const languages = { 'Loan start date': 'Loan start date', 'Loan end date': 'Loan end date', 'LOAN': 'LOAN', + 'PARTAGER AVEC BOKK': 'PARTAGER AVEC BOKK', 'I transfer ownership of': 'I transfer ownership of', 'Transferee email': 'Transferee email', 'TRANSFER': 'TRANSFER', @@ -390,6 +391,7 @@ const languages = { 'Loan start date': 'Loan start date', 'Loan end date': 'Loan end date', 'LOAN': 'LOAN', + 'PARTAGER AVEC BOKK': 'PARTAGER AVEC BOKK', 'I transfer ownership of': 'I transfer ownership of', 'Transferee email': 'Transferee email', 'TRANSFER': 'TRANSFER', @@ -620,6 +622,7 @@ const languages = { 'Loan start date': 'Date du commencement du prêt', 'Loan end date': 'Date de la fin de prêt', 'LOAN': 'PRÊT', + 'PARTAGER AVEC BOKK': 'PARTAGER AVEC BOKK', 'I transfer ownership of': 'Je transfère la propriété de', 'Transferee email': 'Courriel du cessionnaire', 'TRANSFER': 'TRANSFÉRER',