Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated bower to support multiple versions of packages #143

Closed
wants to merge 1 commit into from
Closed

Updated bower to support multiple versions of packages #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "openemr",
"homepage": "http://open-emr.dev",
"homepage": "http://www.open-emr.org",
"authors": [
"OpenEMR"
],
Expand All @@ -15,6 +15,6 @@
"tests"
],
"dependencies": {
"font-awesome": "^4.6.3"
"font-awesome-4-6-3": "font-awesome#4.6.3"
}
}
2 changes: 1 addition & 1 deletion interface/main/left_nav.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ function genFindBlock() {
<title>Navigation</title>

<link rel="stylesheet" href="<?php echo $css_header;?>" type="text/css">
<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative'];?>/font-awesome/css/font-awesome.css" type="text/css">
<link rel="stylesheet" href="<?php echo $GLOBALS['assets_static_relative'];?>/font-awesome-4-6-3/css/font-awesome.css" type="text/css">
<style type="text/css">
body {
font-size:8pt;
Expand Down
2 changes: 1 addition & 1 deletion interface/static/font-awesome/.bower.json → ...ace/static/font-awesome-4-6-3/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"commit": "0f618911b105195c931ec5d5bef425a2a2806cab"
},
"_source": "https://github.com/FortAwesome/Font-Awesome.git",
"_target": "^4.6.3",
"_target": "4.6.3",
"_originalSource": "font-awesome"
}
0 interface/static/font-awesome/.gitignore → ...face/static/font-awesome-4-6-3/.gitignore
View file
Open in desktop
File renamed without changes.
0 interface/static/font-awesome/.npmignore → ...face/static/font-awesome-4-6-3/.npmignore
View file
Open in desktop
File renamed without changes.
0 ...rface/static/font-awesome/HELP-US-OUT.txt → ...static/font-awesome-4-6-3/HELP-US-OUT.txt
View file
Open in desktop
File renamed without changes.
0 interface/static/font-awesome/bower.json → ...face/static/font-awesome-4-6-3/bower.json
View file
Open in desktop
File renamed without changes.
0 .../static/font-awesome/css/font-awesome.css → ...c/font-awesome-4-6-3/css/font-awesome.css
View file
Open in desktop
File renamed without changes.
0 ...tic/font-awesome/css/font-awesome.css.map → ...nt-awesome-4-6-3/css/font-awesome.css.map
View file
Open in desktop
File renamed without changes.
0 ...tic/font-awesome/css/font-awesome.min.css → ...nt-awesome-4-6-3/css/font-awesome.min.css
View file
Open in desktop
File renamed without changes.
0 ...static/font-awesome/fonts/FontAwesome.otf → .../font-awesome-4-6-3/fonts/FontAwesome.otf
View file
Open in desktop
File renamed without changes.
0 ...ont-awesome/fonts/fontawesome-webfont.eot → ...esome-4-6-3/fonts/fontawesome-webfont.eot
View file
Open in desktop
File renamed without changes.
0 ...ont-awesome/fonts/fontawesome-webfont.svg → ...esome-4-6-3/fonts/fontawesome-webfont.svg
View file
Open in desktop
File renamed without changes
0 ...ont-awesome/fonts/fontawesome-webfont.ttf → ...esome-4-6-3/fonts/fontawesome-webfont.ttf
View file
Open in desktop
File renamed without changes.
0 ...nt-awesome/fonts/fontawesome-webfont.woff → ...some-4-6-3/fonts/fontawesome-webfont.woff
View file
Open in desktop
File renamed without changes.
0 ...t-awesome/fonts/fontawesome-webfont.woff2 → ...ome-4-6-3/fonts/fontawesome-webfont.woff2
View file
Open in desktop
File renamed without changes.
0 ...ce/static/font-awesome/less/animated.less → ...tic/font-awesome-4-6-3/less/animated.less
View file
Open in desktop
File renamed without changes.
0 ...ic/font-awesome/less/bordered-pulled.less → ...t-awesome-4-6-3/less/bordered-pulled.less
View file
Open in desktop
File renamed without changes.
0 interface/static/font-awesome/less/core.less → .../static/font-awesome-4-6-3/less/core.less
View file
Open in desktop
File renamed without changes.
0 ...static/font-awesome/less/fixed-width.less → .../font-awesome-4-6-3/less/fixed-width.less
View file
Open in desktop
File renamed without changes.
0 ...tatic/font-awesome/less/font-awesome.less → ...font-awesome-4-6-3/less/font-awesome.less
View file
Open in desktop
File renamed without changes.
0 ...rface/static/font-awesome/less/icons.less → ...static/font-awesome-4-6-3/less/icons.less
View file
Open in desktop
File renamed without changes.
0 ...face/static/font-awesome/less/larger.less → ...tatic/font-awesome-4-6-3/less/larger.less
View file
Open in desktop
File renamed without changes.
0 interface/static/font-awesome/less/list.less → .../static/font-awesome-4-6-3/less/list.less
View file
Open in desktop
File renamed without changes.
0 ...face/static/font-awesome/less/mixins.less → ...tatic/font-awesome-4-6-3/less/mixins.less
View file
Open in desktop
File renamed without changes.
0 interface/static/font-awesome/less/path.less → .../static/font-awesome-4-6-3/less/path.less
View file
Open in desktop
File renamed without changes.
0 ...ic/font-awesome/less/rotated-flipped.less → ...t-awesome-4-6-3/less/rotated-flipped.less
View file
Open in desktop
File renamed without changes.
0 ...atic/font-awesome/less/screen-reader.less → ...ont-awesome-4-6-3/less/screen-reader.less
View file
Open in desktop
File renamed without changes.
0 ...ace/static/font-awesome/less/stacked.less → ...atic/font-awesome-4-6-3/less/stacked.less
View file
Open in desktop
File renamed without changes.
0 ...e/static/font-awesome/less/variables.less → ...ic/font-awesome-4-6-3/less/variables.less
View file
Open in desktop
File renamed without changes.
0 ...e/static/font-awesome/scss/_animated.scss → ...ic/font-awesome-4-6-3/scss/_animated.scss
View file
Open in desktop
File renamed without changes.
0 ...c/font-awesome/scss/_bordered-pulled.scss → ...-awesome-4-6-3/scss/_bordered-pulled.scss
View file
Open in desktop
File renamed without changes.
0 ...rface/static/font-awesome/scss/_core.scss → ...static/font-awesome-4-6-3/scss/_core.scss
View file
Open in desktop
File renamed without changes.
0 ...tatic/font-awesome/scss/_fixed-width.scss → ...font-awesome-4-6-3/scss/_fixed-width.scss
View file
Open in desktop
File renamed without changes.
0 ...face/static/font-awesome/scss/_icons.scss → ...tatic/font-awesome-4-6-3/scss/_icons.scss
View file
Open in desktop
File renamed without changes.
0 ...ace/static/font-awesome/scss/_larger.scss → ...atic/font-awesome-4-6-3/scss/_larger.scss
View file
Open in desktop
File renamed without changes.
0 ...rface/static/font-awesome/scss/_list.scss → ...static/font-awesome-4-6-3/scss/_list.scss
View file
Open in desktop
File renamed without changes.
0 ...ace/static/font-awesome/scss/_mixins.scss → ...atic/font-awesome-4-6-3/scss/_mixins.scss
View file
Open in desktop
File renamed without changes.
0 ...rface/static/font-awesome/scss/_path.scss → ...static/font-awesome-4-6-3/scss/_path.scss
View file
Open in desktop
File renamed without changes.
0 ...c/font-awesome/scss/_rotated-flipped.scss → ...-awesome-4-6-3/scss/_rotated-flipped.scss
View file
Open in desktop
File renamed without changes.
0 ...tic/font-awesome/scss/_screen-reader.scss → ...nt-awesome-4-6-3/scss/_screen-reader.scss
View file
Open in desktop
File renamed without changes.
0 ...ce/static/font-awesome/scss/_stacked.scss → ...tic/font-awesome-4-6-3/scss/_stacked.scss
View file
Open in desktop
File renamed without changes.
0 .../static/font-awesome/scss/_variables.scss → ...c/font-awesome-4-6-3/scss/_variables.scss
View file
Open in desktop
File renamed without changes.
0 ...tatic/font-awesome/scss/font-awesome.scss → ...font-awesome-4-6-3/scss/font-awesome.scss
View file
Open in desktop
File renamed without changes.