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

Commit 8f919ae

Browse files
jjeffryesjjeffryes
committed
Merge pull request #1409 from OpenBazaar/colorfix
Fixed a few color/formatting issues
2 parents 1a75be9 + 8ee588d commit 8f919ae

File tree

4 files changed

+26
-30
lines changed

4 files changed

+26
-30
lines changed

‎css/obBase.css‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4663,10 +4663,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
46634663
outline: 2px solid #fff;
46644664
}
46654665

4666-
#ov1 .borderRadiusTop {
4667-
border-radius: 3px;
4668-
}
4669-
46704666
#ov1 .borderRadiusTop {
46714667
border-top-left-radius: 3px;
46724668
border-top-right-radius: 3px;

‎js/templates/buyWizard.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
1616
</div>
1717
</div>
1818
<div class="js-buyWizardMap positionTop"></div>
19-
<div class="modal-hero modal-heroFullHeightNoButtons js-buyWizardSpinner hide background1">
19+
<div class="modal-hero modal-heroFullHeightNoButtons js-buyWizardSpinner hide background1 custCol-primary">
2020
<div class="width100 txt-center vCentered">
2121
<div class="txt-col1 ion-android-sync spinner spinner-slow icon-gigantic icon-circle-background1 rowTop50 row20"></div>
2222
<h3 class="txt-bright padding30"><%= polyglot.t('CheckExchanges') %> </h3>
2323
</div>
2424
</div>
25-
<div class="modal-hero modal-heroFullHeightNoButtons padding40 js-buyWizardPay hide background1">
25+
<div class="modal-hero modal-heroFullHeightNoButtons padding40 js-buyWizardPay hide background1 custCol-primary">
2626
<div class="width100 row20">
2727
<img class="blockCenter qrCode js-buyWizardPayQRCode" height="250" width="250" src="imgs/defaultItem.png"/>
2828
</div>
@@ -37,9 +37,9 @@ <h3 class="txt-bright padding30"><%= polyglot.t('CheckExchanges') %> </h3>
3737
<input type="checkbox" class="textSize11px fieldItem thin" id="BuyWizardQRDetailsInput">
3838
<label for="BuyWizardQRDetailsInput" class="textSize11px"> <%= polyglot.t('AdditionalPaymentDataInfo') %></label>
3939
</div>
40-
<a class="btn btn-txt btn-wide row10 js-buyWizardPayCopy"><i class="ion-clipboard"></i> <%= polyglot.t('buyFlow.CopyAddress') %></a>
41-
<a class="btn btn-txt btn-wide row10 js-buyWizardPayLink"><i class="ion-link"></i> <%= polyglot.t('buyFlow.OpenAddress') %></a>
42-
<a class="btn btn-txt btn-wide js-buyWizardPayCheck"><i class="ion-refresh"></i> <%= polyglot.t('buyFlow.RefreshPayment') %></a>
40+
<a class="btn btn-txt btn-wide row10 js-buyWizardPayCopy custCol-secondary"><i class="ion-clipboard"></i> <%= polyglot.t('buyFlow.CopyAddress') %></a>
41+
<a class="btn btn-txt btn-wide row10 js-buyWizardPayLink custCol-secondary"><i class="ion-link"></i> <%= polyglot.t('buyFlow.OpenAddress') %></a>
42+
<a class="btn btn-txt btn-wide js-buyWizardPayCheck custCol-secondary"><i class="ion-refresh"></i> <%= polyglot.t('buyFlow.RefreshPayment') %></a>
4343
<div class="rowTop10 txt-center note">
4444
<%= polyglot.t('buyFlow.paymentNote') %>
4545
</div>
@@ -84,7 +84,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
8484

8585
<!-- Airbitz -->
8686
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
87-
<div class="floatLeft marginRight10">
87+
<div class="floatLeft marginRight8">
8888
<a href="https://airbitz.co/bitcoin-wallet/" target="_blank">
8989
<img src="imgs/wallet-providers/airbitz.png" class="thumbnail thumbnail-large-slim " />
9090
</a>
@@ -102,7 +102,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
102102

103103
<!-- Coinbase -->
104104
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
105-
<div class="floatLeft marginRight10">
105+
<div class="floatLeft marginRight8">
106106
<a href="https://www.coinbase.com/signup" target="_blank">
107107
<img src="imgs/wallet-providers/coinbase.png" class="thumbnail thumbnail-large-slim " />
108108
</a>
@@ -120,7 +120,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
120120

121121
<!-- Samourai Wallet -->
122122
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
123-
<div class="floatLeft marginRight10">
123+
<div class="floatLeft marginRight8">
124124
<a href="http://samouraiwallet.com/" target="_blank">
125125
<img src="imgs/wallet-providers/samourai-wallet.png" class="thumbnail thumbnail-large-slim " />
126126
</a>
@@ -138,7 +138,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
138138

139139
<!-- RushWallet -->
140140
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
141-
<div class="floatLeft marginRight10">
141+
<div class="floatLeft marginRight8">
142142
<a href="https://rushwallet.com/" target="_blank">
143143
<img src="imgs/wallet-providers/rush-wallet.png" class="thumbnail thumbnail-large-slim " />
144144
</a>
@@ -156,7 +156,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
156156

157157
<!-- Breadwallet -->
158158
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
159-
<div class="floatLeft marginRight10">
159+
<div class="floatLeft marginRight8">
160160
<a href="http://breadwallet.com/" target="_blank">
161161
<img src="imgs/wallet-providers/bread-wallet.png" class="thumbnail thumbnail-large-slim " />
162162
</a>
@@ -174,7 +174,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
174174

175175
<!-- Mycelium -->
176176
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
177-
<div class="floatLeft marginRight10">
177+
<div class="floatLeft marginRight8">
178178
<a href="https://mycelium.com/mycelium-wallet.html" target="_blank">
179179
<img src="imgs/wallet-providers/mycelium.png" class="thumbnail thumbnail-large-slim " />
180180
</a>
@@ -193,7 +193,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
193193

194194
<!-- Blockchain.info -->
195195
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
196-
<div class="floatLeft marginRight10">
196+
<div class="floatLeft marginRight8">
197197
<a href="https://blockchain.info/wallet" target="_blank">
198198
<img src="imgs/wallet-providers/blockchaininfo.png" class="thumbnail thumbnail-large-slim " />
199199
</a>
@@ -211,7 +211,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
211211

212212
<!-- Coinkite -->
213213
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
214-
<div class="floatLeft marginRight10">
214+
<div class="floatLeft marginRight8">
215215
<a href="https://coinkite.com/promo/nwt1" target="_blank">
216216
<img src="imgs/wallet-providers/coinkite.png" class="thumbnail thumbnail-large-slim " />
217217
</a>
@@ -229,7 +229,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
229229

230230
<!-- BitGo -->
231231
<div class="width100 table padding15 borderBottom1 custCol-border js-bitcoinWalletProvider">
232-
<div class="floatLeft marginRight10">
232+
<div class="floatLeft marginRight8">
233233
<a href="https://www.bitgo.com/wallet" target="_blank">
234234
<img src="imgs/wallet-providers/bitgo.png" class="thumbnail thumbnail-large-slim " />
235235
</a>

‎js/templates/transactionModal.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,35 +65,35 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
6565
</div>
6666
</div>
6767
<% } else if(ob.status > 0) { %>
68-
<div class="positionTop padding10 width100 custCol-primary">
68+
<div class="positionTop padding10 width100 custCol-secondary borderRadiusTop">
6969
<div class="clearfix">
7070
<% if(ob.status == 1 && ob.transactionType == "sales"){ %>
71-
<a class="btn btn-txt custCol-secondary pull-left borderRight textOpacity1 js-showConfirmForm custCol-border" style="border-top-right-radius: 0; border-bottom-right-radius: 0">
71+
<a class="btn btn-txt custCol-primary pull-left borderRight textOpacity1 js-showConfirmForm custCol-border" style="border-top-right-radius: 0; border-bottom-right-radius: 0">
7272
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
7373
<% if(ob.vendor_offer.listing.metadata.category == "digital good" || ob.vendor_offer.listing.metadata.category == "service") { %>
7474
<%= polyglot.t('transactions.ConfirmOrder') %>
7575
<% } else { %>
7676
<%= polyglot.t('transactions.MarkAsShipped') %>
7777
<% } %>
7878
</a>
79-
<a class="btn btn-txt custCol-secondary pull-left textOpacity1 js-refundTransaction tooltip"
79+
<a class="btn btn-txt custCol-primary pull-left textOpacity1 js-refundTransaction tooltip"
8080
data-tooltip="<%= polyglot.t('transactions.RefundOrderTooltip') %>" style="border-top-left-radius: 0; border-bottom-left-radius: 0">
8181
<span class="ion-arrow-return-left fontSize11 marginRight2 textOpacity1"></span>
8282
<%= polyglot.t('transactions.RefundOrder') %>
8383
</a>
8484
<% } else if(ob.transactionType == "purchases" && ob.status == 2){ %>
85-
<a class="btn btn-txt custCol-secondary pull-left js-showCompleteForm textOpacity1">
85+
<a class="btn btn-txt custCol-primary pull-left js-showCompleteForm textOpacity1">
8686
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
8787
<%= polyglot.t('transactions.CompleteOrder') %>
8888
</a>
8989
<% } else if(ob.transactionType == "sales" && ob.status == 2){ %>
90-
<a class="btn btn-txt custCol-secondary pull-left js-confirmOrderResend textOpacity1 tooltip tooltip-box"
90+
<a class="btn btn-txt custCol-primary pull-left js-confirmOrderResend textOpacity1 tooltip tooltip-box"
9191
data-tooltip="<%= polyglot.t('transactions.ConfirmOrderResendTooltip') %>">
9292
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
9393
<%= polyglot.t('transactions.ConfirmOrderResend') %>
9494
</a>
9595
<% } else if(ob.transactionType == "purchases" && !ob.resendComplete && ob.status == 3){ %>
96-
<a class="btn btn-txt custCol-secondary pull-left js-completeOrderResend textOpacity1 tooltip tooltip-box marginRight5"
96+
<a class="btn btn-txt custCol-primary pull-left js-completeOrderResend textOpacity1 tooltip tooltip-box marginRight5"
9797
data-tooltip="<%= polyglot.t('transactions.CompleteOrderResendTooltip') %>">
9898
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
9999
<%= polyglot.t('transactions.CompleteOrderResend') %>
@@ -104,24 +104,24 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
104104
ob.dispute_resolution &&
105105
ob.dispute_resolution.resolution &&
106106
ob.dispute_resolution.resolution.buyer_payout > ob.dispute_resolution.resolution.vendor_payout){ %>
107-
<a class="btn btn-txt custCol-secondary pull-left js-showCompleteForm textOpacity1">
107+
<a class="btn btn-txt custCol-primary pull-left js-showCompleteForm textOpacity1">
108108
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
109109
<%= polyglot.t('transactions.LeaveReview') %>
110110
</a>
111111
<% } else if(ob.status == 5 && ob.dispute_resolution && ob.transactionType != "cases"){ %>
112-
<a class="btn btn-txt custCol-secondary pull-left row10 js-acceptResolution">
112+
<a class="btn btn-txt custCol-primary pull-left row10 js-acceptResolution">
113113
<span class="ion-checkmark fontSize11 marginRight2 textOpacity1"></span>
114114
<%= polyglot.t('transactions.AcceptDisputeResolution') %>
115115
</a>
116116
<% } else if(ob.status == 7 && ob.transactionType == "sales"){ %>
117-
<a class="btn btn-txt custCol-secondary pull-left textOpacity1 js-refundTransactionResend tooltip tooltip-box"
117+
<a class="btn btn-txt custCol-primary pull-left textOpacity1 js-refundTransactionResend tooltip tooltip-box"
118118
data-tooltip="<%= polyglot.t('transactions.RefundOrderResendTooltip') %>">
119119
<span class="ion-arrow-return-left fontSize11 marginRight2 textOpacity1"></span>
120120
<%= polyglot.t('transactions.RefundOrderResend') %>
121121
</a>
122122
<% } %>
123123
<% if(ob.status != 0){ %>
124-
<a class="btn btn-txt custCol-secondary pull-right js-transactionShowContract textOpacity1">
124+
<a class="btn btn-txt custCol-primary pull-right js-transactionShowContract textOpacity1">
125125
<span class="fontSize12 ion-code"></span>
126126
<%= polyglot.t('transactions.ContractDetails') %>
127127
</a>

‎js/templates/userPage.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<div class="pad20 rowTop20 width100"><h2 class="txt-center"><% polyglot.t('LoadingImage') %></h2></div>
1414
</div>
1515
<input type="range" class="cropit-image-zoom-input hCentered rowTop20 js-bannerRangeInput hide" />
16-
<label for="headerImageInput" class="btn btn-c1 btn-txt rowTop20 fullCentered js-pageCustomizationButtons colorWhiteForce btn-upload-cover-photo">
16+
<label for="headerImageInput" class="btn btn-c1 btn-txt rowTop20 fullCentered js-pageCustomizationButtons colorWhiteForce btn-upload-cover-photo custCol-primary">
1717
<span class="ion-qr-scanner fontSize11 marginRight2 textOpacity1"></span>
18-
<%= polyglot.t('UploadCoverPhoto') %> (959px x 400px)
18+
<%= polyglot.t('UploadCoverPhoto') %> (950px x 400px)
1919
</label>
2020
<input id="headerImageInput" type="file" class="cropit-image-input hide" />
2121
<div class="bar navBar barFlush user-page-navigation positionBottom">

0 commit comments

Comments
 (0)