diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..f5257e801c --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,6 @@ +The OpenELIS Global software is an open enterprise-level laboratory information +system built on open source web-based technologies that has been tailored for +low-and-middle income country public health laboratories. As you can guess, this +is not a one man role, but rather of a team of dedicated people around the world +just like you. To be part of this team, here are the guidelines. +https://openelis-global.org/community/get-involved/ diff --git a/frontend/src/components/Style.css b/frontend/src/components/Style.css index 7e113f90bd..9b1282c0b6 100644 --- a/frontend/src/components/Style.css +++ b/frontend/src/components/Style.css @@ -17,20 +17,16 @@ .banner p { margin: 0; - /* padding: 5px 0; */ font-size: 12px; } -.userDetails { +.userDetails, +li.userDetails { padding: 5%; display: flex; align-items: center; } -li.userDetails { - cursor: default; -} - li.clickableUserDetails { cursor: pointer; } @@ -44,12 +40,14 @@ li.clickableUserDetails:hover { margin-right: 1%; } -.pageContent { +.pageContent, +.resultPageContent { margin-left: 2%; margin-right: 5%; } -.inputText { +.inputText, +.inputSelect { --cds-text-primary: black; width: 100%; --cds-text-secondary: black; @@ -57,13 +55,14 @@ li.clickableUserDetails:hover { .inputSearch { --cds-text-primary: black; - /*width: 100%;*/ width: 50%; --cds-text-secondary: black; --cds-icon-primary: black; } -.rules { +.rules, +.services, +.results { display: flex; justify-content: space-between; } @@ -102,45 +101,19 @@ button { border: 1px solid red; } -.services { - display: flex; - justify-content: space-between; -} - -.ruleBody { - border: 0.5px solid #295785; - border-radius: 5px; - margin: 2%; - padding: 0.5%; -} - -.gridBoundary { - border: 0.5px solid #295785; - border-radius: 5px; - padding: 1%; - box-shadow: 4px 2px 4px #d3d3d3; - margin-bottom: 1%; -} - -.columnBoundary { +.ruleBody, +.gridBoundary, +.columnBoundary, +.section { border: 0.5px solid #295785; border-radius: 5px; margin: 2%; padding: 1%; - width: 120%; } .inlineDiv { display: flex; - margin-top: 2%; - margin-bottom: 3%; - margin-left: 1%; -} -.section { - border: 0.5px solid green; - border-radius: 3px; - margin: 0.5%; - padding: 1%; + margin: 2% 1% 3% 1%; } .errorMessage { @@ -173,26 +146,22 @@ button { .middleAlignHorizontal { display: flex; - /* align-items: center; */ justify-content: center; } + .middleAlignVertical { height: 100%; display: flex; align-items: center; - /* justify-content: center; */ } + .bottomAlign { height: 100%; display: flex; align-items: flex-end; - /* justify-content: center; */ } .formInlineDiv { - /* display: flex; - flex-wrap: nowrap; - width: 100%; */ display: grid; grid-template-columns: 1fr 1fr; grid-column-gap: 2%; @@ -202,25 +171,13 @@ button { background-color: #bfc2bc; } -.resultPageContent { - margin-left: 1%; - margin-right: 0%; -} - -.searchLabNumber { - margin-left: 0%; - margin-right: 0%; - width: 50%; -} - +.searchLabNumber, .sampleInfo { - /* margin-left: 0%; */ - margin-left: 0%; - margin-right: 0%; + margin: 0; + width: 50%; } .referralRow { - /* margin-right: 50%; */ margin-left: 5%; width: 100%; } @@ -229,141 +186,20 @@ button { margin-right: 20px; } -/* .resultValue { - - margin-left: 5%; - width: 100%; -} - -.currentResultValue { - - margin-left: 5%; - width: 100%; -} */ - -.referralReason { - margin-left: 25%; - margin-right: 5%; - width: 100%; -} +.referralReason, .institute { - margin-left: 5%; - margin-right: 5%; + margin: 0 5%; width: 100%; } -/* Results */ -.inputText { - --cds-text-primary: black; - width: 100%; - --cds-text-secondary: black; - /* margin-top: 0.1%; */ -} - -.inputText2 { - --cds-text-primary: black; - width: 380px; - --cds-text-secondary: black; - padding-left: 1%; - /* margin-top: 0.1%; */ -} - -.inputSelect { - --cds-text-primary: black; - width: 100%; - --cds-text-secondary: black; -} - -.inputSelect2 { - --cds-text-primary: black; - width: 380px; - --cds-text-secondary: black; -} - -.results { - display: flex; - justify-content: space-between; -} - -.first-division { - display: flex; - flex-direction: column; - margin: 0 5px 0.5rem 0; - width: 100%; -} - -.second-division { - padding-top: 5%; -} - -button { - background: none; - outline: none; - cursor: pointer; - font-weight: 500; - border-radius: 2px; - padding: 5px 10px; -} - -.add_button { - align-self: flex-start; - display: flex; - align-items: center; - margin-top: 0.5rem; - color: rgb(0, 208, 255); - border: 1px solid rgb(0, 208, 255); -} - -.remove-btn { - color: red; - border: 1px solid red; -} - -.services { - display: flex; - justify-content: space-between; -} - -.resultBody { - border: 0.5px solid #295785; - border-radius: 5px; - margin: 2%; - padding: 0.5%; -} - -.inlineDiv { - display: flex; - margin-top: 2%; - margin-bottom: 3%; - margin-left: 1%; -} - -.section { - border: 0.5px solid green; - border-radius: 3px; - margin: 0.5%; - padding: 1%; -} - -.errorMessage { - font-size: 12px; - color: red; - width: 150px; - margin-top: 0.25rem; -} - -.errorMessage::before { - content: " "; - font-size: 10px; -} - .requiredFieldIndicator { color: red; } + .toastDisplay { - position: fixed; /*or fixed*/ + position: fixed; top: 47px; - right: 0px; + right: 0; z-index: 10; } @@ -385,12 +221,6 @@ button { font-size: 12px; color: red; margin-bottom: 0.25rem; - /* width: 150px; */ - /* - &:before { - content: " "; - font-size: 10px; - } */ } .second-row { @@ -401,9 +231,8 @@ button { .first-row { max-width: 500px; } -.searchResultsBtn { - margin: 10px !important; -} + +.searchResultsBtn, .advancedSearchResultsBtn { margin: 10px !important; } @@ -466,15 +295,10 @@ button { color 110ms, background-color 110ms, outline 110ms; - -webkit-user-select: none; user-select: none; width: 100%; } -.custom-sidenav-button { - pointer-events: auto; -} - .custom-sidenav-button:hover { background-color: var(--cds-background, #295785); } @@ -509,13 +333,16 @@ button { .banner h5 { font-size: 1.8vw; } + .banner p { font-size: 1.4vw; } + .formInlineDiv { grid-template-columns: 1fr; } } + @media screen and (max-width: 550px) { .adminPageContent { margin-left: 15%; @@ -527,6 +354,7 @@ button { flex-direction: column; } } + @media screen and (max-width: 500px) { .adminPageContent { margin-left: 17%; @@ -539,7 +367,7 @@ button { } #header-logo { - margin-left: 0px; + margin-left: 0; } .banner p { diff --git a/frontend/src/components/layout/search/searchBar.css b/frontend/src/components/layout/search/searchBar.css index e202ea237d..6e9b048cc5 100644 --- a/frontend/src/components/layout/search/searchBar.css +++ b/frontend/src/components/layout/search/searchBar.css @@ -17,7 +17,6 @@ .search-input { width: 100%; position: relative; - } .search-bar-container:hover { @@ -52,11 +51,8 @@ cursor: pointer; } - /* Large screens (1208px and up) */ @media (min-width: 1208px) { - - .search-bar-container { width: 45%; margin-top: 0%; @@ -77,7 +73,7 @@ right: 130px; box-shadow: 0em 0.1em 0.5em #ccc; } - + .patientHead { overflow-y: auto; width: 600px; diff --git a/frontend/src/components/layout/search/searchBar.js b/frontend/src/components/layout/search/searchBar.js index a3223b6b28..e1db0c5216 100644 --- a/frontend/src/components/layout/search/searchBar.js +++ b/frontend/src/components/layout/search/searchBar.js @@ -148,4 +148,4 @@ const SearchBar = (props) => { ); }; -export default SearchBar; \ No newline at end of file +export default SearchBar; diff --git a/frontend/src/index.css b/frontend/src/index.css index 5aa3ee2f3b..3d6c7d3bef 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -71,7 +71,7 @@ code { .slide-over-panel { width: 25%; /* Use percentage for width on larger screens */ - /* max-width: 25%;*/ + /* max-width: 25%;*/ max-width: 50%; /* Use percentage for max-width on larger screens */ }