Skip to content

Commit

Permalink
Remove tailwind's collapse class to prevent interfering with Bootstra…
Browse files Browse the repository at this point in the history
…p class

Also add fix for navbar height
  • Loading branch information
occupant committed Mar 8, 2023
1 parent b572c8e commit 2ca5f80
Show file tree
Hide file tree
Showing 8 changed files with 779 additions and 558 deletions.
3 changes: 3 additions & 0 deletions css/clf.7.local.css
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,9 @@ a#ubc7-global-utility-no-script {
#ubc7-unit-menu .nav > li > a {
padding-top: 11px !important;
}
#ubc7-unit-menu .navbar-item {
max-height: 45px !important;
}
}

@media only screen and (-o-min-device-pixel-ratio: "3/2"), only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min--moz-device-pixel-ratio: 1.5), only screen and (min-device-pixel-ratio: 1.5) {
Expand Down
35 changes: 25 additions & 10 deletions css/drupal.media.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@
/* Throbber / ajax loading animation */
/* CLF 8 Breakpoints map */
/* CLF 7 Breakpoints map to control version 7 of the CLF separately */
.field--name-field-media-image-1, .media--type-image {
.field--name-field-media-image-1,
.media--type-image {
margin-top: calc(var(--leading) * var(--base-font-size));
}
.ubc-card__media .media--type-image, figure .media--type-image {
.ubc-card__media .media--type-image,
figure .media--type-image {
margin-top: 0px;
}
.text-formatted figure:not([class*="align-"]) {
Expand All @@ -60,26 +62,35 @@ figure[class*="align-"] figcaption {
display: table-caption;
caption-side: bottom;
}
figure.align-center, figure.align-right, figure.align-left {
figure.align-center,
figure.align-right,
figure.align-left {
margin-top: 0px;
}
figure.align-left, .align-left.media {
figure.align-left,
.align-left.media {
margin-right: calc(var(--leading) * var(--base-font-size));
margin-bottom: calc(var(--leading) * var(--base-font-size));
}
[class^="widget-"].align-left {
margin-right: calc(var(--leading) * var(--base-font-size));
max-width: 28rem;
}
figure.align-right, .align-right.media {
figure.align-right,
.align-right.media {
margin-left: calc(var(--leading) * var(--base-font-size));
margin-bottom: calc(var(--leading) * var(--base-font-size));
}
[class^="widget-"].align-right {
margin-left: calc(var(--leading) * var(--base-font-size));
max-width: 28rem;
}
.align-center .media--type-image, .align-left .media--type-image, .align-right .media--type-image, .align-center.media--type-remote-video, .align-left.media--type-remote-video, .align-right.media--type-remote-video {
.align-center .media--type-image,
.align-left .media--type-image,
.align-right .media--type-image,
.align-center.media--type-remote-video,
.align-left.media--type-remote-video,
.align-right.media--type-remote-video {
margin-top: calc(var(--leading) * var(--base-font-size));
}
/* captions */
Expand All @@ -90,7 +101,8 @@ figure.caption-drupal-media figcaption {
margin-bottom: calc(var(--leading) * var(--base-font-size));
}
/* specific overrides */
.carousel__cell .media--type-remote-video, .media--type-remote-video.media--view-mode--featured-content {
.carousel__cell .media--type-remote-video,
.media--type-remote-video.media--view-mode--featured-content {
margin-top: 0px;
margin-bottom: 0px;
}
Expand Down Expand Up @@ -119,17 +131,20 @@ figure.caption-drupal-media figcaption {
}
@media (max-width: 767px) {

figure.align-left, .align-left.media {
figure.align-left,
.align-left.media {
float: none;
margin-right: 0px;
}

figure.align-right, .align-right.media {
figure.align-right,
.align-right.media {
float: none;
margin-left: 0px;
}

[class^="widget-"].align-left, [class^="widget-"].align-right {
[class^="widget-"].align-left,
[class^="widget-"].align-right {
float: none;
margin-left: 0px;
margin-right: 0px;
Expand Down
9 changes: 4 additions & 5 deletions css/drupal.webform.css
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
position: relative;
}

.text-count-message, .description {
.text-count-message,
.description {
font-size: .875rem;
--tw-text-opacity: 1;
color: rgb(97 97 97 / var(--tw-text-opacity));
Expand All @@ -125,8 +126,7 @@
border-width: 1px;
text-align: center;
text-transform: uppercase;
-webkit-text-decoration-line: none;
text-decoration-line: none;
text-decoration-line: none;
padding: 0.5em 1em .3em;
cursor: pointer;
transition: all 0.125s ease-out;
Expand All @@ -138,8 +138,7 @@
}

.webform-submission-form input[type="submit"]:not(.webform-button--submit):hover {
-webkit-text-decoration-line: none;
text-decoration-line: none;
text-decoration-line: none;
--tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
--tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
Expand Down
Loading

0 comments on commit 2ca5f80

Please sign in to comment.