This repository was archived by the owner on May 16, 2019. It is now read-only.
File tree Expand file tree Collapse file tree 6 files changed +23
-14
lines changed
Expand file tree Collapse file tree 6 files changed +23
-14
lines changed Original file line number Diff line number Diff line change @@ -2407,7 +2407,6 @@ div.chatSearchOut .chatSearchIcon {
24072407
24082408.chatConversationMessageTimestamp {
24092409 font- size: 11px;
2410- color : # fff ;
24112410 opacity: .35;
24122411 font- weight: 500;
24132412 letter- spacing: 0;
@@ -3415,7 +3414,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
34153414 padding: 10px 0;
34163415 width: 230px;
34173416 overflow: hidden;
3418- transfor m: translateY(-330px );
3417+ transfor m: translateY(-110% );
34193418 transition: transfor m 200ms;
34203419}
34213420
@@ -4614,7 +4613,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
46144613# ov1 .positionTop {
46154614 position: absolute;
46164615 to p: 0;
4617- right : 0;
4616+ left : 0;
46184617}
46194618
46204619# ov1 .positionTopRight {
Original file line number Diff line number Diff line change @@ -15,15 +15,16 @@ module.exports = {
1515 keyShortcuts : {
1616 undo : 'z' ,
1717 discover : 'd' ,
18- myPage : 'h ' ,
19- customizePage : 'e ' ,
20- create : 'n ' ,
21- purchases : 't ' ,
22- sales : 'y ' ,
23- cases : 'j ' ,
24- settings : 'g ' ,
25- addressBar : 'l ' ,
18+ myPage : 'j ' ,
19+ customizePage : 'k ' ,
20+ create : 'l ' ,
21+ purchases : ', ' ,
22+ sales : '. ' ,
23+ cases : '/ ' ,
24+ settings : '; ' ,
25+ addressBar : '[ ' ,
2626 save : 's' ,
27+ refresh : 't' ,
2728 restart : 'r'
2829 } ,
2930
Original file line number Diff line number Diff line change 567567 "cases" : " Cases" ,
568568 "notifications" : " Notifications" ,
569569 "settings" : " Settings" ,
570+ "refresh" : " Refresh Page" ,
570571 "restart" : " Restart Application" ,
571572 "about" : " About OpenBazaar" ,
572573 "support" : " Support OpenBazaar" ,
Original file line number Diff line number Diff line change @@ -192,8 +192,8 @@ $(window).bind('keydown', function(e) {
192192 var char = String . fromCharCode ( e . which ) . toLowerCase ( ) ,
193193 ctrl = ( e . ctrlKey || e . metaKey ) && ! e . altKey , //test for alt key to prevent international keyboard issues
194194 route = null ;
195-
196- if ( event . keyCode == 116 ) { //on F5 press
195+
196+ if ( e . keyCode == 116 ) { //on F5 press
197197 Backbone . history . loadUrl ( ) ;
198198 }
199199
@@ -235,6 +235,9 @@ $(window).bind('keydown', function(e) {
235235 case config . keyShortcuts . save :
236236 window . obEventBus . trigger ( 'saveCurrentForm' ) ;
237237 break ;
238+ case config . keyShortcuts . refresh :
239+ Backbone . history . loadUrl ( ) ;
240+ break ;
238241 }
239242
240243 if ( route !== null ) {
Original file line number Diff line number Diff line change @@ -123,6 +123,11 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
123123 < %= polyglot.t('nav.settings') %>
124124 < span class ="pull-right txt-muted "> < %= config.keyShortcutPrefix + config.keyShortcuts.settings.toUpperCase() %> </ span >
125125 </ a >
126+ < a class ="js-navRefresh ">
127+ < span class ="ion-loop fontSize11 marginRight2 textOpacity1 "> </ span >
128+ < %= polyglot.t('nav.refresh') %>
129+ < span class ="pull-right txt-muted "> < %= config.keyShortcutPrefix + config.keyShortcuts.refresh.toUpperCase() %> </ span >
130+ </ a >
126131 < a class ="js-navRestart ">
127132 < span class ="ion-refresh fontSize11 marginRight2 textOpacity1 "> </ span >
128133 < %= polyglot.t('nav.restart') %>
Original file line number Diff line number Diff line change @@ -991,7 +991,7 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
991991 < div class ="js-main js-discussion transactionDiscussionTab " style ="height:319px ">
992992 < div class ="scrollOverflowY js-discussionScroller customThemeScrollbar " style ="height: 237px; ">
993993 < div class ="js-discussionWrapperEmpty textOpacity50 fontSize14 marginTop80 alignCenter "> < %= polyglot.t('transactions.NoMessages') %> </ div >
994- < div class ="js-discussionWrapper ">
994+ < div class ="custCol-text js-discussionWrapper ">
995995 </ div >
996996 </ div >
997997 < div class ="flexRow pad10Top width100 positionBottom custCol-secondary js-discussionForm border2 custCol-border-secondary ">
You can’t perform that action at this time.
0 commit comments