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

Commit 3045beb

Browse files
Dekker3DDekker3D
committed
2 parents 9442900 + 4201828 commit 3045beb

File tree

11 files changed

+66
-206
lines changed

11 files changed

+66
-206
lines changed

‎css/obBase.css‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3442,10 +3442,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
34423442
border-bottom: 0;
34433443
}
34443444

3445-
.capitalize {
3446-
text-transform: capitalize;
3447-
}
3448-
34493445
.shadow-inner1-ultra-light {
34503446
box-shadow: inset 0px -130px 112px -52px rgba(25,25,25,.35);
34513447
}
@@ -3678,6 +3674,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
36783674
.spinner-with-logo {
36793675
background: url('../imgs/icon-with-opening.png') 100% 100%;
36803676
background-size: cover;
3677+
background-repeat: no-repeat;
36813678
width: 215px;
36823679
height: 215px;
36833680
position: relative;

‎js/languages/en-US.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,5 +675,38 @@
675675
"restoreDefaults": "Restore defaults",
676676
"saveChanges": "Save Changes",
677677
"retry": "Retry connection"
678+
},
679+
"timezones": {
680+
"-12": "(GMT -12:00) Eniwetok, Kwajalein",
681+
"-11": "(GMT -11:00) Midway Island, Samoa",
682+
"-10": "(GMT -10:00) Hawaii",
683+
"-9": "(GMT -9:00) Alaska",
684+
"-8": "(GMT -8:00) Pacific Time (US & Canada)",
685+
"-7": "(GMT -7:00) Mountain Time (US & Canada)",
686+
"-6": "(GMT -6:00) Central Time (US & Canada), Mexico City",
687+
"-5": "(GMT -5:00) Eastern Time (US & Canada), Bogota, Lima",
688+
"-4": "(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz",
689+
"-3.5": "(GMT -3:30) Newfoundland",
690+
"-3": "(GMT -3:00) Brazil, Buenos Aires, Georgetown",
691+
"-2": "(GMT -2:00) Mid-Atlantic",
692+
"-1": "(GMT -1:00) Azores, Cape Verde Islands",
693+
"0": "(GMT) Western Europe Time, London, Lisbon, Casablanca",
694+
"1": "(GMT +1:00) Brussels, Copenhagen, Madrid, Paris",
695+
"2": "(GMT +2:00) Kaliningrad, South Africa",
696+
"3": "(GMT +3:00) Baghdad, Riyadh, Moscow, St. Petersburg",
697+
"3.5": "(GMT +3:30) Tehran",
698+
"4": "(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi",
699+
"4.5": "(GMT +4:30) Kabul",
700+
"5": "(GMT +5:00) Ekaterinburg, Islamabad, Karachi, Tashkent",
701+
"5.5": "(GMT +5:30) Bombay, Calcutta, Madras, New Delhi",
702+
"5.75": "(GMT +5:45) Kathmandu",
703+
"6": "(GMT +6:00) Almaty, Dhaka, Colombo",
704+
"7": "(GMT +7:00) Bangkok, Hanoi, Jakarta",
705+
"8": "(GMT +8:00) Beijing, Perth, Singapore, Hong Kong",
706+
"9": "(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Yakutsk",
707+
"9.5": "(GMT +9:30) Adelaide, Darwin",
708+
"10": "(GMT +10:00) Eastern Australia, Guam, Vladivostok",
709+
"11": "(GMT +11:00) Magadan, Solomon Islands, New Caledonia",
710+
"12": "(GMT +12:00) Auckland, Wellington, Fiji, Kamchatka"
678711
}
679712
}

‎js/templates/blockedUser.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="marginLeft15 marginTop2 clearFix">
66
<% if(ob.name) { %>
77
<div class="floatLeft noOverflow marginBottom2 marginRight5">
8-
<a class="textSize16px capitalize" title="<%= ob.name %>" href="<% print('#userPage/' + ob.guid + '/store') %>">
8+
<a class="textSize16px" title="<%= ob.name %>" href="<% print('#userPage/' + ob.guid + '/store') %>">
99
<%= ob.name %>
1010
</a>
1111
</div>

‎js/templates/buyWizard.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
8787
</div>
8888
<div class="floatLeft width420 marginTop4">
8989
<div class="clearfix">
90-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
90+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
9191
<a href="https://airbitz.co/bitcoin-wallet/" class="js-externalLink textOpacity1">Airbitz <span class="ion-android-open fontSize10"></span></a>
9292
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.WalletOnly') %></span>
9393
</div>
@@ -105,7 +105,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
105105
</div>
106106
<div class="floatLeft width420 marginTop4">
107107
<div class="clearfix">
108-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
108+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
109109
<a href="https://www.coinbase.com/signup" class="js-externalLink textOpacity1">Coinbase <span class="ion-android-open fontSize10"></span></a>
110110
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.ExchangeAndWallet') %></span>
111111
</div>
@@ -123,7 +123,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
123123
</div>
124124
<div class="floatLeft width420 marginTop4">
125125
<div class="clearfix">
126-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
126+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
127127
<a href="http://samouraiwallet.com/" class="js-externalLink textOpacity1">Samourai Wallet <span class="ion-android-open fontSize10"></span></a>
128128
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.WalletOnly') %></span>
129129
</div>
@@ -141,7 +141,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
141141
</div>
142142
<div class="floatLeft width420 marginTop4">
143143
<div class="clearfix">
144-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
144+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
145145
<a href="https://rushwallet.com/" class="js-externalLink textOpacity1">RushWallet <span class="ion-android-open fontSize10"></span></a>
146146
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.WalletOnly') %></span>
147147
</div>
@@ -159,7 +159,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
159159
</div>
160160
<div class="floatLeft width420 marginTop4">
161161
<div class="clearfix">
162-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
162+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
163163
<a href="http://breadwallet.com/" class="js-externalLink textOpacity1">Breadwallet <span class="ion-android-open fontSize10"></span></a>
164164
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.WalletOnly') %></span>
165165
</div>
@@ -177,7 +177,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
177177
</div>
178178
<div class="floatLeft width420 marginTop4">
179179
<div class="clearfix">
180-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
180+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
181181
<a href="https://mycelium.com/mycelium-wallet.html" class="js-externalLink textOpacity1">Mycelium <span class="ion-android-open fontSize10"></span></a>
182182
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.WalletOnly') %></span>
183183

@@ -196,7 +196,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
196196
</div>
197197
<div class="floatLeft width420 marginTop4">
198198
<div class="clearfix">
199-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
199+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
200200
<a href="https://blockchain.info/wallet" class="js-externalLink textOpacity1">Blockchain.info <span class="ion-android-open fontSize10"></span></a>
201201
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.ExchangeAndWallet') %></span>
202202
</div>
@@ -214,7 +214,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
214214
</div>
215215
<div class="floatLeft width420 marginTop4">
216216
<div class="clearfix">
217-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
217+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
218218
<a href="https://coinkite.com/promo/nwt1" class="js-externalLink textOpacity1">Coinkite <span class="ion-android-open fontSize10"></span></a>
219219
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.WalletOnly') %></span>
220220
</div>
@@ -232,7 +232,7 @@ <h2 class="margin0 marginTop80"><%= polyglot.t('buyFlow.HaveWallet') %></h2>
232232
</div>
233233
<div class="floatLeft width420 marginTop4">
234234
<div class="clearfix">
235-
<div class="capitalize marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
235+
<div class="marginBottom2 marginRight5 lineHeight21 textOpacity1 fontSize15">
236236
<a href="https://www.bitgo.com/wallet" class="js-externalLink textOpacity1">BitGo <span class="ion-android-open fontSize10"></span></a>
237237
<span class="textOpacity50 fontSize12"><%= polyglot.t('walletProviders.WalletOnly') %></span>
238238
</div>

‎js/templates/itemEdit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ <h5><%= polyglot.t('Shipping') %></h5>
201201
</div>
202202
<div class="flexCol-8">
203203
<div class="fieldItem padding0 js-shipToWrapper">
204-
<div class="fieldItem-selectWrapper noIcon">
204+
<div class="fieldItem-selectWrapper noIcon positionWrapper">
205205
<select name="ships_to" class="chosen custCol-text" id="shipsTo" multiple required>
206206
</select>
207207
</div>

0 commit comments

Comments
 (0)