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

Commit 63122c83 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/news-ui-fix' into 'main' 

fix  for files ,news and other Nc 28 regression

See merge request e/infra/ecloud/nextcloud-apps/ecloud-theme-helper!123
parents 68e870b1 c11bebc7

lib/Listeners/BeforeTemplateRenderedListener.php

+3 −0
Original line number Diff line number Diff line
@@ -105,5 +105,8 @@ class BeforeTemplateRenderedListener implements IEventListener { 
		if ($pathInfo === '/settings/user/privacy') {

			$this->util->addStyle($this->appName, 'settings-privacy');

		}

		if ($pathInfo === '/settings/help') {

			$this->util->addStyle($this->appName, 'settings-help');

		}

	}

}

scss/bookmarks.scss

+6 −0
Original line number Diff line number Diff line
@@ -6,3 +6,9 @@ 
#content-vue.content.app-bookmarks {

	overflow: hidden;

}

ul.navigation-list li>a[href="#settings-section_need-help"],

ul.navigation-list li>a[href="#settings-section_support-project"],

#settings-section_need-help,

#settings-section_support-project {

	display: none;

}
 
 No newline at end of file

scss/files.scss

+112 −0
Original line number Diff line number Diff line
@@ -77,3 +77,115 @@ 
svg#mdi-delete{

    filter: var(--inactive-icon-filter);

}





.content.app-files .material-design-icon.folder-icon {

	background-image: var(--icon-folder-007fff);

	display: inline-block;

	width: 32px;

	height: 32px;

	background-size: contain;

	background-position: center;

	background-repeat: no-repeat;

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

	cursor: pointer;

	position: absolute;

	z-index: 4;

}

.content.app-files .files-list__row-name .files-list__row-icon .material-design-icon.link-icon ,

.content.app-files .files-list__row-name .files-list__row-icon .material-design-icon.account-plus-icon {

	margin-top: 15px;

    margin-left: 20px;

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

    z-index: 999;

}

.content.app-files .files-list .files-list__row:hover .files-list__row-name .files-list__row-icon .material-design-icon.link-icon,

.content.app-files .files-list .files-list__row:hover .files-list__row-name .files-list__row-icon .material-design-icon.account-plus-icon {

	margin-top: 15px;

    margin-left: 20px;

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

    z-index: 999;

}

.content.app-files .material-design-icon.account-plus-icon svg,

.content.app-files .material-design-icon.link-icon svg {

	color: #007fff;

	z-index: 6;

	fill:#007fff

}



.content.app-files .material-design-icon.folder-icon svg,

.content.app-files a[href="/apps/files/files"] .app-navigation-entry-icon .icon-vue svg,

.content.app-files a[href="/apps/files/recent"] .app-navigation-entry-icon .icon-vue svg,

.content.app-files a[href="/apps/files/favorites"] .app-navigation-entry-icon .icon-vue svg,

.content.app-files a[href="/apps/files/shareoverview"] .app-navigation-entry-icon .icon-vue svg,

.content.app-files .files-list__header a[href="/apps/files/files?dir=/"] .button-vue__wrapper .icon-vue svg,

.content.app-files .files-list__header .button-vue__wrapper .button-vue__icon .material-design-icon.view-grid-icon svg {

	opacity: 0

}



.content.app-files a[href="/apps/files/files"] .app-navigation-entry-icon .icon-vue,

.content.app-files a[href="/apps/files/recent"] .app-navigation-entry-icon .icon-vue,

.content.app-files a[href="/apps/files/favorites"] .app-navigation-entry-icon .icon-vue,

.content.app-files a[href="/apps/files/shareoverview"] .app-navigation-entry-icon .icon-vue {

	display: flex;

	align-items: center;

	flex: 0 0 44px;

	justify-content: center;

	width: 44px;

	height: 44px;

	background-size: 16px 16px;

	background-repeat: no-repeat;

	background-position: 14px center;

}



.content.app-files a[href="/apps/files/files"] .app-navigation-entry-icon .icon-vue {

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

}



.content.app-files a[href="/apps/files/recent"] .app-navigation-entry-icon .icon-vue {

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

}



.content.app-files a[href="/apps/files/favorites"] .app-navigation-entry-icon .icon-vue {

	background-image: var(--icon-star-outline-808080);

}



.content.app-files a[href="/apps/files/shareoverview"] .app-navigation-entry-icon .icon-vue {

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

}



.content.app-files a[href="/apps/files/trashbin"] .app-navigation-entry-icon .icon-vue {

	filter: var(--inactive-icon-filter);

}

.content.app-files .files-list__header a[href="/apps/files/files?dir=/"] .button-vue__wrapper .icon-vue {

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

	background-size: 20px 20px;

}

.content.app-files .files-list__header a[href="/apps/files/recent?dir=/"] .button-vue__wrapper .icon-vue {

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

	background-size: 20px 20px;

}

.content.app-files .files-list__header a[href="/apps/files/favorites?dir=/"] .button-vue__wrapper .icon-vue {

	background-image: var(--icon-star-outline-808080);

	background-size: 20px 20px;

}

.content.app-files .files-list__header a[href="/apps/files/shareoverview?dir=/"] .button-vue__wrapper .icon-vue {

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

	background-size: 20px 20px;

}

.content.app-files .files-list__header .button-vue__wrapper .button-vue__text {

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

}	

.content.app-files .files-list__header .button-vue__wrapper .button-vue__icon .material-design-icon.view-grid-icon  {

	background-image: var(--icon-toggle-pictures-808080);

	background-repeat: no-repeat;

    display: inline-block;

    width: 18px;

    height: 18px;

    background-size: contain;

    background-position: center;

    background-repeat: no-repeat;

}

.content.app-files .files-list__row-actions button.button-vue--icon-only .icon-vue svg {

	color: var(--icon-inactive-color);

}
 
 No newline at end of file

scss/memories.scss

+10 −0
Original line number Diff line number Diff line
@@ -9,3 +9,13 @@ body[data-theme-dark] .menu-icon svg path { 
html {

    background-color: unset;

}



#body-user header#header .memories-searchbar input {

    background: var(--color-background-hover) !important;

}

#body-user header#header .memories-searchbar input::placeholder {

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

}

#body-user header#header .memories-menu-item .material-design-icon.cloud-upload-icon svg {

	fill: var(--icon-inactive-color) !important;

}
 
 No newline at end of file

scss/news.scss

+72 −0
Original line number Diff line number Diff line
@@ -8,3 +8,75 @@ 
.import-export button.icon-upload:hover{

    border-color: var(--color-primary-element);

}

#app-navigation .with-icon.ui-droppable [class*="icon-"] {

    background-position: 15px;

}

#app-navigation ul.with-icon li.folder.with-counter.with-menu .collapse {

    opacity: 0;

    position: absolute;

    width: 44px;

    height: 44px;

    margin: 0;

    z-index: 110;

    left: 0;

}



#app-navigation ul.with-icon li.folder.with-counter.with-menu .collapse {

    opacity: 0;

    position: absolute;

    width: 44px;

    height: 44px;

    margin: 0;

    z-index: 110;

    left: 0;

}



#app-navigation ul li.app-navigation-entry-utils-menu-button button {

    opacity: 0;

}



#app-navigation ul li.app-navigation-entry-utils-menu-button {

    width: 44px !important;

    background-image: var(--icon-more-dark);

    position: absolute;

    height: 44px;

    margin: 0;

    margin-top: -15px;

    z-index: 110;

    right: 0;

    background-repeat: no-repeat;

    opacity: 0.5;

}



#app-navigation ul.with-icon li .app-navigation-entry-menu {

    position: absolute;

    margin: 0;

    z-index: 110;

    right: 0;

    background-repeat: no-repeat;

}



#app-navigation ul.with-icon li .app-navigation-entry-menu.open {

    padding: 3px;

    z-index: 110;

    margin: 5px;

    margin-top: 25px;

    right: 12px;

    filter: drop-shadow(0 1px 3px);

}



#app-navigation ul.with-icon.ui-droppable .action.icon-checkmark {

    border-radius: 4px;

    width: 48px;

}



#app-navigation ul.with-icon.ui-droppable .icon-history.app-navigation-entry-deleted-button {

    width: 44px !important;

    position: absolute;

    height: 44px;

    margin: 0;

    margin-top: -40px;

    z-index: 110;

    right: 0;

    background-repeat: no-repeat;

}
 
 No newline at end of file