Skip to content

Commit

Permalink
Merge 3262012 into e74718c
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kitzunu
Kitzunu committed May 24, 2020
2 parents e74718c + 3262012 commit 8ab123b
Show file tree
Hide file tree
Showing 18 changed files with 111 additions and 82 deletions.
6 changes: 0 additions & 6 deletions src/app/features/item/item-template/item-template.component.scss
View file
Expand Up @@ -4,18 +4,13 @@

.item-stats {
border-radius: 3px;
}

.item-stats {
text-align: left;
font-family: Verdana, "Open Sans", Arial, "Helvetica Neue", Helvetica, sans-serif;
font-size: 15px;

line-height: 25px;
width: auto;
min-width: 200px;
padding: 12px;

color: #ccc;
}

Expand All @@ -32,5 +27,4 @@
.stackable-100 {
margin-left: -48px;
}

}
3 changes: 2 additions & 1 deletion src/app/features/quest/quest-preview/quest-preview.component.scss
View file
Expand Up @@ -13,7 +13,8 @@
font-weight: bold;
}

ol, ul {
ol,
ul {
padding: 0 0 0 17px;
}

Expand Down
1 change: 1 addition & 0 deletions src/app/main/app.component.scss
View file
Expand Up @@ -13,6 +13,7 @@
font-style: italic;
font-weight: bold;
}

.btn {
font-weight: bold;
}
Expand Down
30 changes: 18 additions & 12 deletions src/app/main/connection-window/connection-window.component.scss
View file
@@ -1,12 +1,12 @@
.wrapper.img-1 { background-image: url("../../../assets/img/login-backgrounds/ne-1.jpg"); }
.wrapper.img-2 { background-image: url("../../../assets/img/login-backgrounds/ragnaros.jpg"); }
.wrapper.img-3 { background-image: url("../../../assets/img/login-backgrounds/illidan-1.jpg"); }
.wrapper.img-4 { background-image: url("../../../assets/img/login-backgrounds/death-angel.jpg"); }
.wrapper.img-5 { background-image: url("../../../assets/img/login-backgrounds/ne-2.jpg"); }
.wrapper.img-6 { background-image: url("../../../assets/img/login-backgrounds/ne-3.jpg"); }
.wrapper.img-7 { background-image: url("../../../assets/img/login-backgrounds/orc-1.jpg"); }
.wrapper.img-8 { background-image: url("../../../assets/img/login-backgrounds/orc-2.jpg"); }
.wrapper.img-9 { background-image: url("../../../assets/img/login-backgrounds/orc-campfire.jpg"); }
.wrapper.img-1 { background-image: url("../../../assets/img/login-backgrounds/ne-1.jpg"); }
.wrapper.img-2 { background-image: url("../../../assets/img/login-backgrounds/ragnaros.jpg"); }
.wrapper.img-3 { background-image: url("../../../assets/img/login-backgrounds/illidan-1.jpg"); }
.wrapper.img-4 { background-image: url("../../../assets/img/login-backgrounds/death-angel.jpg"); }
.wrapper.img-5 { background-image: url("../../../assets/img/login-backgrounds/ne-2.jpg"); }
.wrapper.img-6 { background-image: url("../../../assets/img/login-backgrounds/ne-3.jpg"); }
.wrapper.img-7 { background-image: url("../../../assets/img/login-backgrounds/orc-1.jpg"); }
.wrapper.img-8 { background-image: url("../../../assets/img/login-backgrounds/orc-2.jpg"); }
.wrapper.img-9 { background-image: url("../../../assets/img/login-backgrounds/orc-campfire.jpg"); }
.wrapper.img-10 { background-image: url("../../../assets/img/login-backgrounds/undead-1.jpg"); }

$main-color-blue: #0052a7;
Expand Down Expand Up @@ -72,7 +72,7 @@ $secondary-color-green: #b7e2ad;
position: relative;
width: 500px;
min-height: 500px;
background-color: rgba(0,0,0,.5);
background-color: rgba(0, 0, 0, 0.5);
border-radius: 30px;
padding: 30px;
color: white;
Expand All @@ -94,6 +94,7 @@ $secondary-color-green: #b7e2ad;
width: 16px;
height: 16px;
}

.form-check-label {
margin-top: 2px;
font-weight: bold;
Expand All @@ -109,7 +110,9 @@ $secondary-color-green: #b7e2ad;
font-weight: bold;
color: #fff;

&:hover, &:focus, &:active {
&:hover,
&:focus,
&:active {
background-color: #2b2b2b;
}
}
Expand Down Expand Up @@ -146,6 +149,7 @@ $secondary-color-green: #b7e2ad;
margin: auto;
display: block;
}

.btn {
font-weight: bold;

Expand All @@ -160,7 +164,9 @@ $secondary-color-green: #b7e2ad;
bottom: 10px;
left: 50%;
transform: translateX(-50%);
a, a:hover {

a,
a:hover {
font-weight: bold;
text-decoration: none;
}
Expand Down
21 changes: 10 additions & 11 deletions src/app/main/main-window/sidebar/sidebar.component.scss
View file
Expand Up @@ -88,7 +88,7 @@ $img-border-color: rgba(255, 255, 255, 0.1);
}

.db-host {
font-size: .8rem;
font-size: 0.8rem;
.port {
color: lightgray;
}
Expand Down Expand Up @@ -149,9 +149,9 @@ $img-border-color: rgba(255, 255, 255, 0.1);
border-radius: 4px;
}

&:hover>i::before {
&:hover > i::before {
display: inline-block;
animation: swing ease-in-out .5s 1 alternate;
animation: swing ease-in-out 0.5s 1 alternate;
}

span.label,
Expand All @@ -164,7 +164,7 @@ $img-border-color: rgba(255, 255, 255, 0.1);
}

.sidebar-dropdown {
>a:after {
> a:after {
font-family: "Font Awesome 5 Free", serif;
font-weight: 900;
content: "\f105";
Expand All @@ -179,7 +179,7 @@ $img-border-color: rgba(255, 255, 255, 0.1);
position: absolute;
right: 15px;
top: 14px;
transition: transform .3s ease;
transition: transform 0.3s ease;
}

.sidebar-submenu {
Expand All @@ -198,6 +198,7 @@ $img-border-color: rgba(255, 255, 255, 0.1);
float: right;
margin-top: 0;
}

&.active {
font-weight: bold;
color: #fff;
Expand All @@ -206,7 +207,7 @@ $img-border-color: rgba(255, 255, 255, 0.1);
}
}

&.active>a:after {
&.active > a:after {
transform: rotate(90deg);
right: 15px;
}
Expand All @@ -216,7 +217,6 @@ $img-border-color: rgba(255, 255, 255, 0.1);
}

.sidebar {

background-color: $bg-sidebar-wrapper;

.sidebar-profile,
Expand All @@ -226,14 +226,14 @@ $img-border-color: rgba(255, 255, 255, 0.1);

.sidebar-profile .user-info .db-user,
.sidebar-profile .user-info .user-status,
.sidebar-header>a,
.sidebar-header > a,
.sidebar-menu ul li a,
#close-sidebar {
color: $color;
}

.sidebar-menu ul li:hover>a,
.sidebar-menu .sidebar-dropdown.active>a,
.sidebar-menu ul li:hover > a,
.sidebar-menu .sidebar-dropdown.active > a,
.sidebar-profile .user-info,
.sidebar-header>a:hover,
#close-sidebar:hover {
Expand All @@ -258,7 +258,6 @@ $img-border-color: rgba(255, 255, 255, 0.1);
}

&.sidebar-bg {

background-size: cover;
background-position: center;
background-repeat: no-repeat;
Expand Down
1 change: 1 addition & 0 deletions src/app/shared/modules/query-output/query-error/query-error.component.scss
View file
Expand Up @@ -5,6 +5,7 @@
font-weight: bold;
text-align: right;
}

td:last-child {
padding-left: 8px;
}
Expand Down
4 changes: 1 addition & 3 deletions src/assets/scss/_content.scss
View file
Expand Up @@ -12,8 +12,7 @@
min-height: 100vh;
display: inline-block;
width: 100%;
transition: padding-left .3s ease;

transition: padding-left 0.3s ease;
padding-left: $sidebar-width;

.content-block {
Expand All @@ -31,7 +30,6 @@
}

&.toggled {

.page-content {
padding-left: 0;
}
Expand Down
1 change: 0 additions & 1 deletion src/assets/scss/_editor.scss
View file
Expand Up @@ -11,7 +11,6 @@
.main-text {
display: block;
text-align: center;

font-size: 13px;
font-weight: bold;
}
Expand Down
22 changes: 14 additions & 8 deletions src/assets/scss/_item-preview.scss
View file
@@ -1,10 +1,10 @@
.item-preview {
.item-stock, .item-name {
.item-stock,
.item-name {
line-height: 30px;
font-size: 18px;
}


.icon {
width: 100px;
height: 100px;
Expand All @@ -22,7 +22,7 @@
}

/* Quality */
.q { color: #ffd100; }
.q { color: #ffd100; }
.q0 { color: #9d9d9d; }
.q1 { color: #ffffff; }
.q2 { color: #1eff00; }
Expand All @@ -33,10 +33,16 @@
.q7 { color: #e5cc80; }

/* Sockets */
.socket0, .socket1, .socket2, .socket3, .socket4 { padding-left: 26px; }
.socket0 { background: url(../img/sockets/meta.gif) no-repeat left center; } /* meta */
.socket1 { background: url(../img/sockets/red.gif) no-repeat left center; } /* red */
.socket2 { background: url(../img/sockets/yellow.gif) no-repeat left center; } /* yellow */
.socket3 { background: url(../img/sockets/blue.gif) no-repeat left center; } /* blue */
.socket0,
.socket1,
.socket2,
.socket3,
.socket4 {
padding-left: 26px;
}
.socket0 { background: url(../img/sockets/meta.gif) no-repeat left center; } /* meta */
.socket1 { background: url(../img/sockets/red.gif) no-repeat left center; } /* red */
.socket2 { background: url(../img/sockets/yellow.gif) no-repeat left center; } /* yellow */
.socket3 { background: url(../img/sockets/blue.gif) no-repeat left center; } /* blue */
.socket4 { background: url(../img/sockets/prismatic.gif) no-repeat left center; } /* prismatic */
}
3 changes: 2 additions & 1 deletion src/assets/scss/_item-select.scss
View file
@@ -1,9 +1,10 @@
.item-select {
/* Quality (used for text with white background) */

.q { color: #ffd100; }
.q0 { color: #757575; }
/* .q1 { color:#ffffff; } */
.q2 { color: #4CAF50; }
.q2 { color: #4caf50; }
.q3 { color: #0070dd; }
.q4 { color: #a335ee; }
.q5 { color: #ffc107; }
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/_login.scss
View file
@@ -1,5 +1,5 @@
.login-error-box .alert {
background-color: rgba(0,0,0,.3);
background-color: rgba(0, 0, 0, 0.3);
border-color: #000;
color: #fff;
}

0 comments on commit 8ab123b

Please sign in to comment.