raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,566 Commits 20 Branches 451 Tags
d85ea628e2dedd034d65f921354805597f2dfc70
Commit Graph

27566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
d85ea628e2 Change default font colour to near-black 
It looks like this is the main font colour in the new designs.
 2023-06-13 11:45:39 +10:00
David Cook
821446e150 Style pagination links 
And provide a basic hover state for most other buttons.
The pagination button hover and active states will need updating.

The darker background colour sometimes wraps a whole table (eg products table).
 2023-06-13 11:45:39 +10:00
David Cook
744f95809a Remove uppercase styling of form elements 2023-06-13 11:45:39 +10:00
David Cook
fb17a679c0 First pass at new table colours 
There is more to do, for example the dropshadows.

I've continued with the unopinionated colour naming (eg color-7), but would like to consider giving them more meaningfule names..
 2023-06-13 11:45:39 +10:00
David Cook
2ae91bdbe2 Use variable for font size reset 
The current value is 13px already, but I'd like to experiment changing this.

I'm not sure if we even need the reset, but am not delving into that right now.
 2023-06-13 11:44:48 +10:00
David Cook
3967f54533 Use different variables and table styles for admin_v3 2023-06-13 11:44:48 +10:00
Konrad
6bd66585a9 Merge pull request #10935 from openfoodfoundation/dependabot/bundler/i18n-1.14.1 
chore(deps): bump i18n from 1.13.0 to 1.14.1
 2023-06-12 17:39:42 +02:00
Konrad
11f84b5276 Merge pull request #10934 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.123.1 
chore(deps): bump aws-sdk-s3 from 1.122.0 to 1.123.1
 2023-06-12 17:24:20 +02:00
Filipe
23239bad8b Merge pull request #10970 from openfoodfoundation/dependabot/bundler/knapsack_pro-5.1.0 
chore(deps-dev): bump knapsack_pro from 4.1.0 to 5.1.0
 2023-06-12 16:19:32 +01:00
Konrad
a207a445b1 Merge pull request #10907 from jibees/3041-missing-translation-in-product-variant-selection-upon-order-creation 
Admin, Create an order, Select a product: translate some messages in the product selection search box
 2023-06-12 17:08:52 +02:00
dependabot[bot]
15e9c4eb37 chore(deps): bump i18n from 1.13.0 to 1.14.1 
Bumps [i18n](https://github.com/ruby-i18n/i18n) from 1.13.0 to 1.14.1.
- [Release notes](https://github.com/ruby-i18n/i18n/releases)
- [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-i18n/i18n/compare/v1.13.0...v1.14.1)

---
updated-dependencies:
- dependency-name: i18n
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 14:44:01 +00:00
Konrad
3e3ae5d8ae Merge pull request #10929 from openfoodfoundation/dependabot/bundler/ddtrace-1.12.0 
chore(deps): bump ddtrace from 1.11.1 to 1.12.0
 2023-06-12 16:43:01 +02:00
Konrad
48c107bde1 Merge pull request #10974 from cillian/ignore-whitespace-in-product-import 
Ignore leading and trailing whitespace when importing products via a spreadsheet
 2023-06-12 16:32:15 +02:00
Konrad
80dd8755b0 Merge pull request #10915 from mkllnk/mini-racer 
Remove unused mini_racer gem
 2023-06-12 16:05:52 +02:00
Konrad
791518988d Merge pull request #10918 from openfoodfoundation/dependabot/bundler/view_component-3.1.0 
chore(deps): bump view_component from 3.0.0 to 3.1.0
 2023-06-12 15:36:21 +02:00
Jean-Baptiste Bellet
149ec5511c Translate select2 messages 2023-06-12 15:11:23 +02:00
dependabot[bot]
351343fb6c chore(deps): bump aws-sdk-s3 from 1.122.0 to 1.123.1 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.122.0 to 1.123.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 15:06:04 +02:00
dependabot[bot]
6145413b1a chore(deps): bump ddtrace from 1.11.1 to 1.12.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 1.11.1 to 1.12.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v1.11.1...v1.12.0)

---
updated-dependencies:
- dependency-name: ddtrace
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 15:05:11 +02:00
dependabot[bot]
d87e40bb69 chore(deps): bump view_component from 3.0.0 to 3.1.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v3.0.0...v3.1.0)

---
updated-dependencies:
- dependency-name: view_component
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 15:04:17 +02:00
Maikel Linke
d6859e0bf7 Remove unused mini_racer gem 
All asset compilation is done with webpacker at the moment.
 2023-06-12 15:01:11 +02:00
Konrad
1f2f5e2eec Merge pull request #10892 from openfoodfoundation/dependabot/bundler/rails-7.0.5 
chore(deps): bump rails from 7.0.4.3 to 7.0.5
 2023-06-12 14:58:07 +02:00
jibees
b53aba3844 Merge pull request #10986 from openfoodfoundation/dependabot/bundler/capybara-3.39.2 
chore(deps-dev): bump capybara from 3.39.1 to 3.39.2
 2023-06-12 14:42:48 +02:00
jibees
45dcdf1611 Merge pull request #10985 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.0.1 
chore(deps-dev): bump jasmine-core from 5.0.0 to 5.0.1
 2023-06-12 14:31:03 +02:00
jibees
8c971f2efa Merge pull request #10984 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.3.0 
chore(deps): bump @floating-ui/dom from 1.2.9 to 1.3.0
 2023-06-12 14:29:56 +02:00
dependabot[bot]
8a8200a039 chore(deps-dev): bump capybara from 3.39.1 to 3.39.2 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.39.1 to 3.39.2.
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.39.1...3.39.2)

---
updated-dependencies:
- dependency-name: capybara
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 09:58:05 +00:00
dependabot[bot]
8a376e782a chore(deps-dev): bump jasmine-core from 5.0.0 to 5.0.1 
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/jasmine/jasmine/releases)
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md)
- [Commits](https://github.com/jasmine/jasmine/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: jasmine-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 09:57:39 +00:00
dependabot[bot]
6ab1bfb2ab chore(deps): bump @floating-ui/dom from 1.2.9 to 1.3.0 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.2.9 to 1.3.0.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.3.0/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 09:57:18 +00:00
Sigmund Petersen
c2305615a6 Merge pull request #10971 from filipefurtad0/mouse_hover_spec 
Adds spec for tooltips on orders page
 2023-06-12 09:53:16 +02:00
Gaetan Craig-Riou
41b3ddae08 Merge pull request #10714 from macanudo527/fix_linelength 
Fix Style/LineLength
 2023-06-12 09:53:23 +10:00
Konrad
fc09f95fa1 Merge pull request #10961 from jibees/10946-white-label-trix-editor-changes-on-the-custom-tab-content-do-not-trigger-the-update-button 
[WhiteLabel] Make update button active when changing custom tab content
 2023-06-09 21:46:02 +02:00
Konrad
13037d2d9d Merge pull request #10949 from jibees/10630-buu-as-an-enterprise-user-i-can-see-the-back-office-with-new-brand-colours 
[`admin_style_v3`] As an enterprise user i can see the back office with new brand colours
 2023-06-09 21:24:01 +02:00
Konrad
9125c730ed Merge pull request #10960 from jibees/customize-trix-editor-to-have-the-right-colors 
[White Label] Customize colors of custom content editor to have beautiful toolbar
 2023-06-09 20:35:36 +02:00
Matt-Yorkley
70170078d1 Merge pull request #10976 from Matt-Yorkley/payment-localized-number 
Require localized_number in Payment class
 2023-06-09 18:45:13 +01:00
Konrad
bd505bbee7 Merge pull request #10959 from jibees/10945-white-label-narrow-screen-width-no-marging-on-custom-tab-content 
[WhiteLabel] Add some margin to custom tab content for a shop
 2023-06-09 19:45:04 +02:00
Matt-Yorkley
24200de8dd Require localized_number in Payment class 
There seems to be some contexts (jobs for subscriptions) where the Payment class loads but LocalizedNumber is an undefined constant. It lives in the /lib directory so it's not auto-loaded.
 2023-06-09 18:16:37 +01:00
Konrad
d0f4c44add Merge pull request #10938 from jibees/10931-white-label-custom-tab-without-a-title-impossible-to-disable-the-custom-tab 
[White Label] Validate the presence of a custom tab title before creating it (+ max 20 characters length)
 2023-06-09 19:01:13 +02:00
Cillian O'Ruanaidh
5cde4de512 Ignore leading and trailing whitespace in spreadsheet when importing products 2023-06-09 16:23:18 +01:00
Konrad
502b5e8664 Merge pull request #10937 from jibees/10900-white-label-remove-ofn-navigation-for-small-width-screens 
[White Label] Remove ofn navigation for small width screens as well when option is activated
 2023-06-09 16:28:22 +02:00
Konrad
35fef9e7ac Merge pull request #10876 from dacook/prettier-css-admin 
Prettier css admin
 2023-06-09 16:02:11 +02:00
filipefurtad0
24913476ac Adds spec for tooltips on orders page 2023-06-09 11:23:42 +01:00
dependabot[bot]
515a9a9b1c chore(deps-dev): bump knapsack_pro from 4.1.0 to 5.1.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 4.1.0 to 5.1.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v4.1.0...v5.1.0)

---
updated-dependencies:
- dependency-name: knapsack_pro
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-09 10:02:21 +00:00
Neal Chambers
a65b43d32f Update .rubocop_todo.yml 2023-06-09 16:39:29 +09:00
Neal Chambers
9a8551e3ea Shorten Where Statement 2023-06-09 16:39:29 +09:00
Neal Chambers
a35a07b441 Rewrite sum to be more Readable 2023-06-09 16:39:29 +09:00
Neal Chambers
449430cabc Indent code to be more Readable 2023-06-09 16:39:29 +09:00
Neal Chambers
252697b782 Rewrite If and Unless Statements to be more Readable 2023-06-09 16:39:26 +09:00
Jean-Baptiste Bellet
74fd1814e4 Create a trixeditor controller and broadcast a change event on form 
Therefore, AngularJS can set form as dirty

+ add associated spec
 2023-06-09 08:03:17 +02:00
Jean-Baptiste Bellet
5d43285834 Update all locales with the latest Transifex translations 2023-06-08 17:36:04 +02:00
Filipe
ca03e1596b Merge pull request #10952 from Matt-Yorkley/full-name 
Improve nil-safety in variant naming methods
 2023-06-08 16:26:28 +01:00
Filipe
c12415a340 Merge pull request #10955 from Matt-Yorkley/bulk-invoice-bug 
Ensure directory exists before saving invoices pdf
 2023-06-08 15:22:27 +01:00