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

Use Inter font as the sans font #3683

Merged
merged 11 commits into from
Oct 21, 2022

Conversation

rithviknishad
Copy link
Member

@rithviknishad rithviknishad commented Oct 2, 2022

Proposed Changes

  • Use Inter as sans font as per figma design
  • Fix overweights due to the new font.

Sample screenshots of a few pages:

image

image

image

@coronasafe/care-fe-code-reviewers @coronasafe/code-reviewers

Merge Checklist

  • Add specs that demonstrate bug / test a new feature.
  • Update product documentation.
  • Ensure that UI text is kept in I18n files.
  • Prep screenshot or demo video for changelog entry, and attach it to issue.
  • Request for Peer Reviews
  • Completion of QA

@rithviknishad rithviknishad requested a review from a team October 2, 2022 06:51
@rithviknishad rithviknishad requested a review from a team as a code owner October 2, 2022 06:51
@netlify
Copy link

netlify bot commented Oct 2, 2022

Deploy Preview for care-egov-staging ready!

Name Link
🔨 Latest commit cc6e73e
🔍 Latest deploy log https://app.netlify.com/sites/care-egov-staging/deploys/6345827ec8654c000bd5fe13
😎 Deploy Preview https://deploy-preview-3683--care-egov-staging.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

Copy link
Member

@Ashesh3 Ashesh3 left a comment

Choose a reason for hiding this comment

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

The font looks professional!

@nihal467
Copy link
Member

nihal467 commented Oct 4, 2022

@rithviknishad
image

  • coronasafe network used to be in one line, are now in two lines, is it intentional change

@nihal467
Copy link
Member

nihal467 commented Oct 4, 2022

@aparnacoronasafe can you check the entire platform and let me know your opinion, about the font change

@rithviknishad
Copy link
Member Author

rithviknishad commented Oct 4, 2022

@nihal467 I've fixed the login page title issue.

Copy link
Member

@bodhish bodhish left a comment

Choose a reason for hiding this comment

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

LGTM

tailwind.config.js Outdated Show resolved Hide resolved
src/style/index.css Outdated Show resolved Hide resolved
public/index.html Show resolved Hide resolved
rithviknishad and others added 2 commits October 5, 2022 08:22
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>
@netlify
Copy link

netlify bot commented Oct 5, 2022

Deploy Preview for care-net failed.

Name Link
🔨 Latest commit 6fe38ea
🔍 Latest deploy log https://app.netlify.com/sites/care-net/deploys/633cf17f8cff910008db29cc

@netlify
Copy link

netlify bot commented Oct 5, 2022

Deploy Preview for care-net failed.

Name Link
🔨 Latest commit 2bad276
🔍 Latest deploy log https://app.netlify.com/sites/care-net/deploys/633cf3573405620008daf9e0

@nihal467
Copy link
Member

nihal467 commented Oct 5, 2022

@rithviknishad once the review and work is completed, label it to need testing

@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Oct 6, 2022
@github-actions
Copy link

github-actions bot commented Oct 6, 2022

👋 Hi, @rithviknishad,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Oct 6, 2022
@github-actions github-actions bot added the merge conflict pull requests with merge conflict label Oct 11, 2022
@github-actions
Copy link

👋 Hi, @rithviknishad,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@sonarcloud
Copy link

sonarcloud bot commented Oct 11, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@github-actions github-actions bot removed the merge conflict pull requests with merge conflict label Oct 12, 2022
@nihal467
Copy link
Member

@aparnacoronasafe it looks good to me, can you give it a check

@khavinshankar khavinshankar merged commit a4be59f into coronasafe:develop Oct 21, 2022
khavinshankar added a commit that referenced this pull request Oct 22, 2022
* Create main.yml

* Fix main.yml errors

* Update main.yml

* Update and rename main.yml to merge_upstream.yml

* Update merge_upstream.yml

* Update merge_upstream.yml

* Refactor cypress workflow

- Change to ubuntu-latest
- Switch to npm from yarn
- Give appropriate names for each step in workflow

* Fix patient crud error on Add Patient button

* Remove accidentally added workflow

* Delete stale.yml (#3782)

* feat: added github stale action (#3785)

* Made the teleicuvitalcard responsive (#3669)

* Made TeleViatlsCard responsive

* Minor enhancement

* fix buggy redirect after clicking on cancel button in add more bed types (#3710)

* fix buggy redirect after clicking on cancel button in add more bed types

* fix: deepscan issues

* Update packages and remove obsolete dependencies (#3748)

* Remove nonessential packages

* Update packages having a minor version change

* Add back autoprefixer

* Fix for google maps

* Change error message for offline camera (#3789)

* Minor UI enhacement in Patients page for extreme small devices and some ranges (#3779)

* Use `Inter` font as the sans font (#3683)

* Adds `Inter` as sans font

* fix overweighted font usages

* correct font weights

* correct font weights

* Fix login page title overflow

* Adds fallback to `sans-serif`

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* Update src/style/index.css

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* fix syntax

* fix typo

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* Patient Category Colors (#3728)

* patient category type

* show category in patient list page

* move colors to tailwind config for app wide access

* category on info card

* fix issue with classes skipped from build

* category on patient profile

* patient info card, move category above patient photo

* Revert "patient info card, move category above patient photo"

This reverts commit 9dc5d55.

* Patient Review feature fixes (#3584)

* Add review_interval and review badges

* Change label to Review before

* Update src/Components/Patient/DailyRounds.tsx

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>

* Upgrade cypress to v10.10.0

* Fix Error in facility create with adding doctor

* Fix `parseInt` parameter error in patient crud

* Add emojis

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
Co-authored-by: ARYAN PATEL <patelaryan7751@gmail.com>
Co-authored-by: Pragati Bhattad <55177805+Pragati1610@users.noreply.github.com>
Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>
rithviknishad added a commit to rithviknishad/care_fe that referenced this pull request Oct 22, 2022
* Create main.yml

* Fix main.yml errors

* Update main.yml

* Update and rename main.yml to merge_upstream.yml

* Update merge_upstream.yml

* Update merge_upstream.yml

* Refactor cypress workflow

- Change to ubuntu-latest
- Switch to npm from yarn
- Give appropriate names for each step in workflow

* Fix patient crud error on Add Patient button

* Remove accidentally added workflow

* Delete stale.yml (coronasafe#3782)

* feat: added github stale action (coronasafe#3785)

* Made the teleicuvitalcard responsive (coronasafe#3669)

* Made TeleViatlsCard responsive

* Minor enhancement

* fix buggy redirect after clicking on cancel button in add more bed types (coronasafe#3710)

* fix buggy redirect after clicking on cancel button in add more bed types

* fix: deepscan issues

* Update packages and remove obsolete dependencies (coronasafe#3748)

* Remove nonessential packages

* Update packages having a minor version change

* Add back autoprefixer

* Fix for google maps

* Change error message for offline camera (coronasafe#3789)

* Minor UI enhacement in Patients page for extreme small devices and some ranges (coronasafe#3779)

* Use `Inter` font as the sans font (coronasafe#3683)

* Adds `Inter` as sans font

* fix overweighted font usages

* correct font weights

* correct font weights

* Fix login page title overflow

* Adds fallback to `sans-serif`

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* Update src/style/index.css

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* fix syntax

* fix typo

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* Patient Category Colors (coronasafe#3728)

* patient category type

* show category in patient list page

* move colors to tailwind config for app wide access

* category on info card

* fix issue with classes skipped from build

* category on patient profile

* patient info card, move category above patient photo

* Revert "patient info card, move category above patient photo"

This reverts commit 9dc5d55.

* Patient Review feature fixes (coronasafe#3584)

* Add review_interval and review badges

* Change label to Review before

* Update src/Components/Patient/DailyRounds.tsx

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>

* Upgrade cypress to v10.10.0

* Fix Error in facility create with adding doctor

* Fix `parseInt` parameter error in patient crud

* Add emojis

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
Co-authored-by: ARYAN PATEL <patelaryan7751@gmail.com>
Co-authored-by: Pragati Bhattad <55177805+Pragati1610@users.noreply.github.com>
Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>
khavinshankar added a commit that referenced this pull request Oct 26, 2022
* tailwind colors as per figma

* implement select menu with new interface

* use select menu v2 for ordering

* update tailwind colors as per figma

* facility types

* support option value

* gender

* gender icons

* is antenatal field

* kasp

* category

* disease status

* vaccinated

* declared

* telemedicine

* top buttons

* persistent filter buttons

* update color pallete as per figma

* import form fields from consultation redesign PR

* consume new text input

* remove range

* fix

* `npx init storybook`

* update `@storybook/preset-create-react-app`

* install storybook postcss for tailwind

* fix issues with tailwind and reload

* fix magically value prop gone missing

* `npm install tw-elements`

* Rename new to `SelectMenuV2`

* add tw-elements to package lock file

* implements multi select menu

* last admitted to bed type

* remove unused code

* imporve select menus

* update placeholder colors

* show chips below multi select

* consistent `form-input`, `form-textarea` styling

* wip, to let khavin try

* Revert "add tw-elements to package lock file"

This reverts commit eba6368.

* revert `tw-elements` for datepicker

* add `serve-storybook`

* fix colors as per figma color scheme

* implements basic buttons

* update button styles

* button shape circle as boolean attribute

* update filter buttons

* fix button styling when `circle`

* remove comments

* feat: added custom AutoCompleteAsync component

* Merge `package-lock.json` of `develop` to tailwind/storybook

* `npm install --legacy-peer-deps` post merge `develop` to tailwind/storybook

* storybook: remove default stories

* eslint: ignore '*.stories.mdx' files

* storybook: add-on `storybook-dark-mode`

* button stories

* add DateInputV2 and DateRangeInputV2

* make datepicker css consistent

* fix (AutoCompleteAsync): fixed debounce issue

* ui (AsyncAutoComplete): changed bg color

* refactor out `DropdownMenuTransition` for consistent experience across all dropdown components

* add validators

* fix validator issue

* update field validators

* DateFormField and DateRangeFormField wrappers

* use consistent transition for date picker as used in other components

* fix typo

* fix datepicker focus issue, by wrapping it with Popover

* replace material icons with font awesom

* fix asyncautocomplete field placeholder color

* storybook: fontawesome and inter font scripts

* storybook: DateFormField

* storybook: text area and text form fields

* fix styling issue with phone input

* rename `ButtonStyle` to `ButtonVariant`

* storybook: complete button story

* fix property error missing issue

* storybook: `SelectMenuV2`

* storybook: `MultiSelectMenuV2`

* storybook: move care ui elements to care ui dir

* fix title

* select year in datepicker

* disable increment year btn

* Patient Review feature fixes (#3584)

* Add review_interval and review badges

* Change label to Review before

* Update src/Components/Patient/DailyRounds.tsx

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>

* Keep loading spinner during redirect (#3754)

* Cypress: Fixes & Refactoring (#3798)

* Create main.yml

* Fix main.yml errors

* Update main.yml

* Update and rename main.yml to merge_upstream.yml

* Update merge_upstream.yml

* Update merge_upstream.yml

* Refactor cypress workflow

- Change to ubuntu-latest
- Switch to npm from yarn
- Give appropriate names for each step in workflow

* Fix patient crud error on Add Patient button

* Remove accidentally added workflow

* Delete stale.yml (#3782)

* feat: added github stale action (#3785)

* Made the teleicuvitalcard responsive (#3669)

* Made TeleViatlsCard responsive

* Minor enhancement

* fix buggy redirect after clicking on cancel button in add more bed types (#3710)

* fix buggy redirect after clicking on cancel button in add more bed types

* fix: deepscan issues

* Update packages and remove obsolete dependencies (#3748)

* Remove nonessential packages

* Update packages having a minor version change

* Add back autoprefixer

* Fix for google maps

* Change error message for offline camera (#3789)

* Minor UI enhacement in Patients page for extreme small devices and some ranges (#3779)

* Use `Inter` font as the sans font (#3683)

* Adds `Inter` as sans font

* fix overweighted font usages

* correct font weights

* correct font weights

* Fix login page title overflow

* Adds fallback to `sans-serif`

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* Update src/style/index.css

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* fix syntax

* fix typo

Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* Patient Category Colors (#3728)

* patient category type

* show category in patient list page

* move colors to tailwind config for app wide access

* category on info card

* fix issue with classes skipped from build

* category on patient profile

* patient info card, move category above patient photo

* Revert "patient info card, move category above patient photo"

This reverts commit 9dc5d55.

* Patient Review feature fixes (#3584)

* Add review_interval and review badges

* Change label to Review before

* Update src/Components/Patient/DailyRounds.tsx

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>

* Upgrade cypress to v10.10.0

* Fix Error in facility create with adding doctor

* Fix `parseInt` parameter error in patient crud

* Add emojis

Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
Co-authored-by: ARYAN PATEL <patelaryan7751@gmail.com>
Co-authored-by: Pragati Bhattad <55177805+Pragati1610@users.noreply.github.com>
Co-authored-by: Ashesh <3626859+Ashesh3@users.noreply.github.com>
Co-authored-by: Rithvik Nishad <rithvikn2001@gmail.com>
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>

* `AutoCompleteAsync` fix `multiple` overload type

* fix (AutoCompleteAsync): fixed input issue

Co-authored-by: Ashesh3 <3626859+Ashesh3@users.noreply.github.com>
Co-authored-by: Khavin Shankar <khavinshankar@gmail.com>
Co-authored-by: Ritesh-Aggarwal <riteshaggarwal2001@gmail.com>
Co-authored-by: Mohammed Rabil <63334479+rabilrbl@users.noreply.github.com>
Co-authored-by: ARYAN PATEL <patelaryan7751@gmail.com>
Co-authored-by: Pragati Bhattad <55177805+Pragati1610@users.noreply.github.com>
Co-authored-by: Bodhish Thomas <bodhish@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

6 participants