Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Оверлей обновления. (#271)

Browse source 
* fix update overlay

* fix update overlay
This commit is contained in:
Zaxar163 2019-05-25 19:40:14 +03:00 committed by Gravit
parent bcb65726af
commit 07ba774ed9
4 changed files with 128 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Launcher/runtime/dialog/images/downloader/blured.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 7 KiB

9
Launcher/runtime/dialog/overlay/processing/processing.css
View file

@ -1,11 +1,14 @@
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/
#overlay > #description {
#overlay>#description {
-fx-font-size: 12pt; -fx-font-size: 12pt;
-fx-text-fill: #fff; -fx-text-fill: #fff;
-fx-wrap-text: true; -fx-wrap-text: true;
} }
#overlay > #description.error { #overlay>#description.error {
-fx-text-fill: red; -fx-text-fill: #CE5757;
} }
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/

2
Launcher/runtime/dialog/overlay/update/update.css
View file

@ -20,7 +20,7 @@ #overlay > #description.error {
} }
.downloadPane { .downloadPane {
-fx-background-color: rgba(0, 0, 0, 0.2); -fx-background-color: rgba(0, 0, 0, 0.1);
} }
/* Progress bar */ /* Progress bar */

175
Launcher/runtime/dialog/styles.css
View file

@ -1,10 +1,15 @@
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/
Button, CheckBox, ComboBox, RadioButton {
Button,
CheckBox,
ComboBox,
RadioButton {
-fx-cursor: hand; -fx-cursor: hand;
} }
/* Backgrounds */ /* Backgrounds */
#layout { #layout {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-background-size: cover; -fx-background-size: cover;
@ -12,48 +17,61 @@ #layout {
-fx-pref-height: 450px; -fx-pref-height: 450px;
-fx-background-image: url('images/background.jpg'); -fx-background-image: url('images/background.jpg');
} }
#background { #background {
-fx-background-color: #fff; -fx-background-color: #fff;
} }
/** Labels **/ /** Labels **/
#background > #settingsTitle {
#background>#settingsTitle {
-fx-font-size: 14pt; -fx-font-size: 14pt;
-fx-alignment: baseline-center; -fx-alignment: baseline-center;
} }
#serverLabel{ #serverLabel {
-fx-text-fill: #323232; -fx-text-fill: #323232;
} }
#serverStatus{ #serverStatus {
-fx-text-fill: #323232; -fx-text-fill: #323232;
-fx-pref-width: 120px; -fx-pref-width: 120px;
-fx-pref-height: 25px; -fx-pref-height: 25px;
} }
/* Mask */ /* Mask */
#mask { #mask {
-fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 ); -fx-effect: DropShadow( gaussian, rgba(255, 255, 255, 0.5), 0, 0, 0, 1);
} }
/** Errors **/ /** Errors **/
#errormessage{
#errormessage {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-text-alignment: center; -fx-text-alignment: center;
-fx-text-fill: #CE5757; -fx-text-fill: #CE5757;
} }
.error{ .error {
-fx-text-fill: #CE5757; -fx-text-fill: #CE5757;
} }
/* bars */ /* bars */
#bar { #bar {
-fx-background-color: #323232; -fx-background-color: #323232;
-fx-pref-width: 46px; -fx-pref-width: 46px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
/** buttons in bar **/ /** buttons in bar **/
#close { #close {
-fx-background-position: center; -fx-background-position: center;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
@ -62,7 +80,12 @@ #close {
-fx-pref-width: 46px; -fx-pref-width: 46px;
-fx-pref-height: 45px; -fx-pref-height: 45px;
} }
#hide, #back, #goConsole, #settings, #discord {
#hide,
#back,
#goConsole,
#settings,
#discord {
-fx-background-position: center; -fx-background-position: center;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-background-radius: 0; -fx-background-radius: 0;
@ -70,21 +93,23 @@ #hide, #back, #goConsole, #settings, #discord {
-fx-pref-height: 45px; -fx-pref-height: 45px;
} }
#logout{ #logout {
-fx-text-fill:#323232; -fx-text-fill: #323232;
-fx-font-size:12; -fx-font-size: 12;
-fx-font-weight:normal; -fx-font-weight: normal;
-fx-border-color:#CE5757; -fx-border-color: #CE5757;
-fx-border-width:1; -fx-border-width: 1;
-fx-background-color:transparent; -fx-background-color: transparent;
-fx-padding:0; -fx-padding: 0;
} }
#logout:hover, #logout:hover,
#logout:focus{ #logout:focus {
-fx-text-fill:#ff6a5e; -fx-text-fill: #ff6a5e;
} }
#logout:pressed{
-fx-border-color:#cb4d43; #logout:pressed {
-fx-border-color: #cb4d43;
} }
#send { #send {
@ -97,9 +122,13 @@ #send {
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
#send:pressed { -fx-background-color: #d8d8d8; } #send:pressed {
-fx-background-color: #d8d8d8;
}
/* LoginMenu */ /* LoginMenu */
#authPane { #authPane {
-fx-background-color: rgba(255, 255, 255, 0.71); -fx-background-color: rgba(255, 255, 255, 0.71);
-fx-pref-width: 270px; -fx-pref-width: 270px;
@ -113,7 +142,9 @@ #logo {
-fx-pref-height: 32px; -fx-pref-height: 32px;
} }
/** Buttons & textarea**/ /** Buttons & textarea**/
.auth { .auth {
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-font-weight: bold; -fx-font-weight: bold;
@ -123,18 +154,22 @@ .auth {
-fx-text-fill: #ffffff; -fx-text-fill: #ffffff;
-fx-pref-width: 200px; -fx-pref-width: 200px;
-fx-pref-height: 45px; -fx-pref-height: 45px;
-fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3); -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3);
} }
.auth:hover, .auth:pressed { -fx-background-color: #75e18c; } .auth:hover,
.auth:pressed {
-fx-background-color: #75e18c;
}
#password, #login { #password,
#login {
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-pref-width: 200px; -fx-pref-width: 200px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
.text-input{ .text-input {
-fx-focus-color: transparent; -fx-focus-color: transparent;
-fx-background-repeat: no-repeat; -fx-background-repeat: no-repeat;
-fx-text-fill: #909090; -fx-text-fill: #909090;
@ -145,7 +180,9 @@ .text-input{
-fx-font-weight: bold; -fx-font-weight: bold;
} }
/** Hyperlink **/ /** Hyperlink **/
#link { #link {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 7pt; -fx-font-size: 7pt;
@ -155,21 +192,28 @@ #link {
-fx-pref-height: 17px; -fx-pref-height: 17px;
} }
#link:hover, #link:pressed { -fx-opacity: 0.8; } #link:hover,
#link:pressed {
-fx-opacity: 0.8;
}
/** CheckBox & ComboBox**/ /** CheckBox & ComboBox**/
#rememberchb{
#rememberchb {
-fx-font-size: 13; -fx-font-size: 13;
-fx-text-fill: #909090; -fx-text-fill: #909090;
-fx-pref-width: 145px; -fx-pref-width: 145px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
#combologin { #combologin {
-fx-text-fill: #909090; -fx-text-fill: #909090;
-fx-prompt-text-fill: #909090; -fx-prompt-text-fill: #909090;
-fx-pref-width: 200px; -fx-pref-width: 200px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
.combologin, .combologin,
.combologin { .combologin {
-fx-font-size: 13px; -fx-font-size: 13px;
@ -187,7 +231,7 @@ .combologin .list-cell {
.combologin-popup .list-view { .combologin-popup .list-view {
-fx-background-color: white, white; -fx-background-color: white, white;
-fx-background-insets: 0, 1; -fx-background-insets: 0, 1;
-fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 8, 0.0 , 0 , 0 ); -fx-effect: dropshadow( three-pass-box, rgba(0, 0, 0, 0.6), 8, 0.0, 0, 0);
} }
.combologin .list-cell:filled:selected .text, .combologin .list-cell:filled:selected .text,
@ -200,40 +244,44 @@ .combologin .arrow {
-fx-background-color: #5fd97a; -fx-background-color: #5fd97a;
} }
.combologin-popup .list-view .list-cell .combologin-popup .list-view .list-cell {
{
-fx-background-color: white; -fx-background-color: white;
} }
.combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list-view .list-cell:filled:selected:hover .combologin-popup .list-view .list-cell:filled:selected,
{ .combologin-popup .list-view .list-cell:filled:selected:hover {
-fx-background: -fx-accent; -fx-background: -fx-accent;
-fx-background-color: -fx-selection-bar; -fx-background-color: -fx-selection-bar;
-fx-text-fill: #909090; -fx-text-fill: #909090;
} }
.combologin-popup .list-view .list-cell:filled:hover .combologin-popup .list-view .list-cell:filled:hover {
{
-fx-background-color: white; -fx-background-color: white;
-fx-text-fill: #909090; -fx-text-fill: #909090;
} }
/** web**/ /** web**/
#news { #news {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-pref-width: 423px; -fx-pref-width: 423px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
/* MenuPane */ /* MenuPane */
.serverentrance { .serverentrance {
-fx-background-color: rgba(255, 255, 255, 0.71); -fx-background-color: rgba(255, 255, 255, 0.71);
-fx-pref-width: 386px; -fx-pref-width: 386px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
/** buttons **/ /** buttons **/
.clientLaunch{
.clientLaunch {
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 16pt; -fx-font-size: 16pt;
@ -241,17 +289,25 @@ .clientLaunch{
-fx-background-color: #5fd97a; -fx-background-color: #5fd97a;
-fx-text-fill: #ffffff; -fx-text-fill: #ffffff;
} }
.clientSettings{
.clientSettings {
-fx-background-position: center; -fx-background-position: center;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-background-color: #5fd97a; -fx-background-color: #5fd97a;
-fx-background-radius: 0; -fx-background-radius: 0;
} }
.clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #75e18c; } .clientLaunch:hover,
.clientLaunch:pressed {
-fx-background-color: #75e18c;
}
/* Pressets options */ /* Pressets options */
.pressetLight, .pressetMedium, .pressetHigh {
.pressetLight,
.pressetMedium,
.pressetHigh {
-jfx-toggle-color: #5fd97a; -jfx-toggle-color: #5fd97a;
-jfx-untoggle-color: #FAFAFA; -jfx-untoggle-color: #FAFAFA;
-jfx-toggle-line-color: rgba(116, 192, 133, 0.79); -jfx-toggle-line-color: rgba(116, 192, 133, 0.79);
@ -260,7 +316,9 @@ .pressetLight, .pressetMedium, .pressetHigh {
-jfx-disable-visual-focus: false; -jfx-disable-visual-focus: false;
} }
/* Scrolls */ /* Scrolls */
.scroll-pane { .scroll-pane {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
@ -298,12 +356,14 @@ .scroll-pane>.corner {
-fx-background-color: rgba(0, 0, 0, 0.19); -fx-background-color: rgba(0, 0, 0, 0.19);
} }
/* OptionsPane */ /* OptionsPane */
#optionsPane > #modlist {
#optionsPane>#modlist {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#optionsPane > #modlist > .viewport { #optionsPane>#modlist>.viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
@ -332,39 +392,44 @@ .separator *.line {
-fx-border-width: 0 0 10 0; -fx-border-width: 0 0 10 0;
} }
#serverlist{ #serverlist {
-fx-background-color: transparent;
}
#serverlist > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#serverdesc{ #serverlist>.viewport {
-fx-background-color: transparent;
}
#serverdesc > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#serverinfo{ #serverdesc {
-fx-background-color: transparent;
}
#serverinfo > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#servercontainer{ #serverdesc>.viewport {
-fx-background-color: transparent;
}
#serverinfo {
-fx-background-color: transparent;
}
#serverinfo>.viewport {
-fx-background-color: transparent;
}
#servercontainer {
-fx-background-color: transparent; -fx-background-color: transparent;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-pref-width: 282px; -fx-pref-width: 282px;
-fx-pref-height: 75px; -fx-pref-height: 75px;
} }
.toggle-button:disabled{ .toggle-button:disabled {
-fx-opacity: 1.0; -fx-opacity: 1.0;
} }
.heading{ .heading {
-fx-text-fill: #555555; -fx-text-fill: #555555;
} }
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/