Browse Source

Merge pull request #395 from GilbN/develop

1.9.7
pull/404/head 1.9.7
GilbN 3 years ago
committed by GitHub
parent
commit
ad41a60d85
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 80
      css/base/bitwarden/bitwarden-base.css
  2. 8
      css/base/deluge/deluge-base.css
  3. BIN
      resources/deluge/arrow.png
  4. BIN
      resources/deluge/group-checked.png
  5. BIN
      resources/deluge/s-arrow.png
  6. 11
      resources/landing-page/css/custom.css

80
css/base/bitwarden/bitwarden-base.css

@ -109,17 +109,27 @@ h6,
.h4, .h4,
.h5, .h5,
.h6, .h6,
label:not(#g_advanced > div:nth-child(13) > label):not(#g_advanced > div:nth-child(12) > div.col-sm-8 > div > label),
label:not(.form-check-label):not(.btn):not(#g_advanced > div:nth-child(13) > label),
label.bold .card-header:first-child,
html[class*="theme_"] .card-header, html[class*="theme_"] .card-header,
.modal-header { .modal-header {
color: var(--text-hover) !important; color: var(--text-hover) !important;
} }
body,b,span, p,
html.theme_light label:not(.form-check-label):not(.btn), html.theme_light label.bold {
color: var(--text);
}
/* NAVBAR */ /* NAVBAR */
.navbar { .navbar,
background: var(--transparency-dark-25) !important; .navbar .bg-dark {
background: var(--main-bg-color) !important;
background-repeat: repeat, no-repeat !important;
background-attachment: fixed, fixed !important;
background-position: center center, center center !important;
background-size: auto, cover !important;
-webkit-background-size: auto, cover !important;
-moz-background-size: auto, cover !important;
-o-background-size: auto, cover !important;
--bs-bg-opacity: 0 !important;
} }
.navbar-dark .navbar-nav .show>.nav-link, .navbar-dark .navbar-nav .show>.nav-link,
@ -299,6 +309,33 @@ select:focus {
background: var(--drop-down-menu-bg) !important; background: var(--drop-down-menu-bg) !important;
} }
.form-control:focus {
color: var(--text);
background-color: var(--transparency-dark-15);
border-color: rgb(var(--accent-color));
outline: 0;
box-shadow: 0 0 0 0.25rem rgb(var(--accent-color) / 25%);
}
.form-control {
color: var(--text-hover);
background-color: var(--transparency-dark-25);
background-clip: padding-box;
border: 1px solid var(--transparency-light-10);
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
border-radius: 0.25rem;
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
}
.form-select:focus {
border-color: var(--transparency-light-20);
color: var(--text-hover);
outline: 0;
box-shadow: 0 0 0 0.25rem rgba(0, 0, 0, 0);
}
/* DROPDOWN MENU */ /* DROPDOWN MENU */
/* html[class*="theme_"] .dropdown-menu { /* html[class*="theme_"] .dropdown-menu {
background: var(--modal-bg-color); background: var(--modal-bg-color);
@ -395,13 +432,11 @@ html[class*="theme_"] .progress {
/* BUTTONS */ /* BUTTONS */
.btn-link { .btn-link {
color: var(--button-color); color: var(--link-color);
color: var(--button-text);
} }
.btn-link:hover { .btn-link:hover {
color: var(--button-color-hover); color: var(--link-color-hover);
color: var(--button-text-hover);
transition: 0.15s; transition: 0.15s;
} }
@ -522,6 +557,18 @@ html[class*="theme_"] .badge-info {
color: var(--label-text-color); color: var(--label-text-color);
} }
[id*="b_"]{
background: var(--transparency-dark-25);
border-color: var(--transparency-light-10);
color: var(--text);
}
[id*="b_"]:hover{
background: var(--transparency-dark-35);
border-color: var(--transparency-light-10);
color: var(--text-hover);
}
/* Org */ /* Org */
html[class*="theme_"] .org-nav .nav-tabs a.active { html[class*="theme_"] .org-nav .nav-tabs a.active {
@ -594,6 +641,7 @@ html[class*="theme_"] .btn-outline-secondary i {
-webkit-background-size: auto, cover; -webkit-background-size: auto, cover;
-moz-background-size: auto, cover; -moz-background-size: auto, cover;
-o-background-size: auto, cover; -o-background-size: auto, cover;
--bs-bg-opacity: 0;
} }
.bg-light .navbar { .bg-light .navbar {
@ -607,6 +655,14 @@ html[class*="theme_"] .btn-outline-secondary i {
-o-background-size: auto, cover; -o-background-size: auto, cover;
} }
.border-bottom {
border-bottom: 1px solid var(--transparency-light-15) !important;
}
div.dataTables_wrapper div.dataTables_info {
color: var(--text);
}
/* Cards */ /* Cards */
.bg-secondary { .bg-secondary {
background: var(--transparency-light-10) !important; background: var(--transparency-light-10) !important;
@ -660,3 +716,9 @@ html[class*="theme_"] .dropdown-divider,
html[class*="theme_"] .footer { html[class*="theme_"] .footer {
border-top: 1px solid rgb(255 255 255 / 30%); border-top: 1px solid rgb(255 255 255 / 30%);
} }
thead, tbody, tfoot, tr, td, th {
border-color:var(--transparency-light-25);
border-style: solid;
border-width: 0;
}

8
css/base/deluge/deluge-base.css

@ -16,7 +16,7 @@
@import url("/css/defaults/placeholders.css"); @import url("/css/defaults/placeholders.css");
@import url("/css/defaults/transparent.css"); @import url("/css/defaults/transparent.css");
html { html,body {
background: var(--main-bg-color); background: var(--main-bg-color);
background-repeat: repeat, no-repeat; background-repeat: repeat, no-repeat;
background-attachment: fixed, fixed; background-attachment: fixed, fixed;
@ -812,11 +812,11 @@
} }
.x-btn-mc em.x-btn-arrow { .x-btn-mc em.x-btn-arrow {
//background-image: url(../images/default/button/arrow.gif); background-image: url(/resources/deluge/arrow.png);
} }
.x-btn-mc em.x-btn-split { .x-btn-mc em.x-btn-split {
//background-image: url(../images/default/button/s-arrow.gif); background-image: url(/resources/deluge/s-arrow.png);
} }
.x-btn-over .x-btn-mc em.x-btn-split, .x-btn-over .x-btn-mc em.x-btn-split,
@ -1798,7 +1798,7 @@
} }
.x-menu-item-checked .x-menu-group-item .x-menu-item-icon { .x-menu-item-checked .x-menu-group-item .x-menu-item-icon {
//background-image: url(../images/gray/menu/group-checked.gif); background-image: url(/resources/deluge/group-checked.png);
} }
.x-menu-group-item .x-menu-item-icon { .x-menu-group-item .x-menu-item-icon {

BIN
resources/deluge/arrow.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 B

BIN
resources/deluge/group-checked.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 303 B

BIN
resources/deluge/s-arrow.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 B

11
resources/landing-page/css/custom.css

@ -289,7 +289,7 @@ header.masthead {
background: rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.2);
color: rgba(255, 255, 255, 0.7); color: rgba(255, 255, 255, 0.7);
border-radius: 5px; border-radius: 5px;
max-width: 120px; max-width: 130px;
min-width: 130px; min-width: 130px;
} }
@ -439,3 +439,12 @@ body {
-o-animation: fadein 2s; -o-animation: fadein 2s;
/* Opera */ /* Opera */
} }
@media only screen and (min-width: 200px) and (max-width: 767px) {
.app-container {
min-width: 120px;
}
#services, #themes {
padding: 0rem 0 3rem 0;
}
}
Loading…
Cancel
Save