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

Commit ac7f278

Browse files
rmisiormisio
committed
Merge branch 'master' into server-configs
2 parents 07f3170 + 0303040 commit ac7f278

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3229
-2247
lines changed

‎css/obBase.css‎

Lines changed: 75 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -587,20 +587,21 @@ form {
587587
position: relative;
588588
background-position: center;
589589
background-size: cover;
590-
border-radius: 3px;
590+
background-repeat: no-repeat;
591+
border-radius: 2px;
591592
height: 230px;
592593
width: 250px;
593594
}
594595

595596
.itemImg.itemImg-large {
596597
/* flex row collapses unless a specific height is set */
597-
height: 380px;
598-
width: 100%;
598+
height: 472px;
599+
width: 514px;
599600
border-radius: 0;
600601
}
601602

602603
.itemImg.itemImg-small {
603-
height: 82px;
604+
height: 111px;
604605
width: 121px;
605606
margin: 0 10px 10px 0;
606607
border-radius: 1px;
@@ -2583,11 +2584,6 @@ div.chatSearchOut .chatSearchIcon {
25832584
border-top-right-radius: 0;
25842585
}
25852586

2586-
.btn.btn-back:before,
2587-
.btn.btn-fwd:before {
2588-
opacity: 0.3;
2589-
}
2590-
25912587
.btn.btn-back.active:before,
25922588
.btn.btn-fwd.active:before {
25932589
opacity: 1;
@@ -4371,6 +4367,10 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
43714367
border-color: #616161;
43724368
}
43734369

4370+
#ov1 .medium-editor-toolbar {
4371+
background: #353443;
4372+
}
4373+
43744374
#ov1::-webkit-scrollbar {
43754375
display: none;
43764376
box-sizing: border-box;
@@ -4720,10 +4720,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
47204720
outline: 2px solid #fff;
47214721
}
47224722

4723-
#ov1 .borderRadiusTop {
4724-
border-radius: 3px;
4725-
}
4726-
47274723
#ov1 .borderRadiusTop {
47284724
border-top-left-radius: 3px;
47294725
border-top-right-radius: 3px;
@@ -5662,6 +5658,15 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
56625658
opacity: 0.7;
56635659
}
56645660

5661+
#ov1 .disabled-icon {
5662+
pointer-events: none;
5663+
}
5664+
5665+
#ov1 .disabled-icon:before,
5666+
#ov1 .disabled [class *= "ion-"]:before {
5667+
opacity: 0.2;
5668+
}
5669+
56655670
#ov1 .overflowVisible {
56665671
overflow: visible;
56675672
}
@@ -5682,15 +5687,19 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
56825687
-webkit-filter: blur(20px) grayscale(1) contrast(0.5);
56835688
}
56845689

5690+
56855691
#ov1 .fadeOut {
56865692
opacity: 0;
56875693
pointer-events: none;
5694+
transition: opacity .3s cubic-bezier(0, 0, 0.2, 1);
56885695
}
56895696

56905697
#ov1 .foldIn {
56915698
height: 0;
5699+
padding: 0;
56925700
overflow: hidden;
5693-
transition: height 1s;
5701+
transition: height 1s, padding 1s;
5702+
pointer-events: none;
56945703
}
56955704

56965705
#ov1 .underline {
@@ -5867,8 +5876,11 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
58675876
border-bottom: 1px solid #444;
58685877
}
58695878

5879+
#ov1.notFancy .fadeOut,
58705880
#ov1.notFancy .statusBar.fadeOut,
58715881
#ov1.notFancy #pageNav .statusBar.fadeOut,
5882+
#ov1.notFancy #userPage .fadeOut,
5883+
#ov1.notFancy #userPage #pageNav .fadeOut,
58725884
#ov1.notFancy #userPage #pageNav .statusBar.fadeOut,
58735885
#ov1.notFancy #userPage #obContainer #content .statusBar.fadeOut {
58745886
opacity: 0 !important;
@@ -5931,7 +5943,55 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
59315943

59325944
#ov1.notFancy .notFancyDarkBackground,
59335945
#ov1.notFancy #obContainer .notFancyDarkBackground {
5934-
background: #262626;
5946+
background: #262626 !important;
5947+
}
5948+
5949+
#ov1.notFancy .disabled,
5950+
#ov1.notFancy #userPage .disabled,
5951+
#ov1.notFancy #obContainer .disabled,
5952+
#ov1.notFancy #overlay .disabled,
5953+
#ov1.notFancy #sideBar .disabled,
5954+
#ov1.notFancy #pageNav .disabled,
5955+
#ov1.notFancy #modalHolder .disabled,
5956+
#ov1.notFancy #messageModal .disabled,
5957+
#ov1.notFancy #statusBar .disabled {
5958+
opacity: 0.2 !important;
5959+
}
5960+
5961+
#ov1.notFancy .disabled2,
5962+
#ov1.notFancy #userPage .disabled2,
5963+
#ov1.notFancy #obContainer .disabled2,
5964+
#ov1.notFancy #overlay .disabled2,
5965+
#ov1.notFancy #sideBar .disabled2,
5966+
#ov1.notFancy #pageNav .disabled2,
5967+
#ov1.notFancy #modalHolder .disabled2,
5968+
#ov1.notFancy #messageModal .disabled2,
5969+
#ov1.notFancy #statusBar .disabled2 {
5970+
opacity: 0.7 !important;
5971+
}
5972+
5973+
/* add a shadow and a glow, so modal close buttons are still barely visible if the user picks a bad color */
5974+
#ov1 .js-closeIndexModal [class *= "ion-"]:before,
5975+
#ov1 #userPage .js-closeIndexModal [class *= "ion-"]:before,
5976+
#ov1 #obContainer .js-closeIndexModal [class *= "ion-"]:before,
5977+
#ov1 #modalHolder .js-closeIndexModal [class *= "ion-"]:before,
5978+
#ov1 #messageModal .js-closeIndexModal [class *= "ion-"]:before,
5979+
#ov1.notFancy .js-closeIndexModal [class *= "ion-"]:before,
5980+
#ov1.notFancy #userPage .js-closeIndexModal [class *= "ion-"]:before,
5981+
#ov1.notFancy #obContainer .js-closeIndexModal [class *= "ion-"]:before,
5982+
#ov1.notFancy #modalHolder .js-closeIndexModal [class *= "ion-"]:before,
5983+
#ov1.notFancy #messageModal .js-closeIndexModal [class *= "ion-"]:before,
5984+
#ov1 .js-modal-close [class *= "ion-"]:before,
5985+
#ov1 #userPage .js-modal-close [class *= "ion-"]:before,
5986+
#ov1 #obContainer .js-modal-close [class *= "ion-"]:before,
5987+
#ov1 #modalHolder .js-modal-close [class *= "ion-"]:before,
5988+
#ov1 #messageModal .js-modal-close [class *= "ion-"]:before,
5989+
#ov1.notFancy .js-modal-close [class *= "ion-"]:before,
5990+
#ov1.notFancy #userPage .js-modal-close [class *= "ion-"]:before,
5991+
#ov1.notFancy #obContainer .js-modal-close [class *= "ion-"]:before,
5992+
#ov1.notFancy #modalHolder .js-modal-close [class *= "ion-"]:before,
5993+
#ov1.notFancy #messageModal .js-modal-close [class *= "ion-"]:before{
5994+
text-shadow: 0 0 1px rgba(0,0,0,1), 0 0 2px rgba(255,255,255, 1) !important;
59355995
}
59365996

59375997
/* hide unfinished elements */

‎index.html‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
4040
</div>
4141
</div>
4242
</div>
43+
<!--
4344
<div class="modal modal-opaque hide js-loadingMessageModal">
4445
<div class="modal-child modal-childMain">
4546
<div class="btn-corner btn-cornerTR js-closeIndexModal">
@@ -71,15 +72,17 @@ <h2 class="txt-center">
7172
</div>
7273
</div>
7374
</div>
75+
-->
7476
<div id="statusBar"></div>
7577
<div id="pageNav" class="bar navBar navBar-main custCol-secondary padding0"></div>
7678
<!-- the loading modal must be on top of the page nav or the reload button is hidden -->
7779
<div id="loadingModal" class="modal modal-opaque js-loadingModal top0 hide">
7880
<div class="spinner-with-logo fullCentered">
7981
<i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
8082
</div>
81-
<div class="rowTop20">
82-
<a class="btn btn-txt btn-corner btn-cornerTR js-indexReload"><i class="ion-android-sync"></i> Reload</a>
83+
<div class="width100 positionTop">
84+
<a class="btn btn-txt rowTop10 marginRight10 pull-right js-indexReload"><i class="ion-android-sync"></i> <span class="js-translate" data-translate="Reload"></span></a>
85+
<a class="btn btn-txt rowTop10 marginRight10 pull-right" href="#home"><i class="ion-home"></i> <span class="js-translate" data-translate="LoadIndex"></span></a>
8386
</div>
8487
</div>
8588

@@ -89,6 +92,13 @@ <h2 class="txt-center">
8992
<script>
9093
var app = require('./js/main'),
9194
remote = require('remote');
95+
96+
window.translateIndex = function(){
97+
$('.js-translate').each(function() {
98+
$(this).text(polyglot.t($(this).data("translate")));
99+
});
100+
};
101+
translateIndex();
92102
$('.js-closeIndexModal').on('click', function(){
93103
$(this).closest('.modal').addClass('hide');
94104
});

‎js/languages/da.json‎

Lines changed: 57 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"of": "af",
2424
"Sell": "Sælg",
2525
"New": "Ny",
26-
"HighlightToStyle": "Highlight text to style",
26+
"HighlightToStyle": "Markér tekst for at formattere",
2727
"Excellent": "Fremragende",
2828
"Good": "God",
2929
"Poor": "Dårlig",
@@ -71,14 +71,14 @@
7171
"Welcome": "Velkommen",
7272
"CreateStore": "Opret en butik",
7373
"GoToMyPage": "Min side",
74-
"Random": "Random",
75-
"ShowOnlyFollowerListings": "Personalized",
76-
"TryRandom": "Try random mode to discover more",
77-
"ShowOnlyFollowerListingsTooltip": "View listings from stores I follow",
78-
"ShowAllListingsTooltip": "View random listings on the network",
79-
"ViewUnfilteredListings": "View Random Listings",
80-
"AllListingsWarning": "By deactivating personalized listings your Discover feed will be populated with random listings on the network. \n \n Please keep in mind that these listings may contain adult or illicit content and/or photos that may be offensive. \n \n If at any point you want to go back to viewing personalized listings, you can simply toggle the setting and your Discover feed will go back to normal.",
81-
"ShowUnlfilteredListings": "Show Random Listings",
74+
"Random": "Tilfældig",
75+
"ShowOnlyFollowerListings": "Brugerdefineret",
76+
"TryRandom": "Prøv tilfældighedstilstand for at opdage mere",
77+
"ShowOnlyFollowerListingsTooltip": "Vis listninger fra butikker, jeg følger",
78+
"ShowAllListingsTooltip": "Vis tilfældige listninger fra hele netværket",
79+
"ViewUnfilteredListings": "Vis tilfældige listninger",
80+
"AllListingsWarning": "Ved at deaktivere brugerdefinerede listninger vil dit Opdagelses-feed bestå af tilfældige listninger fra hele netværket.\n\nVær venligst opmærksom på, at disse listninger potentielt kan indeholde indhold for voksne eller ulovligt indhold og/eller billeder, der kan være stødende.\n\nHvis du på noget tidspunkt vil vende tilbage til brugerdefinerede listninger, kan du ganske simpelt genaktivere indstillingen, hvorefter dit Opdagelses-feed vil ændres tilbage til normalen.",
81+
"ShowUnlfilteredListings": "Vis tilfældige listninger",
8282
"SearchForItemsPlaceholder": "Skriv #games, #shoes eller et andet #tag…",
8383
"SearchForPagesPlaceholder": "Søg efter navn eller nøgleord",
8484
"SearchFeedPlaceholder": "Indtast et nøgleord…",
@@ -135,25 +135,25 @@
135135
"AddShipToRegion": "Region for forsendelse",
136136
"AddShipToRegionNote": "Tilføjer alle nationer i en region",
137137
"SelectRegion": "Tilføj en valgfri region",
138-
"AllRegions": "All countries",
139-
"EuropeanUnion": "European Union",
140-
"EuropeanEconomicArea": "European Economic Area",
138+
"AllRegions": "Alle lande",
139+
"EuropeanUnion": "EU, Den Europæiske Union",
140+
"EuropeanEconomicArea": "EØS, Det Europæiske Økonomiske Samarbejdsområde",
141141
"Optional": "Valgfri",
142142
"Customize": "Tilpas",
143143
"Save": "Gem",
144144
"Change": "Ændr",
145145
"Changes": "Ændringer",
146146
"SaveChanges": "Gem ændringer",
147147
"YourName": "Dit navn",
148-
"UseTestnet": "Use Testnet",
149-
"UseTestnetHelp": "If set to true, your client will use Testnet bitcoin addresses. Only set to true if your server was started with the -t testnet flag.",
148+
"UseTestnet": "Brug Testnet",
149+
"UseTestnetHelp": "Hvis aktiveret vil din klient bruge Testnet-Bitcoin-adresser. Aktivér kun hvis din server blev started med -t testnet-indstillingen.",
150150
"TestnetAddress": "Testnet-adresse",
151-
"TestnetAddressHelp": "Your client is set to use the Testnet, and will only allow Testnet addresses. To use the mainnet, and real Bitcoin, turn off the Testnet in Settings/Advanced, and make sure your server was not started with the -t testnet flag.",
151+
"TestnetAddressHelp": "Din klient er opsat til at bruge Testnet og vil kun tillade Testnet-adresser. For at bruge hovednettet og rigtige Bitcoin, skal du deaktivere Testnet i Indstillinger/Avanceret og sikre dig, at din server ikke blev startet med -t testnet-indstillingen.",
152152
"MustTestnetAddress": "Skal være en testnet-adresse",
153-
"BitcoinAddress": "Current Refund Address",
153+
"BitcoinAddress": "Aktuel refunderingsadresse",
154154
"BitcoinReturnAddress": "Indtast din Bitcoin-adresse",
155155
"BitcoinReturnAddressPlaceholder": "Indtast Bitcoin-adresse…",
156-
"BitcoinReturnAddressInfo": "If a refund is issued, the funds will need to be sent to a Bitcoin address. Please provide an address to your Wallet below. You must be able to access this address later to receive a refund.",
156+
"BitcoinReturnAddressInfo": "Hvis en refundering bliver udstedt, skal pengene sendes til en Bitcoin-adresse. Angiv venligst en adresse i din tegnebog herunder. Du skal være i stand til at tilgå denne adresse senere for at kunne modtage en refundering.",
157157
"LocalCurrency": "Lokal valuta",
158158
"TimeZone": "Tidszone",
159159
"ShipToName": "Modtagers navn",
@@ -299,7 +299,7 @@
299299
"NotProvided": "ikke angivet",
300300
"NotFollowingAnyone": "Følger ingen",
301301
"NoFollowers": "Ingen følgere",
302-
"NoReviews": "Ingen anmeldelser",
302+
"NoReviews": "Ingen bedømmelser",
303303
"NoDetailsSpecified": "Ingen detaljer angivet",
304304
"Moderator": "Moderator",
305305
"Moderator2": "Moderator:",
@@ -324,6 +324,8 @@
324324
"ModeratorFee": "Gebyr:",
325325
"PriceForOne": "Pris pr. enkelt vare, fil eller tjenesteydelse.",
326326
"Avatar": "Avatar",
327+
"AdditionalPaymentData": "Yderligere betalingsdata",
328+
"AdditionalPaymentDataInfo": "Include name of purchase and order number in payment QR code?",
327329
"firewall": {
328330
"Open": "Åben",
329331
"Restricted": "Begrænset",
@@ -428,7 +430,7 @@
428430
"RecievingAddressPlaceholder": "Bitcoin-adresse, du vil modtage betaling på",
429431
"Comments": "Kommentarer",
430432
"CommentsPlaceHolder": "Kommentarer til ordren, hvis du har nogen",
431-
"Shipper": "Vare afsendt af:",
433+
"Shipper": "Vare afsendt med:",
432434
"ShippedBy": "Afsendes af:",
433435
"ShipperPlaceholder": "Navnet på virksomheden, der afsender varen",
434436
"TrackingNumber": "Tracking-nummer:",
@@ -465,7 +467,7 @@
465467
"MatchedDescription": "Beskrivelsen passede:",
466468
"DeliverySpeed": "Leveringstid:",
467469
"CustomerService": "Kundeservice:",
468-
"Review": "Bedøm",
470+
"Review": "Bedømmelse",
469471
"ReviewPlaceHolder": "Din bedømmelse af denne handel",
470472
"NoFileProvided": "Ingen fil leveret",
471473
"None": "Ingen",
@@ -483,7 +485,7 @@
483485
"TotalInTransaction": "Handel:",
484486
"StartDisputeFlag": "Uenighed startet",
485487
"CloseDisputeFlag": "Uenighed afsluttet",
486-
"PayoutOnlyBuyer": "Closing this dispute will return all of the funds to the buyer, minus the Moderator fee, because the seller has not yet given their bitcoin payout address.",
488+
"PayoutOnlyBuyer": "Ved at lukke denne uenighed vil alle pengene blive returneret til køberen, undtaget moderatorgebyret, fordi sælgeren endnu ikke har angivet sin Bitcoin-udbetalingsadresse.",
487489
"UpdatingOrder": "Opdaterer din transaktion",
488490
"UpdateComplete": "Din transaktionsopdatering er fuldført",
489491
"UpdateFailed": "Din transaktionsopdatering blev ikke fuldført. Åbn transaktionen og prøv igen",
@@ -555,6 +557,7 @@
555557
"cases": "Sager",
556558
"notifications": "Notifikationer",
557559
"settings": "Indstillinger",
560+
"restart": "Genstart applikation",
558561
"about": "Om OpenBazaar",
559562
"support": "Støt OpenBazaar",
560563
"Forward": "Frem",
@@ -673,5 +676,38 @@
673676
"restoreDefaults": "Gendan standardværdier",
674677
"saveChanges": "Gæm ændringer",
675678
"retry": "Prøv forbindelse igen"
679+
},
680+
"timezones": {
681+
"-12": "(GMT -12:00) Eniwetok, Kwajalein",
682+
"-11": "(GMT -11:00) Midway Island, Samoa",
683+
"-10": "(GMT -10:00) Hawaii",
684+
"-9": "(GMT -9:00) Alaska",
685+
"-8": "(GMT -8:00) Pacific Time (USA & Canada)",
686+
"-7": "(GMT -7:00) Mountain Time (USA & Canada)",
687+
"-6": "(GMT -6:00) Central Time (USA & Canada), Mexico City",
688+
"-5": "(GMT -5:00) Eastern Time (USA & Canada), Bogota, Lima",
689+
"-4": "(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz",
690+
"-3.5": "(GMT -3:30) Newfoundland",
691+
"-3": "(GMT -3:00) Brasilien, Buenos Aires, Georgetown",
692+
"-2": "(GMT -2:00) Mid-Atlantic",
693+
"-1": "(GMT -1:00) Azorerne, Kap Verde",
694+
"0": "(GMT) Vesteuropæisk tid, London, Lissabon, Casablanca",
695+
"1": "(GMT +1:00) Bruxelles, København, Madrid, Paris",
696+
"2": "(GMT +2:00) Kaliningrad, Sydafrika",
697+
"3": "(GMT +3:00) Bagdad, Riyadh, Moskva, Sankt Petersborg",
698+
"3.5": "(GMT +3:30) Teheran",
699+
"4": "(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi",
700+
"4.5": "(GMT +4:30) Kabul",
701+
"5": "(GMT +5:00) Jekaterinburg, Islamabad, Karachi, Tasjkent",
702+
"5.5": "(GMT +5:30) Mumbai, Kolkata, Chennai, New Delhi",
703+
"5.75": "(GMT +5:45) Katmandu",
704+
"6": "(GMT +6:00) Almaty, Dhaka, Colombo",
705+
"7": "(GMT +7:00) Bangkok, Hanoi, Jakarta",
706+
"8": "(GMT +8:00) Beijing, Perth, Singapore, Hong Kong",
707+
"9": "(GMT +9:00) Tokyo, Seoul, Osaka, Sapporo, Jakutsk",
708+
"9.5": "(GMT +9:30) Adelaide, Darwin",
709+
"10": "(GMT +10:00) Østaustralien, Guam, Vladivostok",
710+
"11": "(GMT +11:00) Magadan, Salomonøerne, Ny Kaledonien",
711+
"12": "(GMT +12:00) Auckland, Wellington, Fiji, Kamtjatka"
676712
}
677713
}

0 commit comments

Comments
 (0)