diff --git a/app/frontend/src/javascript/components/form/form-checklist.tsx b/app/frontend/src/javascript/components/form/form-checklist.tsx index ac457a248..0d8d6e4ee 100644 --- a/app/frontend/src/javascript/components/form/form-checklist.tsx +++ b/app/frontend/src/javascript/components/form/form-checklist.tsx @@ -98,8 +98,8 @@ export const FormChecklist =
- {t('app.shared.form_checklist.select_all')} - {t('app.shared.form_checklist.unselect_all')} + {t('app.shared.form_checklist.select_all')} + {t('app.shared.form_checklist.unselect_all')}
); diff --git a/app/frontend/src/javascript/components/store/filters/categories-filter.tsx b/app/frontend/src/javascript/components/store/filters/categories-filter.tsx index 967ae51c0..d08dcc33d 100644 --- a/app/frontend/src/javascript/components/store/filters/categories-filter.tsx +++ b/app/frontend/src/javascript/components/store/filters/categories-filter.tsx @@ -64,7 +64,7 @@ export const CategoriesFilter: React.FC = ({ productCateg ))} - onApplyFilters(selectedCategories)} className="is-info">{t('app.admin.store.categories_filter.filter_apply')} + onApplyFilters(selectedCategories)} className="is-secondary">{t('app.admin.store.categories_filter.filter_apply')} diff --git a/app/frontend/src/javascript/components/store/filters/keyword-filter.tsx b/app/frontend/src/javascript/components/store/filters/keyword-filter.tsx index 87683933d..be7573213 100644 --- a/app/frontend/src/javascript/components/store/filters/keyword-filter.tsx +++ b/app/frontend/src/javascript/components/store/filters/keyword-filter.tsx @@ -54,7 +54,7 @@ export const KeywordFilter: React.FC = ({ onApplyFilters, cu
handleKeywordTyping(event)} value={keyword} /> - onApplyFilters(keyword || undefined)} className="is-info">{t('app.admin.store.keyword_filter.filter_apply')} + onApplyFilters(keyword || undefined)} className="is-secondary">{t('app.admin.store.keyword_filter.filter_apply')}
diff --git a/app/frontend/src/javascript/components/store/filters/machines-filter.tsx b/app/frontend/src/javascript/components/store/filters/machines-filter.tsx index 75a0afeba..a0537ea48 100644 --- a/app/frontend/src/javascript/components/store/filters/machines-filter.tsx +++ b/app/frontend/src/javascript/components/store/filters/machines-filter.tsx @@ -76,7 +76,7 @@ export const MachinesFilter: React.FC = ({ allMachines, onE ))} - onApplyFilters(selectedMachines)} className="is-info">{t('app.admin.store.machines_filter.filter_apply')} + onApplyFilters(selectedMachines)} className="is-secondary">{t('app.admin.store.machines_filter.filter_apply')} diff --git a/app/frontend/src/javascript/components/store/filters/stock-filter.tsx b/app/frontend/src/javascript/components/store/filters/stock-filter.tsx index db210dd43..a7ec2903e 100644 --- a/app/frontend/src/javascript/components/store/filters/stock-filter.tsx +++ b/app/frontend/src/javascript/components/store/filters/stock-filter.tsx @@ -83,7 +83,7 @@ export const StockFilter: React.FC = ({ onApplyFilters, curren defaultValue={0} type="number" /> - {t('app.admin.store.stock_filter.filter_apply')} + {t('app.admin.store.stock_filter.filter_apply')} diff --git a/app/frontend/src/javascript/components/store/orders.tsx b/app/frontend/src/javascript/components/store/orders.tsx index d836f3cc6..0c1457dde 100644 --- a/app/frontend/src/javascript/components/store/orders.tsx +++ b/app/frontend/src/javascript/components/store/orders.tsx @@ -274,7 +274,7 @@ const Orders: React.FC = ({ currentUser, onError }) => {
handleReferenceChanged(event.target.value)}/> - {t('app.admin.store.orders.filter_apply')} + {t('app.admin.store.orders.filter_apply')}
@@ -292,7 +292,7 @@ const Orders: React.FC = ({ currentUser, onError }) => { ))} - {t('app.admin.store.orders.filter_apply')} + {t('app.admin.store.orders.filter_apply')} = ({ currentUser, onError }) => {
- {t('app.admin.store.orders.filter_apply')} + {t('app.admin.store.orders.filter_apply')}
@@ -328,7 +328,7 @@ const Orders: React.FC = ({ currentUser, onError }) => { defaultValue={periodTo} type="date" /> - {t('app.admin.store.orders.filter_apply')} + {t('app.admin.store.orders.filter_apply')} diff --git a/app/frontend/src/javascript/components/store/product-form.tsx b/app/frontend/src/javascript/components/store/product-form.tsx index 5ce179770..e6d52cac4 100644 --- a/app/frontend/src/javascript/components/store/product-form.tsx +++ b/app/frontend/src/javascript/components/store/product-form.tsx @@ -349,7 +349,7 @@ export const ProductForm: React.FC = ({ product, title, onSucc }> {t('app.admin.store.product_form.add_product_image')} @@ -422,7 +422,7 @@ export const ProductForm: React.FC = ({ product, title, onSucc }> {t('app.admin.store.product_form.add_product_file')} diff --git a/app/frontend/src/stylesheets/modules/base/fab-button.scss b/app/frontend/src/stylesheets/modules/base/fab-button.scss index 4f825d1eb..1f5cbea32 100644 --- a/app/frontend/src/stylesheets/modules/base/fab-button.scss +++ b/app/frontend/src/stylesheets/modules/base/fab-button.scss @@ -66,6 +66,9 @@ &.is-info { @include colorVariant(var(--information), var(--gray-soft-lightest)); } + &.is-secondary { + @include colorVariant(var(--secondary), var(--gray-hard-darkest)); + } &.is-black { @include colorVariant(var(--gray-hard-darkest), var(--gray-soft-lightest)); } diff --git a/app/frontend/src/stylesheets/modules/cart/store-cart.scss b/app/frontend/src/stylesheets/modules/cart/store-cart.scss index d4c96bd55..f53369009 100644 --- a/app/frontend/src/stylesheets/modules/cart/store-cart.scss +++ b/app/frontend/src/stylesheets/modules/cart/store-cart.scss @@ -200,7 +200,7 @@ align-items: center; span { @include title-base; } } - .gift { color: var(--information); } + .gift { color: var(--gray-hard-dark); } } .total { display: flex; @@ -214,7 +214,7 @@ width: 100%; height: auto; padding: 1.6rem 0.8rem; - background-color: var(--information); + background-color: var(--main); border: none; color: var(--gray-soft-lightest); justify-content: center; diff --git a/app/frontend/src/stylesheets/modules/store/orders.scss b/app/frontend/src/stylesheets/modules/store/orders.scss index 37d9de724..f95edc7c3 100644 --- a/app/frontend/src/stylesheets/modules/store/orders.scss +++ b/app/frontend/src/stylesheets/modules/store/orders.scss @@ -125,7 +125,7 @@ align-items: center; span { @include title-base; } } - .gift { color: var(--information); } + .gift { color: var(--gray-hard-dark); } .total { padding: 1.6rem 0 0; align-items: flex-start; diff --git a/app/frontend/src/stylesheets/modules/store/product-categories.scss b/app/frontend/src/stylesheets/modules/store/product-categories.scss index c451b6181..698e17c8e 100644 --- a/app/frontend/src/stylesheets/modules/store/product-categories.scss +++ b/app/frontend/src/stylesheets/modules/store/product-categories.scss @@ -58,7 +58,7 @@ margin-left: 2.4rem; @include text-sm; font-weight: 500; - color: var(--information); + color: var(--gray-hard-dark); } } diff --git a/app/frontend/src/stylesheets/modules/store/store-filters.scss b/app/frontend/src/stylesheets/modules/store/store-filters.scss index 8f56d48b6..94d68ce07 100644 --- a/app/frontend/src/stylesheets/modules/store/store-filters.scss +++ b/app/frontend/src/stylesheets/modules/store/store-filters.scss @@ -47,7 +47,7 @@ span { margin-left: 0.8rem; @include text-xs; - color: var(--information); + color: var(--gray-hard-dark); } } .parent { @@ -58,7 +58,7 @@ } &.is-active > p { @include text-base(600); - color: var(--information); + color: var(--primary); .children { max-height: 1000px; } diff --git a/app/frontend/src/stylesheets/modules/store/store-list.scss b/app/frontend/src/stylesheets/modules/store/store-list.scss index 6c9003d89..c4177d458 100644 --- a/app/frontend/src/stylesheets/modules/store/store-list.scss +++ b/app/frontend/src/stylesheets/modules/store/store-list.scss @@ -12,9 +12,9 @@ padding-left: 1.6rem; display: flex; align-items: center; - background-color: var(--information-light); + background-color: var(--secondary-light); border-radius: 100px; - color: var(--information-dark); + color: var(--gray-hard-dark); overflow: hidden; p { margin: 0; } button { diff --git a/app/frontend/src/stylesheets/modules/store/store.scss b/app/frontend/src/stylesheets/modules/store/store.scss index a2d60e9d9..7db3049ab 100644 --- a/app/frontend/src/stylesheets/modules/store/store.scss +++ b/app/frontend/src/stylesheets/modules/store/store.scss @@ -21,7 +21,7 @@ color: var(--gray-hard-darkest); } li:last-of-type:not(:first-of-type) span { - color: var(--information); + color: var(--gray-hard-dark); } span { color: var(--gray-hard-light); @@ -137,12 +137,12 @@ content: ''; width: 100%; height: 1px; - background-color: var(--information); + background-color: var(--gray-hard-dark); z-index: -1; } span { padding: 0 1.6rem; - color: var(--information); + color: var(--gray-hard-dark); background-color: var(--gray-soft-lightest); } }