okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

Browse source
This commit is contained in:
vapormusic 2022-01-22 10:28:40 +07:00
commit 8c8c775eba
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/js/bootbox.min.js vendored
View file

File diff suppressed because one or more lines are too long

14
src/renderer/less/bootstrap.less vendored
View file

@ -21,6 +21,8 @@
border: 0; border: 0;
-webkit-appearance: none; -webkit-appearance: none;
font-weight: 100; font-weight: 100;
font-size: 1.2em;
color: var(--textColor);
} }
} }
@ -29,6 +31,7 @@
width: auto; width: auto;
margin: 0.5rem; margin: 0.5rem;
pointer-events: none; pointer-events: none;
color: var(--textColor);
} }
.modal.fade .modal-dialog { .modal.fade .modal-dialog {
@ -75,11 +78,12 @@
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
pointer-events: auto; pointer-events: auto;
background-color: #fff; background-color: var(--modalBackground);
background-clip: padding-box; background-clip: padding-box;
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 0.3rem; border-radius: 0.3rem;
outline: 0; outline: 0;
box-shadow: var(--ciderShadow-Generic);
} }
.modal-backdrop { .modal-backdrop {
@ -106,7 +110,6 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 1rem 1rem; padding: 1rem 1rem;
border-bottom: 1px solid #dee2e6;
border-top-left-radius: calc(0.3rem - 1px); border-top-left-radius: calc(0.3rem - 1px);
border-top-right-radius: calc(0.3rem - 1px); border-top-right-radius: calc(0.3rem - 1px);
} }
@ -117,8 +120,8 @@
} }
.modal-title { .modal-title {
margin-bottom: 0;
line-height: 1.5; line-height: 1.5;
margin: 0;
} }
.modal-body { .modal-body {
@ -134,7 +137,6 @@
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
padding: 0.75rem; padding: 0.75rem;
border-top: 1px solid #dee2e6;
border-bottom-right-radius: calc(0.3rem - 1px); border-bottom-right-radius: calc(0.3rem - 1px);
border-bottom-left-radius: calc(0.3rem - 1px); border-bottom-left-radius: calc(0.3rem - 1px);
} }
@ -1088,4 +1090,8 @@ fieldset:disabled .btn {
padding: 0.25rem 0.5rem; padding: 0.25rem 0.5rem;
font-size: 0.875rem; font-size: 0.875rem;
border-radius: 0.2rem; border-radius: 0.2rem;
}
.form-control {
width:100%;
} }

2
src/renderer/style.less
View file

@ -30,6 +30,8 @@
--keyColor-deepPressed-rgb: 255, 138, 156; --keyColor-deepPressed-rgb: 255, 138, 156;
--keyColor-disabled: rgba(250, 88, 106, 0.35); --keyColor-disabled: rgba(250, 88, 106, 0.35);
--navigationBarHeight: 38px; --navigationBarHeight: 38px;
--modalBackground: #262626;
--textColor: #eee;
} }
html, html,