Skip to content

Commit

Permalink
Portal Fixes
Browse files Browse the repository at this point in the history
- add portal theme to gulp build
- restructured patientportal-style to be compile for theme.
- oe-sidebar auto height size.
- clean up portal dashboard
- clean up  and fix dashboard patient template UI.
- patient document style
- secure messaging style sidebar and pagination. also increase page size to 20 messages.
- ongoing dependencies update to Header class management.
  • Loading branch information
sjpadgett committed Feb 8, 2020
1 parent fca5434 commit e826edc
Show file tree
Hide file tree
Showing 11 changed files with 348 additions and 244 deletions.
16 changes: 15 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ let config = {
// Source file locations
src: {
styles: {
style_portal: 'interface/themes/patientportal-style.scss',
style_uni: 'interface/themes/oe-styles/style_*.scss',
style_color: 'interface/themes/colors/*.scss',
directional: 'interface/themes/directional.scss'
Expand Down Expand Up @@ -71,6 +72,19 @@ const autoGeneratedHeader = `
*/
`;

// standard themes css compilation
function styles_style_portal() {
return gulp.src(config.src.styles.style_portal)
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(prefix('last 1 version'))
.pipe(gap.prependText(autoGeneratedHeader))
.pipe(gulpif(!config.dev, csso()))
.pipe(gulpif(!config.dev, sourcemaps.write()))
.pipe(gulp.dest(config.dest.themes))
.pipe(gulpif(config.dev && config.build, gulp.dest(config.dest.themes)))
.pipe(gulpif(config.dev, reload({ stream: true })));
}
// standard themes css compilation
function styles_style_uni() {
return gulp.src(config.src.styles.style_uni)
Expand Down Expand Up @@ -134,7 +148,7 @@ function rtl_style_color() {
}

// compile themes
const styles = gulp.parallel(styles_style_uni, styles_style_color, rtl_style_uni, rtl_style_color);
const styles = gulp.parallel(styles_style_uni, styles_style_portal, styles_style_color, rtl_style_uni, rtl_style_color);

// Copies (and distills, if possible) assets from node_modules to public/assets
function install(done) {
Expand Down
16 changes: 8 additions & 8 deletions interface/themes/oe-common/oe-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @link http:https://www.open-emr.org
* @author Jerry Padgett <[email protected]>
* @author Tyler Wrenn <[email protected]>
* @copyright Copyright (c) 2019 Jerry Padgett <[email protected]>
* @copyright Copyright (c) 2020 Jerry Padgett <[email protected]>
* @copyright Copyright (c) 2020 Tyler Wrenn <[email protected]>
* @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
*/
Expand Down Expand Up @@ -37,8 +37,8 @@

/* if not a grid then main available */
main {
margin-left: 225px;
padding: 1rem 15px;
margin-left: 250px;
padding: 1rem 10px;
width: 100%;
}

Expand All @@ -54,7 +54,7 @@ main {

#nav-topbar .brand-container {
/* Should match width of .nav-sidebar */
width: 225px;
width: 250px;
padding-left: 1rem;
}

Expand Down Expand Up @@ -83,8 +83,8 @@ main {

.nav-sidebar {
position: fixed;
height: 100%;
width: 225px;
height: unset;
width: 250px;
top: 0;
bottom: 0;
left: 0;
Expand Down Expand Up @@ -142,9 +142,9 @@ main {

#nav-topbar .brand-container.active,
.nav-sidebar.active {
width: 225px;
width: 250px;
min-width: 30px;
max-width: 225px;
max-width: 250px;
}

.nav-sidebar.active .sidebar-content {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,104 @@
* @package OpenEMR
* @link https://www.open-emr.org
* @author Jerry Padgett <[email protected]>
* @copyright Copyright (c) 2016-2017 Jerry Padgett <[email protected]>
* @copyright Copyright (c) 2016-2020 Jerry Padgett <[email protected]>
* @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
*/
@import './../../../interface/themes/oe-common/oe-sidebar.scss';
/*
Core: General style
----------------------------
*/

/* Default Colors */
$blue: #007bff;
$indigo: #6610f2;
$purple: #6f42c1;
$pink: #e83e8c;
$red: #dc3545;
$orange: #fd7e14;
$yellow: #ffc107;
$green: #28a745;
$teal: #20c997;
$cyan: #17a2b8;
$white: #fff;
$black: #000;

/* Default Grays */
$gray-100: #f8f9fa;
$gray-200: #e9ecef;
$gray-300: #dee2e6;
$gray-400: #ced4da;
$gray-500: #adb5bd;
$gray-600: #868e96;
$gray-700: #495057;
$gray-800: #343a40;
$gray-900: #212529;

/* Equivalents to bg-light/dark as well as default for gray */
$light: $gray-100;
$dark: $gray-800;
$gray: $gray-600;

/* Array of theme colors that can be added to */
$theme-colors: (
primary: $blue,
secondary: $gray-100,
success: $green,
info: $cyan,
warning: $yellow,
danger: $red,
light: $gray-100,
dark: $gray-800
);

/* Array of random colors that can be added to */
$colors: (
"blue": $blue,
"indigo": $indigo,
"purple": $purple,
"pink": $pink,
"red": $red,
"orange": $orange,
"yellow": $yellow,
"green": $green,
"teal": $teal,
"cyan": $cyan,
"white": $white,
"gray": $gray-600,
"gray-dark": $gray-800,
/* Overrides to allow regular CSS coloring */
"black": $black,
"gray100": $gray-100,
"gray200": $gray-200,
"gray300": $gray-300,
"gray400": $gray-400,
"gray500": $gray-500,
"gray700": $gray-700,
"gray900": $gray-900
);

$body-bg: $white;
$body-color: $gray-900;
$font-family-sans-serif: "Lato", "Helvetica", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
$font-size-base: 0.875rem;
$rfs-base-value: 0.875rem;
$font-family-base: $font-family-sans-serif;

$close-color: $black;
$close-text-shadow: 0 1 0 $black;

$enable-responsive-font-sizes: true;

/*@import "../../public/assets/bootstrap/scss/bootstrap";*/
@import "./../../public/assets/bootstrap/scss/vendor/rfs";
@import "./oe-common/oe-sidebar.scss";

.btn-secondary {
background-color: rgba($black, .05) !important;
color: rgba($black, .87) !important;
border-color: $gray-500 !important;
}

/* Layouts */
.wrapper {
min-height: 100%;
Expand Down
Loading

0 comments on commit e826edc

Please sign in to comment.