diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..e3f23a4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +* text eol=lf +*.png binary +*.jpg binary +*.pdf binary +*.ico binary +*.gif binary \ No newline at end of file diff --git a/global_header_no_sidebar.php b/global_header_no_sidebar.php index ff6ecd3..5ee1282 100644 --- a/global_header_no_sidebar.php +++ b/global_header_no_sidebar.php @@ -27,48 +27,54 @@ $bsCSSPath = $Path . 'lib/bootstrap-3.3.6-dist/css/bootstrap.min.css'; $styleCSSPath = $Path . 'lib/css/style.css'; $commonCSSPath = $Path . 'lib/css/common.css'; $ucPrintCSSPath = $Path . 'lib/css/uc-print.css'; // not sure why this is left out -$datePickerCSSPath = $Path . 'lib/bootstrap-datepicker-1.5.1-dist/css/bootstrap-datepicker.min.css'; +$datePickerCSSPath = $Path . 'lib/bootstrap-datepicker-1.5.1-dist/css/bootstrap-datepicker3.min.css'; $mainCS = array($bsCSSPath, $styleCSSPath, $commonCSSPath, $datePickerCSSPath); $resultCS = isset($CS) ? array_merge($mainCS, $CS) : $mainCS; ?> - +
- - -