search

kevinsullivan / moralpain_dev

VSCode + Docker container development environment for moral distress project
0 stars 9 forks source link

Thermometer text formatting update #84

Closed arh4uwe closed 2 years ago

arh4uwe commented 2 years ago

I changed the size of the thermometer label text from 16pt 20pt. I also made the thermometer label text bold. In addition, I changed the color of the thermometer number text to white. Originally, it was only white on Android, and it was black in the web browsers.

kevinsullivan commented 2 years ago

Yay, Amanda. Good job.

On Thu, Jun 9, 2022 at 4:58 PM arh4uwe @.***> wrote:

I changed the size of the thermometer label text from 16pt 20pt. I also made the thermometer label text bold. In addition, I changed the color of the thermometer number text to white. Originally, it was only white on Android, and it was black in the web browsers.

You can view, comment on, or merge this pull request online at:

https://github.com/kevinsullivan/moralpain_dev/pull/84 Commit Summary

File Changes

(26 files https://github.com/kevinsullivan/moralpain_dev/pull/84/files)

Patch Links:

— Reply to this email directly, view it on GitHub https://github.com/kevinsullivan/moralpain_dev/pull/84, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAVEX5JIYZRCMWAIKPPAKIDVOJLGJANCNFSM5YLL4COA . You are receiving this because you are subscribed to this thread.Message ID: @.***>

arh4uwe commented 2 years ago

I can't create a new pull request since there is already an active pull request between the main branch of my fork and the main branch of the original repo. So, accepting this pull request will also incorporate the change in the Dockerfile into the original repo.

Changes: The Dockerfile now installs git-lfs. This allows for every file on GitHub to be downloaded into the container when git checkout is performed. Before, only some files would be downloaded, which meant the program couldn't be run or tested since crucial files were missing.

Remaining issues: Most of the branches are not appearing when git branch --list is performed. The only two that are appearing are 1) the main branch, and 2) docker-malformed, a branch I created locally while troubleshooting the container issues and then pushed to GitHub. In other words, the only branch originally from GitHub that I can checkout to is main.

kevinsullivan commented 2 years ago

Needs review by Nick.

nicholasphair commented 2 years ago

Hi @arh4uwe,

We should merge this soon but we'll need to narrow the changes down. The PR is for updating the text size and color, so we should make sure only the file changes that do that are in this requrest. From what I can see, that means the only changes we want in the PR are in moraldistress/lib/thermometer/view/themometer_slider.dart and moraldistress/lib/thermometer/view/thermometer_view.dart.

Can you open up a new PR with only those changes? I would just fetch Kevin's main branch, branch off of that, add your changes, commit, and submit a new request.

arh4uwe commented 2 years ago

I tried fetching Professor Sullivan's main branch, but it didn't get rid of all of the other additions I've added. Even if I did another pull request from the branch I've just created, it would still contain all of my updates to the Dockerfile, the infrastructure site, the unit tests, the OpenAPI template, etc.