Skip to content

Commit

Permalink
Merge pull request #54 from symptomatic/v0.4.1-hotpatch
Browse files Browse the repository at this point in the history
v0.4.1-hotpatch
  • Loading branch information
awatson1978 authored Apr 22, 2020
2 parents c0c194e + dc38b39 commit dbe664c
Show file tree
Hide file tree
Showing 14 changed files with 232 additions and 59 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ jobs:

# Install the actual app...
- run: meteor npm install
# - run: meteor npm install [email protected] [email protected]
- run: meteor npm install [email protected] [email protected]
- run: meteor npm install [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]

#- before/after
- run: cat .meteor/packages
Expand Down
2 changes: 1 addition & 1 deletion app/layout/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function Footer(props) {
easing: props.theme.transitions.easing.sharp,
duration: props.theme.transitions.duration.leavingScreen
}),
filter: "grayscale(100%)"
filter: "grayscale(" + get(Meteor, 'settings.public.theme.grayscaleFilter', "0%") + ")"
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/layout/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function Header(props) {
easing: props.theme.transitions.easing.sharp,
duration: props.theme.transitions.duration.leavingScreen
}),
filter: "grayscale(100%)"
filter: "grayscale(" + get(Meteor, 'settings.public.theme.grayscaleFilter', "0%") + ")"
},
title: {
flexGrow: 1,
Expand Down
6 changes: 3 additions & 3 deletions configs/settings.nodeonfhir.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"errorColor": "rgb(128,20,60) !important",
"errorText": "#ffffff !important",

"appBarColor": "#669f64 !important",
"appBarColor": "repeating-linear-gradient( 135deg, rgba(0, 0, 0, 0.45), rgba(0, 0, 0, 0.45) 5px, rgba(0, 0, 0, 0.5) 10px, rgba(0, 0, 0, 0.5) 10px ), url(http://s3-us-west-2.amazonaws.com/s.cdpn.io/3/[email protected])",
"appBarTextColor": "#ffffff !important",

"paperColor": "#ffffff !important",
"paperTextColor": "rgba(0, 0, 0, 1) !important",

"backgroundCanvas": "#f5f5f5",
"backgroundCanvas": "#e6e6e6",
"background": "linear-gradient(45deg, rgb(108, 183, 110) 30%, rgb(150, 202, 144) 90%)",

"nivoTheme": "red_grey"
Expand All @@ -42,8 +42,8 @@
"projectPage": {
"carouselImages": [
"https://raw.githubusercontent.com/symptomatic/node-on-fhir/development/docs/assets/ScreenShot-BulkDataQuery.png",
"https://raw.githubusercontent.com/symptomatic/node-on-fhir/development/docs/assets/Screenshot-PatientChart.png",
"https://raw.githubusercontent.com/symptomatic/node-on-fhir/development/docs/assets/ScreenShot-ChicagoHospital-HeatMap.png",
"https://raw.githubusercontent.com/symptomatic/node-on-fhir/development/docs/assets/Screenshot-PatientChart.png",
"https://raw.githubusercontent.com/symptomatic/node-on-fhir/development/docs/assets/ScreenShot-ExportDataModule.png",
"https://raw.githubusercontent.com/symptomatic/node-on-fhir/development/docs/assets/ScreenShot-Geomapping.png"
]
Expand Down
4 changes: 0 additions & 4 deletions configs/settings.nodeonfhir.localhost.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
"prominantHeader": false,
"useDateRangeInQueries": false,
"showPatientNameInHeader": false,
"landingModal": {
"open": false,
"title": "Welcome to Pediatric Gastroenterology Chart"
},
"displayNavbars": true,
"disableHeader": false,
"disableFooter": false,
Expand Down
Binary file removed docs/assets/StackShare.png
Binary file not shown.
25 changes: 14 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,9 @@
"chai": "4.2.0",
"chai-nightwatch": "0.4.0",
"conventional-changelog-cli": "^2.0.11",
"chromedriver": "80.0.2",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^11.1.0",
"eslint-import-resolver-meteor": "^0.3.3",
"eslint-plugin-import": "^1.15.0",
"eslint-plugin-jsx-a11y": "^2.2.2",
"eslint-plugin-meteor": "^4.0.0",
"eslint-plugin-react": "^6.2.2",
"lighthouse": "5.6.0",
"nightwatch": "1.3.4",



"selenium-webdriver": "3.6.0",
"shelljs": "^0.7.4"
},
Expand Down Expand Up @@ -114,6 +107,16 @@
"electron": "6.1.7",
"electron-builder": "21.2.0",
"meteor-desktop": "2.2.5",
"bcrypt": "3.0.6"
"bcrypt": "3.0.6",
"chromedriver": "80.0.2",
"nightwatch": "1.3.4",
"eslint": "6.8.0",
"eslint-config-airbnb": "^11.1.0",
"eslint-import-resolver-meteor": "^0.3.3",
"eslint-plugin-import": "^1.15.0",
"eslint-plugin-jsx-a11y": "^2.2.2",
"eslint-plugin-meteor": "^4.0.0",
"eslint-plugin-react": "^6.2.2",
"lighthouse": "5.6.0"
}
}
2 changes: 1 addition & 1 deletion packages/covid19-geomapping
Submodule covid19-geomapping updated from 360794 to ca4fe7
2 changes: 1 addition & 1 deletion packages/covid19-on-fhir
Submodule covid19-on-fhir updated from 0a8b7a to 6a589b
2 changes: 1 addition & 1 deletion packages/covid19-reporting
Submodule covid19-reporting updated from ef0e65 to 8064dc
1 change: 1 addition & 0 deletions packages/csv
Submodule csv added at 37424d
2 changes: 1 addition & 1 deletion packages/data-management
Submodule data-management updated from a3fca5 to 7f4213
Loading

0 comments on commit dbe664c

Please sign in to comment.