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

Commit 62b04a7d authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

Merge branch 'dev/5-5-11-ui-fix' into 'main' 

removed calendar css from here and move to calendar app

See merge request e/infra/ecloud/nextcloud-apps/ecloud-theme-helper!165
parents 24c81235 d7230b94

lib/Listeners/BeforeTemplateRenderedListener.php

+0 −3
Original line number Diff line number Diff line
@@ -49,9 +49,6 @@ class BeforeTemplateRenderedListener implements IEventListener { 
		if (strpos($pathInfo, '/apps/contacts') !== false) {

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

		}

		if (strpos($pathInfo, '/apps/calendar') !== false) {

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

		}

		if (strpos($pathInfo, '/apps/news') !== false) {

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

		}

scss/calendar.scss

deleted100644 → 0
+0 −251
Original line number Diff line number Diff line 
div.select2-drop .select2-search input,

select,

button:not(.button-vue),

.button,

input:not([type='range']),

textarea,

div[contenteditable=true],

.pager li a {

    margin: 3px 3px 3px 0;

    padding: 7px 6px;

    font-size: 13px;

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

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

    border: 1px solid var(--color-border-dark);

    outline: none;

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

    cursor: text;

}



button:not(.button-vue),

.button,

input[type='button'],

input[type='submit'],

input[type='reset'] {

    font-weight: bold;

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

}

.multiselect .multiselect__tags {

    border: 1px solid var(--color-border-dark) !important;

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

}



.property-title-time-picker__time-pickers .mx-datepicker .mx-input-wrapper .mx-input {

    border: 1px solid var(--color-border-dark) !important;

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

    box-shadow: none !important;

}

body .property-text__input span.icon-delete {

    background-image: none !important;

}

#app-sidebar-vue .multiselect .multiselect__tags {

    padding: 8px 0 8px 8px !important;

}



body .content.app-calendar {

    margin: 50px 0 0;

    width: 100% ;

    .button-vue--vue-secondary {

        color: var(--color-primary-light-text);

        background-color: var(--color-primary-light);

    }

    .button-vue--vue-primary {

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

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

        border-radius: 8px;

    }

    .button.new-event,

    .button.today {

        border-radius: 8px;

    }

    .button.today .button-vue__text {

        font-weight: normal;

    }

    .button-vue.datepicker-button-section__next.button.button-vue--icon-only.button-vue--vue-secondary,

    .button-vue.datepicker-button-section__previous.button.button-vue--icon-only.button-vue--vue-secondary,

    .button-vue.datepicker-button-section__datepicker-label.button.datepicker-label.button-vue--text-only.button-vue--vue-secondary {

        background-color: unset;

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

    }

}

.vs__dropdown-menu.vs__dropdown-menu--floating{

    z-index: 100000;

}

.timezone-popover-wrapper__title {

    padding-left: 10px;

}

.v-popper__inner .mx-datepicker-main .mx-datepicker-btn-confirm:hover {

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

}

#content-vue.app-calendar .fc-list-day-cushion:first-child {

    height: 50px;

    padding-top: 10px;

    line-height: 2;

    padding-left: 45px;

}

#content-vue.app-calendar table.fc-col-header col,

#content-vue.app-calendar table.fc-scrollgrid-sync-table col,

#content-vue.app-calendar .fc-timegrid-slots col,

#content-vue.app-calendar .fc-timegrid-cols col {

    width: 85px !important;

}

#content-vue.app-calendar .fc-scrollgrid {

    padding-top: 12px;

}

#content-vue.app-calendar tbody tr.fc-list-event td:first-child {

    padding-left: 45px !important;

}

@media screen and (max-width: 640px) {

    #content-vue.app-calendar .fc-dayGridMonth-view .fc-scroller tr th:first-child,

    #content-vue.app-calendar .fc-dayGridMonth-view .fc-scroller tr td.fc-day:first-child {

        width: 80px;

        text-align: end;

        padding-right: 10px;

    }

    #content-vue.app-calendar .fc-dayGridMonth-view .fc-scroller tr td.fc-day:first-child .fc-daygrid-day-top {

        justify-content: end;

        padding-right: 5px;

    }

}

#content-vue .app-navigation-header .datepicker-label {

    padding: 0;

}



#content-vue .app-navigation-header .datepicker-label .button-vue__text {

    white-space: unset;

}



#content-vue #app-navigation-vue .menu-icon svg path {

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

}



.app-sidebar {

    .v-select {

    &.select {

        .vs__dropdown-toggle {

        border: 1px solid var(--color-border-dark);

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

        }

        .vs__selected {

        z-index: 999;



        input {

            border: none;

        }

        }

        .vs__open-indicator-button {

        border: none;

        }

    }

    }

}

 

ul.vs__dropdown-menu.vs__dropdown-menu--floating {

    border: 1px solid var(--color-border-dark) !important;

    border-radius: unset !important;

    box-sizing: unset !important;

    box-shadow: unset !important;

}



.app-sidebar-tab__content .v-select.select.vs--open .vs__dropdown-toggle {

    border: 1px solid var(--color-border-dark);

    border-radius: unset;

    box-sizing: unset;

    border-width: 1px solid var(--color-border-dark) !important;

}





.app-sidebar-tab__content .invitees-list .avatar-participation-status__text {

    bottom:22px !important;

}



.settings-fieldset-interior-item__import-button.button.icon {

    display: inline-flex;

    align-items: center;

    justify-content: center;

    gap: 8px;

    width: 100%; 

}

#app-settings .settings-fieldset-interior-item__import-button.button.icon {

    display: inline-flex;

    align-items: center;

    justify-content: center;

    gap: 8px;

    width: 100%; 

}

#app-settings .settings-fieldset-interior-item__import-button.button.icon .material-design-icon.upload-icon {

    position: unset;

}



#app-settings .input-field__input {

    border: 1px solid var(--color-border-dark);

}

.vs__dropdown-toggle {

    border: 1px solid var(--color-border-dark) !important;

}

.app-sidebar-tabs__nav .checkbox-radio-switch--button-variant .checkbox-content .checkbox-content__icon .material-design-icon {

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

}

#attachments .attachments-summary .attachments-summary-inner .material-design-icon.paperclip-icon {

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

}



#attachments .attachments-summary .attachments-summary-inner .attachments-summary-inner-label {

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

}

#tab-app-sidebar-tab-details .app-sidebar-tab__content input,

#tab-app-sidebar-tab-attendees .app-sidebar-tab__content input,

#tab-app-sidebar-tab-resources .app-sidebar-tab__content input  {

    border: none;

}

.vs--searchable .vs__dropdown-toggle:hover,

.vs--searchable .vs__dropdown-toggle:active,

.vs--searchable .vs__dropdown-toggle:focus

 {

    outline:unset !important;

    border: 1px solid var(--color-border-dark) !important;

    box-sizing: unset !important;

    box-shadow: unset !important;

} 



.v-select.select:hover,

.v-select.select.active,

.v-select.select:focus

 {

    outline: unset !important;

    border: 1px solid var(--color-border-dark) !important;

} 

#content-vue.app-calendar .app-sidebar-header .material-design-icon.checkbox-marked-icon .material-design-icon__svg {

    color:unset;

}



.v-popper__wrapper .material-design-icon.calendar-icon.property-title-time-picker__icon,

.v-popper__wrapper .material-design-icon.web-icon.highlighted-timezone-icon,

.v-popper__wrapper .material-design-icon.map-marker-icon.property-text__icon,

.v-popper__wrapper .material-design-icon.text-box-outline-icon.property-text__icon,

.v-popper__wrapper .material-design-icon.account-multiple-icon,

.v-popper__wrapper .material-design-icon.help-circle-icon.avatar-participation-status__indicator,

.v-popper__wrapper .material-design-icon.pencil-icon

 {

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

}



#uid.vs__search {

  border: 0 !important;

  padding: 0 0 2px 0;

  padding-top: calc(36px - 1.2em - 2px);

  margin: 0;

  text-align: center;

}

.v-select.select.invitees-search__multiselect.vs--single.vs--searchable,

.v-select.select.invitees-search__multiselect.vs--single.vs--searchable:hover,

.v-select.select.invitees-search__multiselect.vs--single.vs--searchable.active,

.v-select.select.invitees-search__multiselect.vs--single.vs--searchable:focus,

.v-select.select.invitees-search__multiselect.vs--single.vs--searchable:focus-within,

.v-select.select.invitees-search__multiselect.vs--single.vs--searchable.vs--open {

    border: 0 !important;

}

#content-vue .app-navigation-header .datepicker-button-section button.button {

    max-width: unset;

    background-color: var(--color-primary-light) ;

}
 
 No newline at end of file