Skip to content
This repository has been archived by the owner on Jul 8, 2022. It is now read-only.

Commit

Permalink
Resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@atiupa
atiupa committed Apr 7, 2022
2 parents 17d9ef5 + f9ce2bc commit 4ebfedd
Show file tree
Hide file tree
Showing 12 changed files with 247 additions and 90 deletions.
67 changes: 58 additions & 9 deletions assets/css/openy_carnation.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
.openy_carnation-based.openy-gated-content #gated-content .gated-content-schedule-page,
.openy_carnation-based.openy-gated-content #gated-content .gated-content-favorites-page,
.openy_carnation-based.openy-gated-content #gated-content .gated-content-categories-page,
.openy_carnation-based.openy-gated-content #gated-content .gated-content-category-page,
.openy_carnation-based.openy-gated-content #gated-content .gated-content-instructor-page,
.openy_carnation-based.openy-gated-content #gated-content .gated-content-duration-page,
.openy_carnation-based.openy-gated-content #gated-content .gated-content-videos-page,
.openy_carnation-based.openy-gated-content #gated-content .gated-content-video-page,
.openy_carnation-based.openy-gated-content #gated-content .home {
padding-top: 0;
}
.openy_carnation-based.openy-gated-content.alerts #gated-content .gated-content-schedule-page .calendar .desktop .slot.dates {

}
@media (min-width: 1060px) {
.openy_carnation .desktop-menu .page-head__main-menu .navbar > li > a {
font-size: 14px;
Expand All @@ -15,11 +29,17 @@
}
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-favorites-page,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-categories-page,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-video-page {
padding-top: 50px;
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-category-page,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-instructor-page,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-duration-page,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-videos-page,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-video-page,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .home,
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-schedule-page .calendar .desktop .content {
padding-top: 88px;
}
.openy_carnation.openy-gated-content.toolbar-fixed #block-openy-carnation-content #gated-content .gated-content-schedule-page {
padding-top: 156px;
padding-top: 108px;
}
.openy_carnation.openy-gated-content article,
.openy_carnation.openy-gated-content .openy-page-tabs {
Expand All @@ -39,15 +59,36 @@
.openy_carnation-based.openy-gated-content #gated-content .top-menu {
top: 78px !important;
}
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content {
padding-top: 50px;
}
.openy_carnation-based.openy-gated-content #gated-content .gated-content-schedule-page {
padding-top: 114px;
}
}

@media (max-width: 991px) {
.openy_carnation-based.openy-gated-content #gated-content .top-menu {
top: 78px !important;
.openy_carnation-based.openy-gated-content #gated-content .date-filter {
top: 125px !important;
}
.openy_carnation-based.openy-gated-content #gated-content .gated-content-schedule-page {
padding-top: 16px;
}
}

@media (max-width: 1059px) {
.openy_carnation-based.openy-gated-content .viewport #gated-content .top-menu {
top: 78px !important;
}
.openy_carnation-based.openy-gated-content #gated-content {
padding-top: 78px;
}
.openy_carnation-based.openy-gated-content #gated-content .date-filter {
top: 156px;
}
.openy_carnation-based.openy-gated-content #gated-content .calendar .desktop .slot.dates {
top: 204px;
}
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content {
padding-top: 88px;
}
Expand All @@ -57,9 +98,6 @@
.openy_carnation-based.openy-gated-content.toolbar-fixed.toolbar-tray-open #gated-content .top-menu {
top: 156px !important;
}
.openy_carnation-based.openy-gated-content.toolbar-fixed.toolbar-tray-open #gated-content {
padding-top: 48px;
}
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .date-filter {
top: 202px !important;
}
Expand All @@ -73,6 +111,17 @@
padding-top: 112px;
}
.openy_carnation-based.openy-gated-content.toolbar-fixed.toolbar-tray-open #gated-content .gated-content-schedule-page {
padding-top: 108px;
padding-top: 158px;
}
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-schedule-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-favorites-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-categories-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-category-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-instructor-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-video-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-duration-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .gated-content-videos-page,
.openy_carnation-based.openy-gated-content.toolbar-fixed #gated-content .home {
padding-top: 46px;
}
}
44 changes: 34 additions & 10 deletions assets/css/openy_gated_content.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@
.openy-gated-content.toolbar-fixed .one-column-clean {
display: none;
}
.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-schedule-page,
.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-favorites-page,
.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-categories-page,
.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-video-page {
padding-top: 84px !important;
.openy-gated-content.toolbar-fixed #gated-content .gated-content-schedule-page,
.openy-gated-content.toolbar-fixed #gated-content .gated-content-favorites-page,
.openy-gated-content.toolbar-fixed #gated-content .gated-content-categories-page,
.openy-gated-content.toolbar-fixed #gated-content .gated-content-category-page,
.openy-gated-content.toolbar-fixed #gated-content .gated-content-instructor-page,
.openy-gated-content.toolbar-fixed #gated-content .gated-content-video-page,
.openy-gated-content.toolbar-fixed #gated-content .gated-content-duration-page,
.openy-gated-content.toolbar-fixed #gated-content .gated-content-videos-page,
.openy-gated-content.toolbar-fixed #gated-content .home {
padding-top: 84px;
}
.openy-gated-content.toolbar-fixed .layout-content #gated-content .top-menu,
.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-schedule-page .date-filter,
Expand All @@ -21,15 +26,34 @@
.openy-gated-content .layout-content #gated-content .gated-content-schedule-page .calendar .desktop .slot {
top: auto !important;
}
.openy-gated-content .layout-content #gated-content .gated-content-schedule-page,
.openy-gated-content .layout-content #gated-content .gated-content-favorites-page,
.openy-gated-content .layout-content #gated-content .gated-content-categories-page,
.openy-gated-content .layout-content #gated-content .gated-content-video-page {
padding-top: 86px !important;
.openy-gated-content #gated-content .gated-content-schedule-page,
.openy-gated-content #gated-content .gated-content-favorites-page,
.openy-gated-content #gated-content .gated-content-categories-page,
.openy-gated-content #gated-content .gated-content-category-page,
.openy-gated-content #gated-content .gated-content-instructor-page,
.openy-gated-content #gated-content .gated-content-duration-page,
.openy-gated-content #gated-content .gated-content-videos-page,
.openy-gated-content #gated-content .gated-content-video-page,
.openy-gated-content #gated-content .home {
padding-top: 86px;
}
.openy-gated-content .layout-content #gated-content .gated-content-schedule-page .calendar .desktop {
padding-top: 48px;
}
.openy-gated-content .layout-content #gated-content .gated-content-schedule-page .calendar .desktop .content {
margin-top: 64px;
}

@media (max-width: 991px) {
.openy-gated-content .layout-content #gated-content .gated-content-schedule-page,
.openy-gated-content .layout-content #gated-content .gated-content-favorites-page,
.openy-gated-content .layout-content #gated-content .gated-content-categories-page,
.openy-gated-content .layout-content #gated-content .gated-content-category-page,
.openy-gated-content .layout-content #gated-content .gated-content-instructor-page,
.openy-gated-content .layout-content #gated-content .gated-content-duration-page,
.openy-gated-content .layout-content #gated-content .gated-content-videos-page,
.openy-gated-content .layout-content #gated-content .gated-content-video-page,
.openy-gated-content .layout-content #gated-content .home {
padding-top: 46px;
}
}
76 changes: 60 additions & 16 deletions assets/css/openy_lily.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,68 @@
.openy_lily-based.toolbar-fixed.tiny-header .layout-content #gated-content {
padding-top: 0;
}
.openy_lily-based.openy-gated-content.alerts #openy_alerts_app_header {
padding-top: 86px;
}
.openy_lily-based.openy-gated-content.alerts .layout-content #gated-content .gated-content-schedule-page .calendar .desktop {
padding-top: 0;
}
.openy_lily-based.openy-gated-content.alerts .layout-content #gated-content .gated-content-schedule-page .calendar .desktop .content {
margin-top: 0;
}
.openy_lily-based.openy-gated-content.alerts.tiny-header #gated-content .gated-content-schedule-page .date-filter,
.openy_lily-based.openy-gated-content.alerts.tiny-header #gated-content .gated-content-schedule-page .calendar .desktop .slot.dates {
position: fixed !important;
}
.openy_lily-based.openy-gated-content.alerts.tiny-header #gated-content .gated-content-schedule-page .date-filter {
top: 248px !important;
}
.openy_lily-based.openy-gated-content.alerts.tiny-header #gated-content .gated-content-schedule-page .calendar .desktop .slot.dates {
top: 296px !important;
}
.openy_lily-based.openy-gated-content .status-message__alert {
height: 0;
}
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-schedule-page .calendar .desktop .content {
margin-top: 24px;
}
.openy_lily-based.openy-gated-content.toolbar-fixed.tiny-header #gated-content .top-menu {
top: 236px !important;
}
.openy_lily-based.openy-gated-content.toolbar-fixed #gated-content .top-menu {
top: 275px !important;
}
.openy_lily-based.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-schedule-page,
.openy_lily-based.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-favorites-page,
.openy_lily-based.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-categories-page,
.openy_lily-based.openy-gated-content.toolbar-fixed .layout-content #gated-content .gated-content-video-page,
.openy_lily-based.openy-gated-content.toolbar-fixed .layout-content #gated-content .home {
.openy_lily-based.openy-gated-content.toolbar-fixed #gated-content .date-filter {
top: 322px !important;
}
.openy_lily-based.openy-gated-content.toolbar-fixed #gated-content .calendar .desktop .slot.dates {
top: 370px !important;
}
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-schedule-page {
padding-top: 86px !important;
}
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-schedule-page,
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-favorites-page,
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-categories-page,
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-video-page,
.openy_lily-based.openy-gated-content .layout-content #gated-content .home {
padding-top: 32px !important;
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-schedule-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-favorites-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-categories-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-category-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-instructor-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-duration-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-videos-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .gated-content-video-page,
.openy_lily-based.openy-gated-content.alerts #gated-content .home {
padding-top: 0;
}
@media (max-width: 991px) {
.openy_lily-based.openy-gated-content .layout-content #gated-content {
padding-top: 0;
}
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-schedule-page {
padding-top: 48px;
padding-top: 46px;
}
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-schedule-page .calendar .mobile {
margin-top: 52px;
}
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-schedule-page,
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-favorites-page,
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-categories-page,
.openy_lily-based.openy-gated-content .layout-content #gated-content .gated-content-video-page {
.openy_lily-based.openy-gated-content .layout-content #gated-content div .home {
padding-top: 46px !important;
}
.openy_lily-based.openy-gated-content.toolbar-fixed #gated-content .top-menu,
Expand All @@ -48,6 +76,22 @@
.openy_lily-based.openy-gated-content.toolbar-fixed.toolbar-tray-open.tiny-header #gated-content .top-menu {
top: 154px !important;
}
.openy_lily-based.openy-gated-content.toolbar-fixed #gated-content .date-filter {
top: 200px !important;
}
.openy_lily-based.openy-gated-content.alerts .layout-container #openy_alerts_app_header {
padding-top: 46px;
}
.openy_lily-based.openy-gated-content .layout-content #gated-content .home {
padding-top: 0 !important;
}
.openy_lily-based.openy-gated-content.alerts.vy-route-Schedule.tiny-header #gated-content .gated-content-schedule-page .date-filter {
position: fixed;
top: 126px !important;
}
.openy_lily-based.openy-gated-content #gated-content .top-menu {
z-index: 100 !important;
}
}
@media (min-width: 992px) {
.openy_lily-based.openy-gated-content.toolbar-fixed .page-head .primary_menu {
Expand Down
Loading

0 comments on commit 4ebfedd

Please sign in to comment.