Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix words written twice #595

Merged
merged 2 commits into from
May 22, 2024
Merged

fix words written twice #595

merged 2 commits into from
May 22, 2024

Conversation

lalarus
Copy link
Contributor

@lalarus lalarus commented May 22, 2024

Noticed that the word redovisar is written twice in the comment section of Addlife and Bravida Holding.
Removed the duplicate.

Copy link

vercel bot commented May 22, 2024

@lalarus is attempting to deploy a commit to the Klimatbyrån Team on Vercel.

A member of the Team first needs to authorize it.

@Greenheart
Copy link
Contributor

Good catch, and big thanks for the PR! 🌟

This data is generated from another source, and to make sure this update also remains in the future, we need to make the changes in the original source.

Here's how we can move forward:

You can leave this PR open, and I will get the updated spreadsheet, generate the updated company-data.json, and push another commit to this branch (and PR).

Then we can merge this change, and you will get a contribution (since you noticed and fixed it), while we make sure it remains fixed in the future too.

Copy link

vercel bot commented May 22, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
klimatkollen ✅ Ready (Inspect) Visit Preview May 22, 2024 3:01pm

Copy link
Contributor

@Greenheart Greenheart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works well - thanks for the fix! :)

@Greenheart Greenheart merged commit 96c8a5a into Klimatbyran:staging May 22, 2024
1 check passed
Greenheart added a commit that referenced this pull request May 29, 2024
* updated test of smhi data focusing on the right columns being in the datafile (#580)

* add all numeric columns to historical emissions (#573)

* delete old data output files and remove consumption data to excel (#575)

* Feat/make emission calculations tests non-dependent on last year with SMHI data (#586)

* update last year w smhi data and cement deduction values for 2022

* update smhi test files

* make tests work regardless of last year with smhi data

* change from year 2022 to 2021 (to be introduced in later pr)

* add 2022 to smhi test

* Feature/improved table ux (#567)

* Allow closing the main menu by pressing the Escape key

* Replace devices.mobile (which used max-width) with other breakpoints.

This makes sure all breakpoints are consistent and all media queries should be written with a mobile-first approach.

* Ensure hamburger menu has consistent size and positioning for all screen sizes

* Change breakpoint size to standard value, since it was only used in one place

* Ensure consistent height for the Header. Also improve vertical alignment for logo. Also make desktop navigation appear already for smaller laptop screens, to make give a better UX.

* Improve spacing for the RegionalView

* WIP: Make the CompanyView use the page scroll

* Fix CompanyView table header positioning

* Use full page scroll for RegionalView table

* Update copy to match new version

* Alternative 1 for CompanyView table

* Alternative 2 for CompanyView table

* Add sticky footer for RegionalView too

* Fix map height for RegionalView

* Remove unused calc()

* Attempt to simplify CSS calculations to hopefully fix iOS positioning problems

* Simplify copy to save space

* WIP: experiment with IntersectionObserver to work around position sticky not working for `thead` elements in Safari

* Override tough-cookie dependency to remove Node.js deprecation warning in Node >= 21

* Mock IntersectionObserver to fix tests for CompanyView and RegionalView

* Try if inset-block-start works better for sticky thead

* FINALLY! Fixex position sticky in Safari 17. This already worked in older versions of Safari and all other browsers, but for some reason Safari 17 seems to have a buggy implementation.

* Cleanup WIP code and comments

* Cleanup tests and import

* Add webkit prefix for increased backwards compatibility

* Fixes #463 (#579)

* removed the unneeded Borna font assets(#463)

* Keep Borna font files used for the site, and remove other files

* Remove unintended changes

---------

Co-authored-by: Narges <nasadnajafi@righthub.com>
Co-authored-by: Samuel Plumppu <6125097+Greenheart@users.noreply.github.com>

* fix words written twice (#595)

* fix words written twice

* Update source data file too

---------

Co-authored-by: Samuel Plumppu <6125097+Greenheart@users.noreply.github.com>

* show map view first (#597)

* Social links update (#578)

* Social links update

Added links with corresponding icons to Klimatkollen's profile on Facebook and Instagram.

* Discord logo

 Fixed dimensions

* Update FooterSocialLinks.tsx

* Added only Instagram icon and link

* Update company data (#601)

* Add an issue template for better issues. (#598)

Add an issue template for better issues.

* Fix test after changing the default view for RegionalView (#602)

* Fix: #528 Make map legend floating and add background color.  (#532)

* experiment with map labels

* feat: floating titlecontainer with background

* fix: hide map pegend when in list view

* chore: formatting

* Update styles

* Allow scrolling even when the MapLabels are on top to improve navigation on mobile

This sometimes makes the map labels show beneath, but overall this is an UX improvement for mobile users which makes it worth it.

---------

Co-authored-by: Samuel Plumppu <6125097+Greenheart@users.noreply.github.com>

* reverse climate data to earlier version (#604)

* Increase table footer font size on larger screens (#605)

* Render ToggleButton with styled-components-wrapper to fix tests (#606)

---------

Co-authored-by: Mathias Bergqvist <mthbqv@gmail.com>
Co-authored-by: Elvira <elvbom@users.noreply.github.com>
Co-authored-by: N-Asadnajafi <51734450+N-Asadnajafi@users.noreply.github.com>
Co-authored-by: Narges <nasadnajafi@righthub.com>
Co-authored-by: Larissa Lang <126619240+lalarus@users.noreply.github.com>
Co-authored-by: Lasse2500 <70321631+Lasse2500@users.noreply.github.com>
Co-authored-by: Ludvig Janiuk <ludvig.janiuk@gmail.com>
Co-authored-by: SimonAM <simonarnemattsson@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants