diff --git src/bp-core/css/avatar.css src/bp-core/css/avatar.css
index 191944d..03ad6cd 100644
|
|
div.bp-avatar-status p.error { |
20 | 20 | color: #800; |
21 | 21 | } |
22 | 22 | |
23 | | .progress { |
| 23 | .bp-progress { |
24 | 24 | background: none; |
25 | 25 | border: 1px solid #d1d1d1; |
26 | 26 | float: right; |
… |
… |
div.bp-avatar-status p.error { |
33 | 33 | width: 200px; |
34 | 34 | } |
35 | 35 | |
36 | | .bar { |
| 36 | .bp-bar { |
37 | 37 | background-color: #c3ff88; |
38 | 38 | width: 0; |
39 | 39 | height: 100%; |
diff --git src/bp-core/js/bp-plupload.js src/bp-core/js/bp-plupload.js
index ce22622..2d0651b 100644
|
|
window.bp = window.bp || window.wp; |
368 | 368 | |
369 | 369 | progress:function( model ) { |
370 | 370 | if ( ! _.isUndefined( model.get( 'percent' ) ) ) { |
371 | | $( '#' + model.get('id') + ' .progress .bar' ).css( 'width', model.get('percent') + '%' ); |
| 371 | $( '#' + model.get('id') + ' .bp-progress .bp-bar' ).css( 'width', model.get('percent') + '%' ); |
372 | 372 | } |
373 | 373 | }, |
374 | 374 | |
diff --git src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php
index ebbc90f..79a1efe 100644
|
|
|
30 | 30 | |
31 | 31 | <script type="text/html" id="tmpl-progress-window"> |
32 | 32 | <div id="{{data.id}}"> |
33 | | <div class="progress"> |
34 | | <div class="bar"></div> |
| 33 | <div class="bp-progress"> |
| 34 | <div class="bp-bar"></div> |
35 | 35 | </div> |
36 | 36 | <div class="filename">{{data.filename}}</div> |
37 | 37 | </div> |