Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11fd665a authored by Ronak Patel's avatar Ronak Patel
Browse files

Merge branch 'main' into 'dev/nc-25-ui' 

# Conflicts:
#   core/css/server.css
parents 822356a1 9012ece1

core/css/guest.css

+40 −2
Original line number Diff line number Diff line
@@ -1155,10 +1155,18 @@ a.legal { 
    width: 92%;

    margin-left: 0;

    margin-right: 0;

    box-shadow: none;



}

#body-login .v-align .guest-box p.message {

    justify-content: center !important;

    padding: 16px;

    border: 1px solid;

    box-shadow: none;

    color: #029f3c;

    border-radius: var(--border-radius-large);

}



#body-login .icon.icon-checkmark,

#body-login .icon-checkmark-white{

    display:none;
@@ -1654,7 +1662,7 @@ a.legal { 
}

#body-login .input-field__clear-button.button-vue{

    vertical-align: middle;

    height: 36px;

    height: 32px;

    line-height: 36px;

}

#body-login .button-vue--vue-primary{
@@ -1693,3 +1701,33 @@ a.legal { 
#body-login .guest-box.login-box .input-field__input {

    color: #222222;

}

#body-login .picker-window p.info{

    color: #222222;

}

#body-login .picker-window {

	display: inline-block;

	padding: 16px;

	margin: 20px;

	background-color: var(--color-main-background);

	color: var(--color-main-text);

	border-radius: var(--border-radius-large);

    box-shadow: none;

    border: none;

	cursor: default;

}



#body-login .picker-window.small {

    max-width: 100%;

}



#body-login .guest-box.login-box .button-vue--vue-tertiary-no-background .material-design-icon.eye-icon {

    opacity:0.5;

}

#body-login .guest-box.login-box .button-vue.button-vue--icon-and-text.button-vue--vue-primary.button-vue--wide .button-vue__wrapper .button-vue__icon {

    display:none;

}

#body-login .guest-box.login-box .input-field__label{

    color: #333333;

    font-weight: 700;

    font-size: 16px;

}

core/css/server.css

+13 −4
Original line number Diff line number Diff line
@@ -61,11 +61,9 @@ 
}



/* Force a few variables to right values for dark theme */

body[data-themes="dark"] {

body[data-themes="dark"] , body[data-themes="dark-highcontrast"]{

    --color-main-background-header: #272727;

    --input-background-color: #181818;

    --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000");

    --icon-notifications-notifications-new-000000: url("/svg/notifications/notifications-new?color=000");

    --icon-search-000: url("/svg/core/actions/search?color=fff");

    --logo: url("../img/logo@2x-dark.svg");

    --notification-icon-invert: invert(100%);
@@ -74,6 +72,15 @@ body[data-themes="dark"] { 
body.theme--highcontrast {

    --icon-inactive-color: black;

}

@media(prefers-color-scheme: dark){

    :root {

        --color-main-background-header: #272727;

        --input-background-color: #181818;

        --logo: url("../img/logo@2x-dark.svg");

        --notification-icon-invert: invert(100%);

    }

}





body {

    background-color: var(--color-main-background);
@@ -848,7 +855,9 @@ body[data-dashboard-background="default"] #app-dashboard h2 { 
#content.app-files #emptycontent .icon-share {

    background-image: var(--icon-files-share-808080);

}



#content {

    border-radius: unset;

}

#content #app-content-files #controls {

    background-color: var(--color-main-background);

}