Skip to content
This repository was archived by the owner on Feb 22, 2024. It is now read-only.

Commit b234369

Browse files
authored
Merge pull request #1398 from cakasuma/amam/fix_first_min_max
Amam/fix first min max
2 parents d87e9e1 + 381f345 commit b234369

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

src/main.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,10 @@ label.checkbox input:checked ~ span.check {
603603
z-index: +1;
604604
}
605605

606+
.ui-icon-caret-1-e {
607+
left: auto !important;
608+
}
609+
606610
.ui-icon-caret-1-e:after {
607611
content: "»";
608612
font-family: roboto, sans-serif !important;

src/navigation/navigation.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
nav {
2-
position: fixed;
32
width: 100%;
4-
z-index: 3000;
53

64
#topbar {
75
width: 100%;

src/windows/windows.es6

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -331,27 +331,15 @@ export const createBlankWindow = function($html,options) {
331331
dialog.on('dragstop', () => {
332332
const top = dialog.offset().top;
333333
const left = dialog.offset().left;
334-
const nav_head = $('nav').height();
335-
if(top < nav_head) {
336-
dialog.animate({ top: nav_head }, 300, dialog.trigger.bind(dialog, 'animated'));
334+
335+
if (top < 0) {
336+
dialog.animate({ top: '0px' }, 300, dialog.trigger.bind(dialog, 'animated'));
337337
}
338338
if (left < 0) {
339339
dialog.animate({ left: '0px' }, 300, dialog.trigger.bind(dialog, 'animated'));
340340
}
341341
});
342342

343-
dialog.bind('dialogextendmaximize', () => {
344-
dialog.css({ zIndex: dialog.closest('.ui-dialog').css('z-index')*1 + 3000 });
345-
});
346-
dialog.bind('dialogextendrestore', () => {
347-
if (dialog.closest('.ui-dialog').css('z-index') > 3000) {
348-
dialog.css({ zIndex: dialog.closest('.ui-dialog').css('z-index')*1 - 3000 });
349-
dialog.draggable('option', 'containment', false);
350-
} else {
351-
dialog.css({ zIndex: dialog.closest('.ui-dialog').css('z-index')*1 + 1 });
352-
}
353-
});
354-
355343
if(options.destroy) { /* register for destroy event which have been patched */
356344
blankWindow.on('dialogdestroy', options.destroy);
357345
}

0 commit comments

Comments
 (0)