Resolve conflicts (1e726538) · Commits · e / infra / ecloud / nextcloud-apps / nextcloud-theme

.gitlab-ci.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ include:
	- \|		- \|
	ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT		ssh $SSH_USER@$DEPLOYMENT_HOST /bin/bash -s << EOT
	git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME}		git clone --depth 1 $CI_REPOSITORY_URL --branch $CI_COMMIT_REF_NAME --single-branch /tmp/${CI_JOB_ID}/${APP_NAME}
	sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME} ${DEPLOYMENT_PATH}/html/themes/${APP_NAME}		sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/${APP_NAME}/ ${DEPLOYMENT_PATH}/html/themes/${APP_NAME}/
	docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ maintenance:theme:update		docker exec -u www-data $CONTAINER_NAME /usr/local/bin/php /var/www/html/occ maintenance:theme:update
	EOT		EOT
	- echo "SUCCESS" > .job_status		- echo "SUCCESS" > .job_status

core/css/guest.css

+25 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1116,6 +1116,14 @@ a.legal {
	color: #808080;		color: #808080;
	font-family: "Montserrat";		font-family: "Montserrat";
	}		}

			#body-login .warning-message {
			width: 50%;
			margin: 0 auto;
			margin-top: 0;
			padding: 0;
			}

	#body-login .v-align {		#body-login .v-align {
	display: flex;		display: flex;
	flex-direction: column;		flex-direction: column;
	@@ -1134,12 +1142,21 @@ a.legal {
	max-height: 100%;		max-height: 100%;
	transition: all 0.3s linear;		transition: all 0.3s linear;
	}		}
	#body-login .warning-message {
	width: 50%;		#body-login .v-align .guest-box {
	margin: 0 auto;		justify-content: center !important;
	margin-top: 0;		width: 92%;
	padding: 0;		margin-left: 0;
			margin-right: 0;
			border: 1px solid;
			box-shadow: none;
			color: #029f3c;
			}
			#body-login .icon.icon-checkmark,
			#body-login .icon-checkmark-white{
			display:none;
	}		}

	#body-login #user,		#body-login #user,
	#body-login #password,		#body-login #password,
	#body-login .totp-form > input[type="tel"] {		#body-login .totp-form > input[type="tel"] {
	@@ -1149,7 +1166,6 @@ a.legal {
	border: 1px solid #E6E8E9;		border: 1px solid #E6E8E9;
	box-sizing: border-box;		box-sizing: border-box;
	border-radius: 8px;		border-radius: 8px;
	margin: 12px 0px;
	font-size: 16px;		font-size: 16px;
	background-color: #ffffff;		background-color: #ffffff;
	}		}
	@@ -1550,6 +1566,7 @@ a.legal {
	overflow: hidden;		overflow: hidden;
	position: unset !important;		position: unset !important;
	height: unset;		height: unset;
			padding: 0 5vh;
	}		}
	.banner-content-get-free-murena{		.banner-content-get-free-murena{
	font-size: 18px;		font-size: 18px;
	@@ -1622,6 +1639,8 @@ a.legal {
	#body-login .guest-box.login-box {		#body-login .guest-box.login-box {
	border-radius: none;		border-radius: none;
	box-shadow: none;		box-shadow: none;
			border: none;
			color: var(--color-main-text);
	}		}
	#body-login .login-form__headline {		#body-login .login-form__headline {
	display:none		display:none
	@@ -1630,7 +1649,6 @@ a.legal {
	vertical-align: middle;		vertical-align: middle;
	height: 36px;		height: 36px;
	line-height: 36px;		line-height: 36px;
	top: 12px;
	}		}
	#body-login .button-vue--vue-primary{		#body-login .button-vue--vue-primary{
	margin: 46px 0px;		margin: 46px 0px;

core/css/server.css

+20 −4

Original line number	Original line	Diff line number	Diff line
	@@ -416,8 +416,7 @@ footer {
	#header .notification-wrapper .dismiss-all .icon.icon-close {		#header .notification-wrapper .dismiss-all .icon.icon-close {
	margin-top: 4px;		margin-top: 4px;
	}		}
	#content #app-navigation,		#content #app-navigation {
	#content.app-news #app-navigation button {
	color: var(--color-main-text);		color: var(--color-main-text);
	border-right: 1px solid var(--color-border);		border-right: 1px solid var(--color-border);
	}		}
	@@ -1060,7 +1059,6 @@ button.primary .icon-upload,
	#content-vue.app-calendar .settings-fieldset-interior-item .icon-upload,		#content-vue.app-calendar .settings-fieldset-interior-item .icon-upload,
	#content-vue.app-bookmarks #app-settings-content button .icon-upload,		#content-vue.app-bookmarks #app-settings-content button .icon-upload,
	button.import-contact__button-main .icon-upload,		button.import-contact__button-main .icon-upload,
	.import-export button.icon-upload,
	.attachments-drag-zone button.icon-upload {		.attachments-drag-zone button.icon-upload {
	background-image: var(--icon-upload-000);		background-image: var(--icon-upload-000);
	}		}
	@@ -1837,3 +1835,21 @@ body.theme--dark.theme--highcontrast #header .app-menu li:focus a {
	filter: var(--inactive-icon-filter);		filter: var(--inactive-icon-filter);
	opacity: 1;		opacity: 1;
	}		}
			input:not([type=range],
			.input-field__input,
			[type=submit],
			[type=button],
			[type=reset],
			.multiselect__input,
			.select2-input,
			.action-input__input,
			[class^=vs__]),
			select,
			div[contenteditable=true],
			textarea {
			border: 1px solid var(--color-border-dark);
			border-radius: var(--border-radius);
			}
			#content.app-murena-dashboard{
			overflow:scroll;
			}