Merge pull request #2 from dmitry-ilyashevich/master

demiazz · demiazz · commit 9524ff75e425 · 2013-10-03T05:28:29.000-07:00
Fixed assets urls
diff --git a/app/assets/stylesheets/jquery.fileupload-ui.scss b/app/assets/stylesheets/jquery.fileupload-ui.scss
@@ -16,14 +16,14 @@
 }
 .progress-animated .progress-bar,
 .progress-animated .bar {
-  background: url('../img/progressbar.gif') !important;
+  background: image_url('progressbar.gif') !important;
   filter: none;
 }
 .fileupload-loading {
   float: right;
   width: 32px;
   height: 32px;
-  background: url('../img/loading.gif') center no-repeat;
+  background: image_url('loading.gif') center no-repeat;
   background-size: contain;
   display: none;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@`
`16`	`16`	`}`
`17`	`17`	`.progress-animated .progress-bar,`
`18`	`18`	`.progress-animated .bar {`
`19`		`- background: url('../img/progressbar.gif') !important;`
	`19`	`+ background: image_url('progressbar.gif') !important;`
`20`	`20`	`filter: none;`
`21`	`21`	`}`
`22`	`22`	`.fileupload-loading {`
`23`	`23`	`float: right;`
`24`	`24`	`width: 32px;`
`25`	`25`	`height: 32px;`
`26`		`- background: url('../img/loading.gif') center no-repeat;`
	`26`	`+ background: image_url('loading.gif') center no-repeat;`
`27`	`27`	`background-size: contain;`
`28`	`28`	`display: none;`
`29`	`29`	`}`