diff --git a/web/app/themes/mitlib-child/functions.php b/web/app/themes/mitlib-child/functions.php index 9533d5f1..f1323f33 100644 --- a/web/app/themes/mitlib-child/functions.php +++ b/web/app/themes/mitlib-child/functions.php @@ -31,6 +31,7 @@ function child_scripts_styles() { wp_register_style( 'interviews', get_stylesheet_directory_uri() . '/css/build/interviews.css', array(), $theme_version ); wp_register_style( 'interviewees', get_stylesheet_directory_uri() . '/css/build/interviewees.css', array(), $theme_version ); wp_register_style( 'child-style', get_stylesheet_uri(), array( 'parent-global', 'dashicons' ), $theme_version ); + wp_register_style( 'child-about', get_template_directory_uri() . '/css/build/about.css', $theme_version ); // Then we register javascript libraries. wp_deregister_script( 'jquery' ); @@ -57,6 +58,13 @@ function child_scripts_styles() { if ( is_post_type_archive( 'interviewee' ) ) { wp_enqueue_style( 'interviewees' ); } + + // Check to see which blog we're on + $blog_id_to_check = get_current_blog_id(); + // Load the about page styles only on the about page (33) in the about child site (19) + if ( is_page( '33' ) && $blog_id_to_check == 19 ) { + wp_enqueue_style( 'child-about' ); + } } add_action( 'wp_enqueue_scripts', 'Mitlib\Child\child_scripts_styles' ); diff --git a/web/app/themes/mitlib-child/style.css b/web/app/themes/mitlib-child/style.css index f99fdfeb..191e709a 100644 --- a/web/app/themes/mitlib-child/style.css +++ b/web/app/themes/mitlib-child/style.css @@ -1,7 +1,7 @@ /* Theme Name: MITlib Child Author: MIT Libraries -Version: 1.3 +Version: 1.4 Description: A child theme of the MIT Libraries' parent, focused on sites built primarily with static pages. Template: mitlib-parent @@ -19,13 +19,6 @@ Template: mitlib-parent background: #333; color: #fff; }*/ -body { - font-family:'Open Sans',Helvetica,sans-serif; -} - -h1,h2,h3,h4,h5,h6 { - font-family:'Open Sans',Helvetica,sans-serif; -} b, strong { font-weight: bold; diff --git a/web/app/themes/mitlib-news/css/newsmobile.css b/web/app/themes/mitlib-news/css/newsmobile.css index a384415a..2f16cb55 100644 --- a/web/app/themes/mitlib-news/css/newsmobile.css +++ b/web/app/themes/mitlib-news/css/newsmobile.css @@ -22,7 +22,7 @@ button#dropdownMenu1 { padding: 9px 0px; } .newsNav ul li.current-menu-item a { - color: rgb(88,137,193); + color: #666; } .page h2 { } @@ -48,7 +48,7 @@ ul#menu-mainnav { box-shadow: 0px 0 !important; } .newsNav ul li.current-menu-item a { - color: rgb(88,137,193); + color: #666; } li#menu-item-17755, li#menu-item-17832 { display: none @@ -67,8 +67,8 @@ li#menu-item-17755, li#menu-item-17832 { padding-left: 0px; } .newsNav ul li.current-menu-item { - background-color: rgb(88,137,193); - display: inline; + background-color: #e7e7e7; + color: #555; } hr.news { background-color: rgb(230, 230, 230); @@ -80,21 +80,21 @@ hr.news { margin-right: 0px; } .newsNav ul li { - border-radius: 5px; + border-radius: 0; background-color: #fff; display: inline; border: 1px solid rgb(230,230,230); margin-right: 5px; } .newsNav ul li.current-menu-item a { - color: #fff; + color: #555; } .newsNav ul li a { - color: rgb(88,137,193); - font-size: 12px; + color: #666; + font-size: 16px; } body.tax-bibliotech_issues .newsNav ul li a { - color: rgb(88,137,193); + color: #666; } .newsNav ul li a:hover { text-decoration: none; @@ -104,7 +104,7 @@ body.tax-bibliotech_issues .newsNav ul li a { padding-left: 0px; } .newsNav ul li.current-menu-item a:hover { - color: rgb(88,137,193); + color: #666; } body.tax-bibliotech_issues .newsNav ul li#menu-item-17024, body.page-bibliotech-about .newsNav ul li#menu-item-17024, body.single-bibliotech .newsNav ul li#menu-item-17024 { border-radius: 5px; @@ -147,7 +147,8 @@ li#menu-item-17755, li#menu-item-17832 { padding-left: 0px; } .newsNav ul li.current-menu-item { - background-color: rgb(88,137,193); + background-color: #e7e7e7; + color: #555; display: inline; } hr.news { @@ -160,21 +161,21 @@ hr.news { margin-right: 0px; } .newsNav ul li { - border-radius: 5px; + border-radius: 0; background-color: #fff; display: inline; border: 1px solid rgb(230,230,230); margin-right: 5px; } .newsNav ul li.current-menu-item a { - color: #fff; + color: #555; } .newsNav ul li a { - color: rgb(88,137,193); + color: #666; font-size: 12pt; } body.tax-bibliotech_issues .newsNav ul li a { - color: rgb(88,137,193); + color: #666; } .newsNav ul li a:hover { text-decoration: none; @@ -184,7 +185,7 @@ body.tax-bibliotech_issues .newsNav ul li a { padding-left: 0px; } .newsNav ul li.current-menu-item a:hover { - color: rgb(88,137,193); + color: #666; } body.tax-bibliotech_issues .newsNav ul li#menu-item-17024, body.page-bibliotech-about .newsNav ul li#menu-item-17024, body.single-bibliotech .newsNav ul li#menu-item-17024 { border-radius: 5px; @@ -228,8 +229,8 @@ li#menu-item-17755, li#menu-item-17832 { padding-left: 0px; } .newsNav ul li.current-menu-item { - border-radius: 5px; - background-color: rgb(88,137,193); + border-radius: 0; + background-color: #e7e7e7; display: inline; } hr.news { @@ -243,40 +244,43 @@ hr.news { width: 99%; } .newsNav ul li { - border-radius: 5px; + border-radius: 0; background-color: #fff; display: inline; border: 1px solid rgb(230,230,230); margin-right: 5px; } .newsNav ul li.current-menu-item a { - color: #fff; + color: #555; } .newsNav ul li a { - color: rgb(88,137,193); + color: #666; font-size: 12pt; } body.tax-bibliotech_issues .newsNav ul li a { - color: rgb(88,137,193); + color: #666; } .newsNav ul li a:hover { - text-decoration: none; + color: #0000ff; + background-color: #fff; + text-decoration: underline; } .newsNav { margin-bottom: 13px; padding-left: 0px; } .newsNav ul li.current-menu-item a:hover { - color: rgb(88,137,193); + background-color: #e7e7e7; + color: #0000ff; } body.tax-bibliotech_issues .newsNav ul li#menu-item-17024, body.page-bibliotech-about .newsNav ul li#menu-item-17024, body.single-bibliotech .newsNav ul li#menu-item-17024 { - border-radius: 5px; - background-color: rgb(88,137,193); + border-radius: 0; + background-color: #e7e7e7; display: inline; - color: white; + color: #555; } body.tax-bibliotech_issues .newsNav ul li#menu-item-17024 a, body.page-bibliotech-about .newsNav ul li#menu-item-17024 a, body.single-bibliotech .newsNav ul li#menu-item-17024 a { - color: #fff; + color: #555; } /*NAV*/ diff --git a/web/app/themes/mitlib-news/inc/sub-header.php b/web/app/themes/mitlib-news/inc/sub-header.php index 085208a2..e1aebc46 100644 --- a/web/app/themes/mitlib-news/inc/sub-header.php +++ b/web/app/themes/mitlib-news/inc/sub-header.php @@ -34,7 +34,7 @@