Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • asc-web-services/drupal-upstream
1 result
Show changes
Commits on Source (19)
Hide whitespace changes
Inline Side-by-side
Showing
with 167 additions and 38 deletions
composer.json
View file @ 63407e2a
......@@ -278,7 +278,8 @@
},
"patches": {
"drupal/core": {
"rm nolink": "patches/rm-nolink.patch"
"rm nolink": "patches/rm-nolink.patch",
"set viewmode to string": "patches/set_viewmode_to_string.patch"
},
"drupal/addtocalendar": {
"UTC Time Adjustment": "patches/utc-time-adjustment.patch"
......
composer.lock
View file @ 63407e2a
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "93bb43fdcf2ab8cbc619bd7d2538a7b7",
"content-hash": "1dae3715e7ac8d9307dd16503b582442",
"packages": [
{
"name": "asm89/stack-cors",
......
patches/set_viewmode_to_string.patch 0 → 100644
View file @ 63407e2a
diff --git a/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php b/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php
index c6b9f345a9..9b6031da03 100644
--- a/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php
+++ b/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php
@@ -115,12 +115,13 @@ private function configureViewModes(EditorInterface $editor) {
if (array_key_exists($view_mode, $bundles_per_view_mode)) {
$specific_bundles = $bundles_per_view_mode[$view_mode];
if ($view_mode == $default_view_mode) {
+ $view_mode_str = strval($view_mode);
$element_style_configuration[] = [
'isDefault' => TRUE,
'name' => $default_view_mode,
'title' => $all_view_modes[$view_mode],
'attributeName' => 'data-view-mode',
- 'attributeValue' => $view_mode,
+ 'attributeValue' => $view_mode_str,
'modelElements' => ['drupalMedia'],
'modelAttributes' => [
'drupalMediaType' => array_keys($media_bundles),
@@ -128,11 +129,12 @@ private function configureViewModes(EditorInterface $editor) {
];
}
else {
+ $view_mode_str = strval($view_mode);
$element_style_configuration[] = [
'name' => $view_mode,
'title' => $all_view_modes[$view_mode],
'attributeName' => 'data-view-mode',
- 'attributeValue' => $view_mode,
+ 'attributeValue' => $view_mode_str,
'modelElements' => ['drupalMedia'],
'modelAttributes' => [
'drupalMediaType' => $specific_bundles,
vendor/composer/installed.json
View file @ 63407e2a
......@@ -2467,7 +2467,8 @@
}
},
"patches_applied": {
"rm nolink": "patches/rm-nolink.patch"
"rm nolink": "patches/rm-nolink.patch",
"set viewmode to string": "patches/set_viewmode_to_string.patch"
}
},
"installation-source": "dist",
......
vendor/composer/installed.php
View file @ 63407e2a
......@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => '83a6cc7700ce11d7660742b1824a5e31a66677fa',
'reference' => '1b2ba447336c6bf78c7325a84f7b87f5f2c9b9ff',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
......@@ -1411,7 +1411,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'reference' => '83a6cc7700ce11d7660742b1824a5e31a66677fa',
'reference' => '1b2ba447336c6bf78c7325a84f7b87f5f2c9b9ff',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
......
web/core/PATCHES.txt
View file @ 63407e2a
......@@ -5,3 +5,7 @@ rm nolink
Source: patches/rm-nolink.patch
set viewmode to string
Source: patches/set_viewmode_to_string.patch
web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php
View file @ 63407e2a
......@@ -115,12 +115,13 @@ private function configureViewModes(EditorInterface $editor) {
if (array_key_exists($view_mode, $bundles_per_view_mode)) {
$specific_bundles = $bundles_per_view_mode[$view_mode];
if ($view_mode == $default_view_mode) {
$view_mode_str = strval($view_mode);
$element_style_configuration[] = [
'isDefault' => TRUE,
'name' => $default_view_mode,
'title' => $all_view_modes[$view_mode],
'attributeName' => 'data-view-mode',
'attributeValue' => $view_mode,
'attributeValue' => $view_mode_str,
'modelElements' => ['drupalMedia'],
'modelAttributes' => [
'drupalMediaType' => array_keys($media_bundles),
......@@ -128,11 +129,12 @@ private function configureViewModes(EditorInterface $editor) {
];
}
else {
$view_mode_str = strval($view_mode);
$element_style_configuration[] = [
'name' => $view_mode,
'title' => $all_view_modes[$view_mode],
'attributeName' => 'data-view-mode',
'attributeValue' => $view_mode,
'attributeValue' => $view_mode_str,
'modelElements' => ['drupalMedia'],
'modelAttributes' => [
'drupalMediaType' => $specific_bundles,
......
web/themes/asc_bootstrap_bux/asc_bootstrap_bux.libraries.yml
View file @ 63407e2a
......@@ -16,7 +16,6 @@ global-styling:
theme:
css/bux-styles.min.css: {}
css/style.css: {}
css/osu_navbar-resp-white.css: {}
css/ekko-lightbox.css: {}
js:
js/scripts.js: {}
......
web/themes/asc_bootstrap_bux/asc_bootstrap_bux.theme
View file @ 63407e2a
......@@ -19,7 +19,7 @@ function asc_bootstrap_bux_preprocess_page(&$vars, $hook)
//adds site name variable which is used as logo alt and title text
$vars['site_name'] = \Drupal::config('system.site')->get('name');
$vars['osu_logo'] = theme_get_setting('osu_logo', 'asc_bootstrap');
$vars['osu_logo'] = theme_get_setting('osu_logo', 'asc_bootstrap_bux');
}
function asc_bootstrap_bux_preprocess_node(&$vars, $hook)
......
web/themes/asc_bootstrap_bux/assets/sass/components/_fields.scss
View file @ 63407e2a
......@@ -19,12 +19,12 @@
}
.field--name-field-pull-quote {
border-top: solid 2px $blue-green;
border-bottom: solid 2px $blue-green;
font-size: $font-size-h3;
font-family: 'Capita', Times, serif;
font-weight: 400;
padding: 5px;
font-family: 'BuckeyeSerifBold';
font-size: 1.5rem;
line-height: 2.25rem;
margin: 0;
padding: 0;
color: $brand-gray;
}
article .field--name-body {
......
web/themes/asc_bootstrap_bux/assets/sass/components/_menu.scss
View file @ 63407e2a
......@@ -15,7 +15,8 @@
li{
font-family: 'BuckeyeSansBold';
color: $brand-gray
color: $brand-gray;
font-weight: normal;
}
}
......
web/themes/asc_bootstrap_bux/assets/sass/components/_paragraphs.scss
View file @ 63407e2a
......@@ -229,7 +229,7 @@
.btn-par {
font-family: 'BuckeyeSansSemiBold';
text-transform: capitalize;
text-transform: none;
white-space: initial;
.fa-angle-right {
......@@ -484,7 +484,7 @@
color: $white;
background: $brand-red;
padding: 10px 15px;
text-transform: capitalize;
text-transform: none;
font-family: 'BuckeyeSansBold';
&:hover{
......@@ -624,7 +624,7 @@
background: $brand-red;
padding: 10px;
font-weight: 600;
text-transform: uppercase;
text-transform: none;
@media (max-width: 768px) {
width: 100%;
......@@ -702,7 +702,10 @@
//## Pull Quote
.paragraph--type--pull-quote {
padding: 20px;
padding: 11px 22px;
margin: 30px;
font-size: 20px;
border-left: 5px solid $brand-red;
}
......
web/themes/asc_bootstrap_bux/assets/sass/components/_people.scss
View file @ 63407e2a
......@@ -74,14 +74,11 @@
.views-field-field-last-name {
font-family: 'BuckeyeSansBold';
font-size: 18px;
color: $brand-gray;
a {
color: $brand-gray;
&:hover {
color: $brand-red;
text-decoration: none;
}
&:hover {
color: $brand-red;
text-decoration: none;
}
@media (max-width: 768px) {
......@@ -227,7 +224,7 @@
}
}
.profile_social{
.profile-social{
display: flex;
flex-direction: row;
gap: 10px;
......
web/themes/asc_bootstrap_bux/assets/sass/components/_sidebar-menu.scss
View file @ 63407e2a
......@@ -8,12 +8,13 @@ aside {
width: 100%;
li {
border-top: 2px solid #eff1f2;
line-height: 1.15;
float: left;
width: 100%;
.link-wrapper {
padding: 8px 0;
padding: 15px 0;
&:hover{
padding-left: 5px;
......@@ -156,6 +157,9 @@ aside {
}
}
.nav {
border-bottom: 2px solid #eff1f2;
}
@media (max-width: 768px) {
width: 100%;
......
web/themes/asc_bootstrap_bux/assets/sass/components/_wysiwyg.scss
View file @ 63407e2a
......@@ -68,8 +68,8 @@
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
text-transform: capitalize;
font-family: 'BuckeyeSansRegular';
text-transform: none;
font-family: 'BuckeyeSansBold';
.fa-angle-right {
margin-left: 10px;
......
web/themes/asc_bootstrap_bux/assets/sass/layout/_default.scss
View file @ 63407e2a
......@@ -202,10 +202,11 @@ h1, h2, h3, h4, h5, h6 {
margin: 11px 0;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-weight: normal;
}
h1 {
font-size: 2.625rem;
font-size: 2.5rem;
line-height: 1.2;
font-family: 'BuckeyeSerifBlack';
color: $brand-gray;
......
web/themes/asc_bootstrap_bux/assets/sass/layout/_footer.scss
View file @ 63407e2a
......@@ -66,6 +66,10 @@
-moz-osx-font-smoothing: grayscale;
font-size: $font-size-h3;
font-weight: $headings-font-weight;
a {
text-decoration: none;
}
}
}
......
web/themes/asc_bootstrap_bux/assets/sass/layout/_header.scss
View file @ 63407e2a
......@@ -6,7 +6,7 @@
// --------------------------------------------------
#header-logos {
padding: 0 15px;
padding: 20px 15px;
max-width: fit-content;
display: flex;
flex-direction: column;
......@@ -24,17 +24,24 @@
color: $brand-red;
}
@media (max-width: 768px) {
padding: 20px 15px;
height: auto;
}
}
.unit-name{
color: $brand-gray;
font-size: 3rem;
font-family: 'BuckeyeSansBlack';
color: $brand-gray;
font-size: 2rem;
line-height: 2.5rem;
font-family: 'BuckeyeSansBlack';
}
.parent-name{
color: $brand-gray;
font-size: 1.5rem;
font-size: 1.25rem;
line-height: 1.625rem;
}
......@@ -60,6 +67,20 @@
// --------------------------------------------------
//## OSU Navbar
.bux-osu-nav__link {
font-family: 'BuckeyeSansSemiBold';
a {
font-weight: normal;
}
}
// --------------------------------------------------
//## Search Form.
......
web/themes/asc_bootstrap_bux/assets/sass/layout/_section-background-colors.scss
View file @ 63407e2a
......@@ -57,6 +57,10 @@
.sec-title {
margin-top: 20px;
}
.btn-fullw {
background-color: $white;
}
}
// .lgray-bg:before {
......@@ -98,6 +102,10 @@
.sec-title {
margin-top: 20px;
}
.btn-fullw {
background-color: $white;
}
}
.lviolet-bg {
......@@ -129,6 +137,10 @@
.sec-title {
margin-top: 20px;
}
.btn-fullw {
background-color: $white;
}
}
.ltaupe-bg {
......@@ -160,6 +172,10 @@
.sec-title {
margin-top: 20px;
}
.btn-fullw {
background-color: $white;
}
}
.lturquoise-bg {
......@@ -191,6 +207,10 @@
.sec-title {
margin-top: 20px;
}
.btn-fullw {
background-color: $white;
}
}
.lteal-bg {
......@@ -222,6 +242,10 @@
.sec-title {
margin-top: 20px;
}
.btn-fullw {
background-color: $white;
}
}
.lyellow-bg {
......@@ -253,6 +277,10 @@
.sec-title {
margin-top: 20px;
}
.btn-fullw {
background-color: $white;
}
}
......@@ -317,10 +345,23 @@
}
.btn-fullw {
background-color: $white;
color: $brand-gray;
border: solid $white 2px;
text-decoration: none;
&:hover {
border: solid $brand-gray 2px;
color: $white;
background-color: $brand-red;
}
}
.btn-fullw-red {
&:hover {
background-color: $white;
color: $brand-gray;
border: solid $white 2px;
}
}
......@@ -387,6 +428,8 @@
.btn-fullw {
border: solid $white 2px;
color: $white;
text-decoration: none;
&:hover {
border: solid $brand-gray 2px;
......@@ -456,6 +499,8 @@
.btn-fullw {
border: solid $white 2px;
color: $white;
text-decoration: none;
&:hover {
border: solid $brand-gray 2px;
......@@ -525,6 +570,8 @@
.btn-fullw {
border: solid $white 2px;
color: $white;
text-decoration: none;
&:hover {
border: solid $brand-gray 2px;
......@@ -594,6 +641,8 @@
.btn-fullw {
border: solid $white 2px;
color: $white;
text-decoration: none;
&:hover {
border: solid $brand-gray 2px;
......@@ -663,6 +712,8 @@
.btn-fullw {
border: solid $white 2px;
color: $white;
text-decoration: none;
&:hover {
border: solid $brand-gray 2px;
......@@ -732,6 +783,8 @@
.btn-fullw {
border: solid $white 2px;
color: $white;
text-decoration: none;
&:hover {
border: solid $brand-gray 2px;
......
web/themes/asc_bootstrap_bux/assets/sass/pages/_basic-page.scss
View file @ 63407e2a
......@@ -28,6 +28,11 @@ article.page {
background: $brand-gray;
color: $white;
padding: 20px;
p {
font-family: "BuckeyeSansRegular";
color: $white;
}
}
@media (max-width: 1030px) {
......