Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit e21cfee

Browse files
jjeffryesjjeffryes
committed
Merge pull request #880 from OpenBazaar/misc104
final branch for testnet launch
2 parents 6bd225d + 524f2b5 commit e21cfee

File tree

5 files changed

+42
-25
lines changed

5 files changed

+42
-25
lines changed

‎css/obBase.css

+22-7
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ div.chatSearchOut .chatSearchIcon {
19711971
overflow: auto;
19721972
padding: 6px 2px;
19731973
margin-left: 2px;
1974-
width: 100%;
1974+
width: 222px;
19751975
}
19761976

19771977
.chatConversationTo {
@@ -1999,7 +1999,7 @@ div.chatSearchOut .chatSearchIcon {
19991999

20002000
.chatConversationMessage {
20012001
height: 75px;
2002-
padding: 0 5px;
2002+
padding: 0;
20032003
border: 1px solid #565656;
20042004
border-top: 0;
20052005
margin-left: 2px;
@@ -2011,12 +2011,17 @@ div.chatSearchOut .chatSearchIcon {
20112011
max-height: 145px;
20122012
}
20132013

2014+
.chatConversationMessage .txtAreaField::-webkit-input-placeholder{
2015+
font-size: 13px;
2016+
}
2017+
20142018
.chatConversationMessage .txtAreaField {
20152019
height: 75px;
2020+
padding: 10px 10px;
20162021
}
20172022

20182023
.chatConversationMessage .txtAreaField:focus {
2019-
outline: none;
2024+
outline: 2px solid #565656;
20202025
}
20212026

20222027
.chatConversationMessage .txtAreaField:after {
@@ -3092,14 +3097,14 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
30923097
top: 50px;
30933098
right: 45px;
30943099
background-color: #252525;
3095-
box-shadow: 0 2px 0 rgba(0, 0, 0, 0.10);
3100+
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.60);
30963101
border-bottom-left-radius: 4px;
30973102
border-bottom-right-radius: 4px;
30983103
color: #fff;
30993104
font-size: 15px;
31003105
padding: 0;
31013106
width: 390px;
3102-
transform: translateY(-100%);
3107+
transform: translateY(-440px);
31033108
transition: transform 200ms;
31043109
}
31053110

@@ -3176,15 +3181,15 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
31763181
top: 50px;
31773182
right: 10px;
31783183
background-color: #252525;
3179-
box-shadow: 0 2px 0 rgba(0, 0, 0, 0.10);
3184+
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.60);
31803185
border-bottom-left-radius: 4px;
31813186
border-bottom-right-radius: 4px;
31823187
color: #fff;
31833188
font-size: 13px;
31843189
padding: 10px 0;
31853190
width: 230px;
31863191
overflow: hidden;
3187-
transform: translateY(-100%);
3192+
transform: translateY(-330px);
31883193
transition: transform 200ms;
31893194
}
31903195

@@ -4532,6 +4537,10 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
45324537
margin-right: 3px;
45334538
}
45344539

4540+
#ov1 .marginRight4 {
4541+
margin-right: 4px;
4542+
}
4543+
45354544
#ov1 .marginRight5 {
45364545
margin-right: 5px;
45374546
}
@@ -4900,6 +4909,9 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
49004909
#ov1 .padding5 {
49014910
padding: 5px;
49024911
}
4912+
#ov1 .padding10px6px {
4913+
padding: 10px 6px;
4914+
}
49034915

49044916
#ov1 .padding8 {
49054917
padding: 8px;
@@ -5068,6 +5080,9 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
50685080
#ov1 .width80 {
50695081
width: 80px;
50705082
}
5083+
#ov1 .width91 {
5084+
width: 91px;
5085+
}
50715086
#ov1 .width95 {
50725087
width: 95px;
50735088
}

‎js/templates/chatConversation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
</div>
2727

2828
<div class="chatConversationMessage">
29-
<textarea name="conversation_message" placeholder="<%= polyglot.t('EnterMessage') %>" class="fontSize12 padding4 txtAreaField border0 js-chatMessage" rows="3"></textarea>
29+
<textarea name="conversation_message" placeholder="<%= polyglot.t('EnterMessage') %>" class="fontSize12 txtAreaField border0 js-chatMessage" rows="3"></textarea>
3030
</div>

‎js/templates/chatMessage.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<% } %>
66
<div class="chatConversationMessageLine <% if(ob.message_type == "ORDER") { %>padding2015 borderBottom1 custCol-border<% } %>">
77
<div class="flexRow">
8-
<div class="chatConversationMessageTimestamp paddingLeft2">
8+
<div class="chatConversationMessageTimestamp paddingLeft2 <% if (ob.outgoing) { %>width100 alignRight<% } %>">
99
<div><%= ob.moment(new Date(ob.timestamp * 1000)).format('MMM D, h:mm A') %></div>
1010
</div>
1111
</div>
@@ -17,39 +17,39 @@
1717
</a>
1818
<% if(ob.guid == ob.moderatorGuid || ob.sender && ob.sender == ob.moderatorGuid){ %>
1919
<div class="chatConversationMessageBody marginRight2 flexSizeFixed">
20-
<div class="inner"><%= polyglot.t('transactions.Moderator') %></div>
20+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_CLOSE') { %>custCol-secondary<% } %>"><%= polyglot.t('transactions.Moderator') %></div>
2121
</div>
2222
<% } else if(ob.guid == ob.vendorGuid || ob.sender && ob.sender == ob.vendorGuid){ %>
2323
<div class="chatConversationMessageBody marginRight2 flexSizeFixed">
24-
<div class="inner"><%= polyglot.t('transactions.Seller') %></div>
24+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_OPEN') { %>custCol-secondary<% } %>"><%= polyglot.t('transactions.Seller') %></div>
2525
</div>
2626
<% } else if(ob.guid == ob.buyerGuid || ob.sender && ob.sender == ob.buyerGuid){ %>
2727
<div class="chatConversationMessageBody marginRight2 flexSizeFixed">
28-
<div class="inner"><%= polyglot.t('transactions.Buyer') %></div>
28+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_OPEN') { %>custCol-secondary<% } %>"><%= polyglot.t('transactions.Buyer') %></div>
2929
</div>
3030
<% } %>
3131
<% } %>
3232

3333
<div class="chatConversationMessageBody flexExpand">
3434
<% if (ob.outgoing) { %>
35-
<div class="inner width100"><%= ob.sanitizedMsg %></div>
35+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_OPEN') { %>custCol-secondary<% } %> floatRight"><%= ob.sanitizedMsg %></div>
3636
<% } else { %>
37-
<div class="inner width100"><%= ob.sanitizedMsg %></div>
37+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_OPEN') { %>custCol-secondary<% } %>"><%= ob.sanitizedMsg %></div>
3838
<% } %>
3939
</div>
4040

4141
<% if (ob.outgoing) { %>
4242
<% if(ob.transactionType == "cases"){ %>
4343
<div class="chatConversationMessageBody marginLeft2 flexSizeFixed">
44-
<div class="inner"><%= polyglot.t('transactions.Moderator') %></div>
44+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_CLOSE') { %>custCol-secondary<% } %>"><%= polyglot.t('transactions.Moderator') %></div>
4545
</div>
4646
<% } else if(ob.transactionType == "sales"){ %>
4747
<div class="chatConversationMessageBody marginLeft2 flexSizeFixed">
48-
<div class="inner"><%= polyglot.t('transactions.Seller') %></div>
48+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_OPEN') { %>custCol-secondary<% } %>"><%= polyglot.t('transactions.Seller') %></div>
4949
</div>
5050
<% } else if(ob.transactionType == "purchases"){ %>
5151
<div class="chatConversationMessageBody marginLeft2 flexSizeFixed">
52-
<div class="inner"><%= polyglot.t('transactions.Buyer') %></div>
52+
<div class="inner <% if(ob.message_type == 'ORDER' || ob.message_type == 'DISPUTE_OPEN') { %>custCol-secondary<% } %>"><%= polyglot.t('transactions.Buyer') %></div>
5353
</div>
5454
<% } %>
5555

‎js/templates/notification.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<% if(ob.handle) { %>
2121
<%= ob.handle %>
2222
<% }else{ %>
23-
<span class="noOverflow width95 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
23+
<span class="noOverflow width91 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
2424
<% } %>
2525
</span> <%= polyglot.t('NotificationDisputeClosed') %>
2626
</div>
@@ -31,7 +31,7 @@
3131
<% if(ob.handle) { %>
3232
<%= ob.handle %>
3333
<% }else{ %>
34-
<span class="noOverflow width95 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
34+
<span class="noOverflow width91 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
3535
<% } %>
3636
</span> <%= polyglot.t('NotificationDispute') %>
3737
</div>
@@ -43,7 +43,7 @@
4343
<% if(ob.handle) { %>
4444
<%= ob.handle %>.
4545
<% }else{ %>
46-
<span class="noOverflow width95 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
46+
<span class="noOverflow width91 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
4747
<% } %>
4848
</span>
4949
</div>
@@ -54,7 +54,7 @@
5454
<% if(ob.handle) { %>
5555
<%= ob.handle %>
5656
<% }else{ %>
57-
<span class="noOverflow width95 inlineBlock top3 tooltip" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
57+
<span class="noOverflow width91 inlineBlock top3 tooltip" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
5858
<% } %>
5959
</span> <%= polyglot.t('NotificationOrderFor') %> <%= ob.title %>.
6060
</div>
@@ -65,9 +65,9 @@
6565
<% if(ob.handle) { %>
6666
<%= ob.handle %>
6767
<% }else{ %>
68-
<span class="noOverflow width95 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
68+
<span class="noOverflow width91 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
6969
<% } %>
70-
</span> <%= polyglot.t('NotificationFollow') %>.
70+
</span><%= polyglot.t('NotificationFollow') %>.
7171
</div>
7272
<div class="textSize11px txt-fade"><%= ob.moment(new Date(ob.timestamp*1000)).format('MMM D, h:mm A') %></div>
7373
<% } else if(ob.type == "refund") { %>
@@ -76,7 +76,7 @@
7676
<% if(ob.handle) { %>
7777
<%= ob.handle %>
7878
<% }else{ %>
79-
<span class="noOverflow width95 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
79+
<span class="noOverflow width91 inlineBlock top3 tooltip hoverUnderline" data-tooltip="<%= ob.guid %>"><%= ob.guid %></span>
8080
<% } %>
8181
</span> <%= polyglot.t('NotificationRefund') %>.
8282
</div>

‎js/templates/notifications.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<div class="popMenu-notificationsHeader height40"><%= polyglot.t('nav.notifications') %></div>
1+
<div class="popMenu-notificationsHeader height40">
2+
<%= polyglot.t('nav.notifications') %>
3+
</div>
24

35
<div class="popMenu-notificationsContent flex-border js-notif-wrap">
46
<% if (ob.isFetching) { %>

0 commit comments

Comments
 (0)