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

Commit 6f3ad10

Browse files
committed
changes
1 parent 06c42ac commit 6f3ad10

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

css/obBase.css

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,7 @@ h6, .h6 {
481481
position: relative;
482482
min-height: 740px;
483483
margin-bottom: 50px;
484-
border-top-left-radius: 3px;
485-
border-top-right-radius: 3px;
484+
border-radius: 0;
486485
z-index: 0;
487486
box-shadow: 0 10px 20px #05283C;
488487
}
@@ -3601,10 +3600,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
36013600
}
36023601

36033602
.banner-large {
3604-
border-top-left-radius: 4px;
3605-
border-top-right-radius: 4px;
3606-
border-bottom-left-radius: 0;
3607-
border-bottom-right-radius: 0;
3603+
border-radius: 0;
36083604
background: 50% 50% / cover no-repeat;
36093605
height: 400px;
36103606
position: absolute;

js/languages/en-US.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"Delete": "Delete",
7474
"DontDelete": "Don't Delete",
7575
"ConfirmDelete": "Confirm Delete",
76+
"YesDelete": "Yes, delete",
7677
"Website": "Website",
7778
"Guid": "OpenBazaar ID",
7879
"Welcome": "Welcome",

js/templates/itemShort.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
<div class="gridItemOverlay custCol-primary custCol-border fadeOut js-deleteOverlay">
7373
<span>Are you sure?</span>
7474
<div>
75-
<a class="btn btn-txt custCol-secondary js-itemShortDeleteCancel">Cancel</a>
76-
<a class="btn btn-txt custCol-secondary js-itemShortDeleteConfirm">Yes</a>
75+
<a class="fontSize12 fontWeight400 textOpacity75 js-itemShortDeleteCancel"><%= polyglot.t('Cancel') %></a>
76+
<a class="btn btn-txt custCol-secondary marginLeft5 fontSize13 js-itemShortDeleteConfirm"><%= polyglot.t('YesDelete') %></a>
7777
</div>
7878
</div>
7979
</div>

js/templates/settings.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,7 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
11741174
<label>
11751175
<%= polyglot.t('NoFancyStyles') %>
11761176
</label>
1177+
<i class="ion-help-circled tooltip tooltip-box" data-tooltip="<%= polyglot.t('NoFancyStylesWarning') %>"></i>
11771178
</div>
11781179
</div>
11791180

@@ -1186,9 +1187,6 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Advanced') %></h3>
11861187
<input type="radio" class="fieldItem" id="fancyStylesNo" name="minEffects" value="false" checked/>
11871188
<label for="fancyStylesNo" class="radioLabel"><%= polyglot.t('No') %></label>
11881189
</div>
1189-
<div class="flexCol-8">
1190-
<div class="marginLeft10 textSize11px txt-fade"><%= polyglot.t('NoFancyStylesWarning') %></div>
1191-
</div>
11921190
</div>
11931191
</div>
11941192
</div>

js/templates/transactions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h1 class="fancy-heading fontSize20 vCentered colorWhiteForce textShadow"><%= po
4242
</a>
4343
<% } %>
4444
<div class="flexExpand marginRight10">
45-
<a class="btn btn-txt pull-right custCol-primary js-downloadCSV"><i class="ion-archive fontSize12"></i><%= polyglot.t('ExportCSV') %></a>
45+
<a class="btn btn-txt pull-right custCol-primary js-downloadCSV"><i class="ion-archive fontSize12"></i><%= polyglot.t('transactions.ExportCSV') %></a>
4646
</div>
4747
</div>
4848

0 commit comments

Comments
 (0)