Merge pull request #11048 from nextcloud/stable14-10963

[stable14] Updates logo scss to regard default values
This commit is contained in:
Julius Härtl 2018-09-04 20:31:16 +02:00 committed by GitHub
commit 8feadb8d98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -19,7 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
// SCSS darken/lighten function override
@function nc-darken($color, $value) {
@return darken($color, $value);
@ -60,8 +60,8 @@ $color-text-maxcontrast: nc-lighten($color-main-text, 46.2%) !default;
$color-text-light: nc-lighten($color-main-text, 15%) !default;
$color-text-lighter: nc-lighten($color-main-text, 30%) !default;
$image-logo: url('../img/logo.svg?v=1');
$image-login-background: url('../img/background.png?v=2');
$image-logo: url('../img/logo.svg?v=1') !default;
$image-login-background: url('../img/background.png?v=2') !default;
$color-loading-light: #ccc !default;
$color-loading-dark: #777 !default;