diff --git a/apps/accessibility/css/themedark.scss b/apps/accessibility/css/themedark.scss
index fc33b333ce9571e41da2d67cd21e5445c52324d5..8bd5be949ce80b0588c30fa0e63f246f4990d35f 100644
--- a/apps/accessibility/css/themedark.scss
+++ b/apps/accessibility/css/themedark.scss
@@ -19,11 +19,34 @@ $color-border-dark: lighten($color-main-background, 14%);
#app-navigation > ul > li > a:first-child,
#app-navigation > ul > li > ul > li > a:first-child,
-#expanddiv a {
+#contactsmenu-menu a,
+#expanddiv a,
+.activity-section .activity-icon.monochrome {
img {
filter: invert(100%);
}
}
+
+#navigation #apps li a,
+#body-settings #content.app-settings .app-image-icon,
+#body-settings #content.app-settings #app-sidebar #app-details-view h2 {
+ svg {
+ filter: invert(100%);
+ }
+}
+
+// Otherwise icon-more gets inverted via function
+#appmenu .icon-more-white {
+ filter: invert(100%);
+}
+
+// since svg icons are inverted, revert to white for the header
+.header-right > * {
+ [class^='icon-'], [class*=' icon-'] {
+ filter: invert(100%);
+ }
+}
+
.bubble,
.app-navigation-entry-menu,
.popovermenu {
@@ -44,9 +67,9 @@ $color-border-dark: lighten($color-main-background, 14%);
border: 1px solid var(--color-border);
}
-// since svg icons are inverted, revert to white for the header
-.header-right > * {
- [class^='icon-'], [class*=' icon-'] {
+// Prevent slideshow icons from going dark
+#slideshow {
+ [class^='icon-'], [class*=' icon-']{
filter: invert(100%);
}
}
diff --git a/apps/accessibility/js/accessibility.js.map b/apps/accessibility/js/accessibility.js.map
index fc32c45f2eb21fe60410ed9695b3399c4f702d2b..adb6d76cfd0bc936c8be8e7d7c3df96bf67414eb 100644
Binary files a/apps/accessibility/js/accessibility.js.map and b/apps/accessibility/js/accessibility.js.map differ
diff --git a/apps/accessibility/package-lock.json b/apps/accessibility/package-lock.json
index 76503ca194635d39efe7b41463d1e4aa2445fa0e..6321b664dd0276bbeea81926e4c56e70a96ce350 100644
--- a/apps/accessibility/package-lock.json
+++ b/apps/accessibility/package-lock.json
@@ -2761,7 +2761,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -3176,7 +3177,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3232,6 +3234,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3275,12 +3278,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
diff --git a/apps/federatedfilesharing/css/settings-admin.css b/apps/federatedfilesharing/css/settings-admin.scss
similarity index 100%
rename from apps/federatedfilesharing/css/settings-admin.css
rename to apps/federatedfilesharing/css/settings-admin.scss
diff --git a/apps/federatedfilesharing/css/settings-personal.css b/apps/federatedfilesharing/css/settings-personal.scss
similarity index 53%
rename from apps/federatedfilesharing/css/settings-personal.css
rename to apps/federatedfilesharing/css/settings-personal.scss
index 6cb69f83cb64116fdeb1d2005fdb82bc5bda9c58..eda7a80cb1ad960ad8dbde3644af6f31c0605d2f 100644
--- a/apps/federatedfilesharing/css/settings-personal.css
+++ b/apps/federatedfilesharing/css/settings-personal.scss
@@ -17,25 +17,22 @@
[class^="social-"], [class*=" social-"] {
background-repeat: no-repeat;
- background-position: 2px;
+ background-position: 8px;
min-width: 16px;
min-height: 16px;
- padding-left: 29px;
- background-size: 24px;
+ padding-left: 28px;
+ background-size: 16px;
}
-.social-gnu {
- background-image: url('../img/social-gnu.svg');
-}
.social-diaspora {
- background-image: url('../img/social-diaspora.svg');
+ @include icon-color('social-diaspora', 'federatedfilesharing', $color-black);
}
.social-twitter {
- background-image: url('../img/social-twitter.svg');
+ @include icon-color('social-twitter', 'federatedfilesharing', $color-black);
}
.social-facebook {
- background-image: url('../img/social-facebook.svg');
+ @include icon-color('social-facebook', 'federatedfilesharing', $color-black);
}
.social-googleplus {
- background-image: url('../img/social-googleplus.svg');
+ @include icon-color('social-googleplus', 'federatedfilesharing', $color-black);
}
diff --git a/apps/federatedfilesharing/img/social-googleplus.svg b/apps/federatedfilesharing/img/social-googleplus.svg
index 2b5929ce2d95787463bf305fec37bd60e26edfc4..53af74c64f1f9ed224d5ecb96338d606b636cd88 100644
--- a/apps/federatedfilesharing/img/social-googleplus.svg
+++ b/apps/federatedfilesharing/img/social-googleplus.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="32" id="Layer_1" viewBox="0 0 32 32" width="32"><style id="style4709">.st0{fill-rule:evenodd;clip-rule:evenodd}</style><path d="M12.26 1c-1.044 0-2.164.12-3.36.365-1.207.284-2.37.885-3.49 1.807C3.776 4.748 2.96 6.502 2.96 8.438c0 1.6.576 3.003 1.73 4.21 1.098 1.292 2.697 1.953 4.795 1.98.395 0 .818-.028 1.266-.078-.074.207-.155.43-.24.676-.1.23-.15.523-.15.87 0 .578.13 1.075.39 1.488.222.424.475.823.76 1.197-.92.026-2.075.142-3.466.346-1.405.244-2.746.73-4.02 1.458-1.138.678-1.924 1.465-2.356 2.36-.447.894-.67 1.71-.67 2.437 0 1.497.688 2.782 2.06 3.857 1.362 1.15 3.422 1.738 6.182 1.763 3.297-.05 5.82-.837 7.567-2.363 1.686-1.475 2.53-3.166 2.53-5.076-.026-1.343-.333-2.432-.923-3.266a13.466 13.466 0 0 0-2.184-2.247l-1.337-1.096a7.868 7.868 0 0 1-.596-.672c-.242-.27-.362-.607-.362-1.02 0-.422.118-.793.352-1.113.2-.31.416-.584.652-.827.41-.36.797-.712 1.16-1.057.33-.345.64-.723.933-1.133.6-.846.912-1.974.935-3.383 0-.77-.087-1.442-.26-2.018a7.594 7.594 0 0 0-1.596-2.633 5.256 5.256 0 0 0-.836-.673h2.43L20.14 1h-7.88zm12.418.17v4.134h-4.134v2.003h4.134v4.134h2.004V7.308h4.134V5.304h-4.134V1.17h-2.004zM9.823 2.304c.807.026 1.52.265 2.14.712.61.475 1.1 1.093 1.474 1.85.794 1.577 1.192 3.145 1.192 4.697 0 .36-.03.803-.088 1.33a4.06 4.06 0 0 1-.643 1.54c-.69.706-1.555 1.08-2.593 1.118-.82 0-1.55-.25-2.19-.752-.64-.5-1.16-1.11-1.563-1.83-.834-1.54-1.25-3.022-1.25-4.447a4.844 4.844 0 0 1 .856-2.927c.708-.835 1.595-1.265 2.663-1.29zm1.667 17.54c.09 0 .16.003.21.01.337 0 .632.01.884.038 1.47 1.026 2.548 1.89 3.24 2.595.65.743.976 1.613.976 2.613 0 1.233-.477 2.238-1.43 3.02-.978.795-2.396 1.205-4.253 1.23-2.07-.025-3.702-.486-4.894-1.382-1.255-.897-1.88-2.04-1.88-3.423 0-.704.143-1.307.433-1.806a4.11 4.11 0 0 1 .92-1.194 5.237 5.237 0 0 1 1.11-.71c.365-.155.646-.27.847-.347a16.935 16.935 0 0 1 2.504-.56c.62-.056 1.065-.085 1.333-.085z" id="path4713" opacity=".5"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="32" id="Layer_1" viewBox="0 0 32 32" width="32"><path d="M12.26 1c-1.044 0-2.164.12-3.36.365-1.207.284-2.37.885-3.49 1.807C3.776 4.748 2.96 6.502 2.96 8.438c0 1.6.576 3.003 1.73 4.21 1.098 1.292 2.697 1.953 4.795 1.98.395 0 .818-.028 1.266-.078-.074.207-.155.43-.24.676-.1.23-.15.523-.15.87 0 .578.13 1.075.39 1.488.222.424.475.823.76 1.197-.92.026-2.075.142-3.466.346-1.405.244-2.746.73-4.02 1.458-1.138.678-1.924 1.465-2.356 2.36-.447.894-.67 1.71-.67 2.437 0 1.497.688 2.782 2.06 3.857 1.362 1.15 3.422 1.738 6.182 1.763 3.297-.05 5.82-.837 7.567-2.363 1.686-1.475 2.53-3.166 2.53-5.076-.026-1.343-.333-2.432-.923-3.266a13.466 13.466 0 0 0-2.184-2.247l-1.337-1.096a7.868 7.868 0 0 1-.596-.672c-.242-.27-.362-.607-.362-1.02 0-.422.118-.793.352-1.113.2-.31.416-.584.652-.827.41-.36.797-.712 1.16-1.057.33-.345.64-.723.933-1.133.6-.846.912-1.974.935-3.383 0-.77-.087-1.442-.26-2.018a7.594 7.594 0 0 0-1.596-2.633 5.256 5.256 0 0 0-.836-.673h2.43L20.14 1h-7.88zm12.418.17v4.134h-4.134v2.003h4.134v4.134h2.004V7.308h4.134V5.304h-4.134V1.17h-2.004zM9.823 2.304c.807.026 1.52.265 2.14.712.61.475 1.1 1.093 1.474 1.85.794 1.577 1.192 3.145 1.192 4.697 0 .36-.03.803-.088 1.33a4.06 4.06 0 0 1-.643 1.54c-.69.706-1.555 1.08-2.593 1.118-.82 0-1.55-.25-2.19-.752-.64-.5-1.16-1.11-1.563-1.83-.834-1.54-1.25-3.022-1.25-4.447a4.844 4.844 0 0 1 .856-2.927c.708-.835 1.595-1.265 2.663-1.29zm1.667 17.54c.09 0 .16.003.21.01.337 0 .632.01.884.038 1.47 1.026 2.548 1.89 3.24 2.595.65.743.976 1.613.976 2.613 0 1.233-.477 2.238-1.43 3.02-.978.795-2.396 1.205-4.253 1.23-2.07-.025-3.702-.486-4.894-1.382-1.255-.897-1.88-2.04-1.88-3.423 0-.704.143-1.307.433-1.806a4.11 4.11 0 0 1 .92-1.194 5.237 5.237 0 0 1 1.11-.71c.365-.155.646-.27.847-.347a16.935 16.935 0 0 1 2.504-.56c.62-.056 1.065-.085 1.333-.085z" id="path4713" opacity=".5"/></svg>
diff --git a/core/css/header.scss b/core/css/header.scss
index 14f87b26800019a9d64d6493a07366c40c67e2fe..4511b44668d5458b74d8ff8a6c197eba1c7a0351 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -694,8 +694,8 @@ nav[role='navigation'] {
color: var(--color-primary-text);
width: 155px;
cursor: text;
- background-color: var(--color-primary) !important;
- border: 1px solid var(--color-primary-text-dark) !important;
+ background-color: transparent !important;
+ border: 1px solid var(--color-border) !important;
}
&:hover, &:focus, &:active {
opacity: 1;
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 96c53d6e9b04aa4e4fad133be362884af00943d2..3562372dbc92048e2290b4adf9d34768e9063b34 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -230,7 +230,7 @@ select {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
- background: url('../img/actions/triangle-s.svg') no-repeat right 4px center;
+ background: var(--icon-triangle-s-000) no-repeat right 4px center;
background-color: inherit;
outline: 0;
padding-right: 24px !important;
@@ -431,7 +431,7 @@ div.select2-drop {
}
.select2-search input {
min-height: auto;
- background: url('../img/actions/search.svg') no-repeat right center !important;
+ background: var(--icon-search-000) no-repeat right center !important;
background-origin: content-box !important;
}
.select2-results {
@@ -554,7 +554,7 @@ div.select2-container {
border-radius: 0;
border: none;
b {
- background: url('../img/actions/triangle-s.svg') no-repeat center !important;
+ background: var(--icon-triangle-s-000) no-repeat center !important;
opacity: .5;
}
}
@@ -619,7 +619,7 @@ div.select2-container {
color: inherit !important;
&::before {
content: ' ';
- background-image: url('../img/actions/checkmark.svg?v=1');
+ background-image: var(--icon-checkmark-000);
background-repeat: no-repeat;
background-position: center;
min-width: 16px;
@@ -809,7 +809,7 @@ div.select2-container {
/* selected checkmark icon */
&::before {
content: ' ';
- background-image: url('../img/actions/checkmark.svg?v=1');
+ background-image: var(--icon-checkmark-000);
background-repeat: no-repeat;
background-position: center;
min-width: 16px;
@@ -828,7 +828,7 @@ div.select2-container {
*/
&[data-select='create'] {
&::before {
- background-image: url('../img/actions/add.svg?v=1');
+ background-image: var(--icon-add-000);
visibility: visible;
}
}
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss
index f25ca1427166a18f60f62924513398e3c091a52b..7372f308727c95cbc2ee231b4bbd8385bc7568ae 100644
--- a/core/css/jquery.ocdialog.scss
+++ b/core/css/jquery.ocdialog.scss
@@ -51,7 +51,7 @@
top: 0;
right: 0;
padding: 25px;
- background: url('../img/actions/close.svg') no-repeat center;
+ background: var(--icon-close-000) no-repeat center;
opacity: .5;
&:hover,
diff --git a/core/css/styles.scss b/core/css/styles.scss
index a4610aba56718f72f45001cc51430984f653e075..5f45b29cfde279eedecae2b8178fc083e541f736 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -290,7 +290,7 @@ label.infield {
position: absolute !important;
height: 20px;
width: 24px;
- background-image: url('../img/actions/toggle.svg?v=1');
+ background-image: var(--icon-toggle-000);
background-repeat: no-repeat;
background-position: center;
opacity: .3;
@@ -312,8 +312,9 @@ label.infield {
#personal-show + label {
display: block;
right: 0;
- margin-top: -36px;
- padding: 6px 4px;
+ margin-top: -41px;
+ margin-right: -6px;
+ padding: 22px;
}
/* Warnings and errors are the same */
@@ -709,7 +710,7 @@ code {
box-sizing: border-box;
div:first-child a {
- background-image: url('../img/places/home.svg?v=1');
+ background-image: var(--icon-home-000);
background-repeat: no-repeat;
background-position: left center;
}
@@ -743,11 +744,12 @@ code {
opacity: 1;
}
}
+
// keyboard focus
#picker-showgridview:focus + #picker-view-toggle {
opacity: 1;
}
-
+
.actions.creatable {
flex-wrap: wrap;
padding: 0px;
@@ -761,14 +763,13 @@ code {
border-radius: var(--border-radius-pill);
position: absolute;
top: 4px;
-
+
.icon.icon-add{
background-image: var(--icon-add-000);
background-size: 16px 16px;
- max-height:36px;
- width:36px;
- margin:0px;
-
+ max-height: 36px;
+ width: 36px;
+ margin: 0px;
}
a {
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index d3ab389b7cae62d11690405d62446dbdef05d33e..c89c6d47bb549a67228cd0fb17c92aa9d929ebb7 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -739,23 +739,27 @@ span.usersLastLoginTooltip {
&.appwarning:hover {
background: #fbb;
}
- .app-external, .app-version {
- color: rgba(85, 85, 85, 0.5);
+ .app-external {
+ color: var(--color-text-maxcontrast);
}
}
span.version {
margin-left: 1em;
margin-right: 1em;
- color: #555;
+ color: var(--color-text-maxcontrast);
+}
+
+.app-version {
+ color: var(--color-text-maxcontrast);
}
.app-level {
margin-top: 8px;
span {
- color: #555;
+ color: var(--color-text-maxcontrast);
background-color: transparent;
- border: 1px solid #555;
+ border: 1px solid var(--color-text-maxcontrast);
border-radius: var(--border-radius);
padding: 3px 6px;
}