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

Commit f28e732

Browse files
committed
some additional tweaks
1 parent 1840f97 commit f28e732

File tree

5 files changed

+38
-32
lines changed

5 files changed

+38
-32
lines changed

css/obBase.css

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ form {
205205
#appBar {
206206
position: fixed;
207207
width: 100%;
208-
z-index: 13;
208+
z-index: 14;
209209
background-color: #327EB8;
210210
padding: 10px 8px;
211211
box-sizing: border-box;
@@ -224,7 +224,7 @@ form {
224224

225225
#pageNav {
226226
position: fixed;
227-
top: 25px;
227+
top: 26px;
228228
-webkit-app-region: no-drag;
229229
z-index: 13;
230230
}
@@ -259,7 +259,7 @@ form {
259259
#sideBar {
260260
position: fixed;
261261
right: -183px;
262-
top: 75px;
262+
top: 76px;
263263
width:230px;
264264
background-color: #252525;
265265
border-left: 0;
@@ -1056,24 +1056,32 @@ label.fieldItem {
10561056
display: block;
10571057
width: 100%;
10581058
height: 100%;
1059-
top: 0;
1059+
top: 35px;
10601060
left: 0;
10611061
transition: opacity .05s cubic-bezier(0, 0, 0.2, 1),
10621062
width 0.5s ease;
10631063
padding-top: 25px;
10641064
z-index: 1;
10651065
}
10661066

1067-
#ov1.chatLoaded .modal:not(.modal-cover-fullscreen) {
1067+
.modal:not(.modal-cover-fullscreen) {
10681068
width: calc(100% - 45px);
10691069
}
10701070

10711071
#ov1.chatOpen .modal:not(.modal-cover-fullscreen) {
10721072
width: calc(100% - 230px);
10731073
}
10741074

1075+
/*#ov1.chatLoaded .modal:not(.modal-cover-fullscreen) {
1076+
width: calc(100% - 45px);
1077+
}
1078+
1079+
#ov1.chatOpen .modal:not(.modal-cover-fullscreen) {
1080+
width: calc(100% - 230px);
1081+
}*/
1082+
10751083
.modal.modal-navOffset {
1076-
top: 50px;
1084+
top: 76px;
10771085
}
10781086

10791087
.modalHolder {
@@ -1474,31 +1482,31 @@ h5 {
14741482
.modal-opaque {
14751483
background-color: rgba(6, 55, 83, 0.80);
14761484
box-shadow: inset 0px -70px 112px -62px rgba(37,37,37,.9);
1477-
top: 50px;
1485+
top: 76px;;
14781486
}
14791487
14801488
.modal-opaqueDark {
14811489
background-color: rgba(25,25,25,0.9);
14821490
box-shadow: inset 0px -70px 112px -62px rgba(37,37,37,.9);
1483-
top: 50px;
1491+
top: 76px;
14841492
}
14851493
14861494
.modal-opaque.modal-navBlock {
1487-
background: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 50px, rgba(7,65,97,1) 51px);
1495+
background: linear-gradient(to bottom, rgba(0,0,0,0.2), rgba(0,0,0,0.2) 85px, rgba(7,65,97,1) 86px);
14881496
top: 0;
1489-
padding-top: 70px;
1497+
padding-top: 100px;
14901498
}
14911499
14921500
.modal-cover-fullscreen {
1493-
top: 0;
1501+
top: 26px;
14941502
}
14951503
14961504
.modal-cover-fullscreen .modal-childMain {
1497-
top: 50px;
1505+
top: 76px;
14981506
}
14991507
15001508
.modal-cover-fullscreen.modal.modal-navOffset .modal-childMain {
1501-
top: 0;
1509+
top: 35px;
15021510
}
15031511
15041512
.modal-childMain {
@@ -4350,8 +4358,16 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
43504358
z-index: 9;
43514359
}
43524360
4361+
#loadingModal {
4362+
padding-top: 0;
4363+
}
4364+
43534365
#loadingModal, .page-connect-modal.server-connect {
4354-
z-index: 14;
4366+
z-index: 13;
4367+
}
4368+
4369+
#loadingModal .spinner-with-logo, .page-connect-modal .spinner-with-logo {
4370+
margin-top: -37px;
43554371
}
43564372
43574373
#ov1 #loadingModal.hide {
@@ -4366,7 +4382,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
43664382
right: 0;
43674383
left: 0;
43684384
top: 50%;
4369-
margin-top: 120px;
4385+
margin-top: 81px;
43704386
opacity: 1;
43714387
transition: opacity 1s 5s ease;
43724388
box-sizing: border-box;
@@ -4614,7 +4630,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
46144630
padding-top: 20px;
46154631
-webkit-app-region: no-drag;
46164632
position: relative;
4617-
top: 85px;
4633+
top: 76px;
46184634
box-sizing: border-box;
46194635
}
46204636

@@ -4664,15 +4680,6 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
46644680
height: 100%;
46654681
}
46664682

4667-
.page-connect-modal .spinner-with-logo {
4668-
/*
4669-
so it lines up with the loading modal,
4670-
otherwise there's a jump when this guy loads
4671-
right after the loading one.
4672-
*/
4673-
margin-top: -37px;
4674-
}
4675-
46764683
.page-connect-modal .spinner-with-logo .icon-no-connection {
46774684
top: 18px;
46784685
left: 22px;

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h2 class="ion-android-close custCol-text clickable"></h2>
4444
<div id="pageNav" class="bar navBar navBar-main custCol-secondary padding0"></div>
4545
<div id="appBar" class="top0 alignCenter custCol-secondary"></div>
4646
<!-- the loading modal must be on top of the page nav or the reload button is hidden -->
47-
<div id="loadingModal" class="modal modal-opaque modal-cover-fullscreen js-loadingModal hide">
47+
<div id="loadingModal" class="modal modal-opaque js-loadingModal hide">
4848
<div class="spinner-with-logo fullCentered">
4949
<i class="ion-android-sync spinner fontSize30 spinner-with-logo-icon"></i>
5050
</div>

js/start.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ if (process.platform === 'darwin') {
7979
platformClass = `platform-${process.platform}`
8080
}
8181

82-
// $html.addClass(platformClass);
83-
$html.addClass('platform-win');
82+
$html.addClass(platformClass);
8483

8584
//put language in the window so all templates and models can reach it. It's especially important in formatting currency.
8685
//retrieve the stored value, since user is a blank model at this point

js/templates/appBar.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<div class="windowControls ctrlGroup">
2-
<a class="btn btn-win btn-winClose js-navClose tooltip <% ob.platform === 'darwin' && print('tooltip-left') %>" data-tooltip="<% print(polyglot.t(ob.launchedFromInstaller ? 'ClosingOpenBazaar' : 'ClosingOpenBazaarNonInstaller')) %>">
2+
<a class="btn btn-win btn-winClose js-navClose tooltip <% ob.platform === 'win32' && print('tooltip-left') %>" data-tooltip="<% print(polyglot.t(ob.launchedFromInstaller ? 'ClosingOpenBazaar' : 'ClosingOpenBazaarNonInstaller')) %>">
33
<div class="btn-win-icon ion-ios-close-empty"></div>
44
</a>
5-
<a class="btn btn-win btn-winMin js-navMin tooltip <% ob.platform === 'darwin' && print('tooltip-left') %>" data-tooltip="<%= polyglot.t('Minimize') %>">
5+
<a class="btn btn-win btn-winMin js-navMin tooltip <% ob.platform === 'win32' && print('tooltip-left') %>" data-tooltip="<%= polyglot.t('Minimize') %>">
66
<div class="btn-win-icon ion-ios-minus-empty"></div>
77
</a>
8-
<a class="btn btn-win btn-winMax js-navMax tooltip <% ob.platform === 'darwin' && print('tooltip-left') %>" data-tooltip="<%= polyglot.t('Maximize') %>">
8+
<a class="btn btn-win btn-winMax js-navMax tooltip <% ob.platform === 'win32' && print('tooltip-left') %>" data-tooltip="<%= polyglot.t('Maximize') %>">
99
<div class="btn-win-icon ion-ios-plus-empty"></div>
1010
</a>
1111
</div>

main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ app.on('ready', function() {
565565
// Create the browser window.
566566
mainWindow = new browserWindow({
567567
"width": 1200,
568-
"height": 720,
568+
"height": 755,
569569
"minWidth": 1024,
570570
"minHeight": 700,
571571
"center": true,

0 commit comments

Comments
 (0)