Skip to content

Commit 6ef81c0

Browse files
djanelle-mitdjanelle-mit
authored
Merge pull request #186 from MITLibraries/pw-120
Replace Open Sans with Neue Haas Grotesk as primary typeface on Wordpress
2 parents 741fefd + 5a95199 commit 6ef81c0

116 files changed

Lines changed: 449 additions & 370 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎web/app/themes/mitlib-child/functions.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ function child_scripts_styles() {
3131
wp_register_style( 'interviews', get_stylesheet_directory_uri() . '/css/build/interviews.css', array(), $theme_version );
3232
wp_register_style( 'interviewees', get_stylesheet_directory_uri() . '/css/build/interviewees.css', array(), $theme_version );
3333
wp_register_style( 'child-style', get_stylesheet_uri(), array( 'parent-global', 'dashicons' ), $theme_version );
34+
wp_register_style( 'child-about', get_template_directory_uri() . '/css/build/about.css', $theme_version );
3435

3536
// Then we register javascript libraries.
3637
wp_deregister_script( 'jquery' );
@@ -57,6 +58,13 @@ function child_scripts_styles() {
5758
if ( is_post_type_archive( 'interviewee' ) ) {
5859
wp_enqueue_style( 'interviewees' );
5960
}
61+
62+
// Check to see which blog we're on
63+
$blog_id_to_check = get_current_blog_id();
64+
// Load the about page styles only on the about page (33) in the about child site (19)
65+
if ( is_page( '33' ) && $blog_id_to_check == 19 ) {
66+
wp_enqueue_style( 'child-about' );
67+
}
6068
}
6169
add_action( 'wp_enqueue_scripts', 'Mitlib\Child\child_scripts_styles' );
6270

‎web/app/themes/mitlib-child/style.css‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
Theme Name: MITlib Child
33
Author: MIT Libraries
4-
Version: 1.3
4+
Version: 1.4
55
Description: A child theme of the MIT Libraries' parent, focused on sites built primarily with static pages.
66
Template: mitlib-parent
77
@@ -19,13 +19,6 @@ Template: mitlib-parent
1919
background: #333;
2020
color: #fff;
2121
}*/
22-
body {
23-
font-family:'Open Sans',Helvetica,sans-serif;
24-
}
25-
26-
h1,h2,h3,h4,h5,h6 {
27-
font-family:'Open Sans',Helvetica,sans-serif;
28-
}
2922

3023
b, strong {
3124
font-weight: bold;

‎web/app/themes/mitlib-news/css/newsmobile.css‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ button#dropdownMenu1 {
2222
padding: 9px 0px;
2323
}
2424
.newsNav ul li.current-menu-item a {
25-
color: rgb(88,137,193);
25+
color: #666;
2626
}
2727
.page h2 {
2828
}
@@ -48,7 +48,7 @@ ul#menu-mainnav {
4848
box-shadow: 0px 0 !important;
4949
}
5050
.newsNav ul li.current-menu-item a {
51-
color: rgb(88,137,193);
51+
color: #666;
5252
}
5353
li#menu-item-17755, li#menu-item-17832 {
5454
display: none
@@ -67,8 +67,8 @@ li#menu-item-17755, li#menu-item-17832 {
6767
padding-left: 0px;
6868
}
6969
.newsNav ul li.current-menu-item {
70-
background-color: rgb(88,137,193);
71-
display: inline;
70+
background-color: #e7e7e7;
71+
color: #555;
7272
}
7373
hr.news {
7474
background-color: rgb(230, 230, 230);
@@ -80,21 +80,21 @@ hr.news {
8080
margin-right: 0px;
8181
}
8282
.newsNav ul li {
83-
border-radius: 5px;
83+
border-radius: 0;
8484
background-color: #fff;
8585
display: inline;
8686
border: 1px solid rgb(230,230,230);
8787
margin-right: 5px;
8888
}
8989
.newsNav ul li.current-menu-item a {
90-
color: #fff;
90+
color: #555;
9191
}
9292
.newsNav ul li a {
93-
color: rgb(88,137,193);
94-
font-size: 12px;
93+
color: #666;
94+
font-size: 16px;
9595
}
9696
body.tax-bibliotech_issues .newsNav ul li a {
97-
color: rgb(88,137,193);
97+
color: #666;
9898
}
9999
.newsNav ul li a:hover {
100100
text-decoration: none;
@@ -104,7 +104,7 @@ body.tax-bibliotech_issues .newsNav ul li a {
104104
padding-left: 0px;
105105
}
106106
.newsNav ul li.current-menu-item a:hover {
107-
color: rgb(88,137,193);
107+
color: #666;
108108
}
109109
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 {
110110
border-radius: 5px;
@@ -147,7 +147,8 @@ li#menu-item-17755, li#menu-item-17832 {
147147
padding-left: 0px;
148148
}
149149
.newsNav ul li.current-menu-item {
150-
background-color: rgb(88,137,193);
150+
background-color: #e7e7e7;
151+
color: #555;
151152
display: inline;
152153
}
153154
hr.news {
@@ -160,21 +161,21 @@ hr.news {
160161
margin-right: 0px;
161162
}
162163
.newsNav ul li {
163-
border-radius: 5px;
164+
border-radius: 0;
164165
background-color: #fff;
165166
display: inline;
166167
border: 1px solid rgb(230,230,230);
167168
margin-right: 5px;
168169
}
169170
.newsNav ul li.current-menu-item a {
170-
color: #fff;
171+
color: #555;
171172
}
172173
.newsNav ul li a {
173-
color: rgb(88,137,193);
174+
color: #666;
174175
font-size: 12pt;
175176
}
176177
body.tax-bibliotech_issues .newsNav ul li a {
177-
color: rgb(88,137,193);
178+
color: #666;
178179
}
179180
.newsNav ul li a:hover {
180181
text-decoration: none;
@@ -184,7 +185,7 @@ body.tax-bibliotech_issues .newsNav ul li a {
184185
padding-left: 0px;
185186
}
186187
.newsNav ul li.current-menu-item a:hover {
187-
color: rgb(88,137,193);
188+
color: #666;
188189
}
189190
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 {
190191
border-radius: 5px;
@@ -228,8 +229,8 @@ li#menu-item-17755, li#menu-item-17832 {
228229
padding-left: 0px;
229230
}
230231
.newsNav ul li.current-menu-item {
231-
border-radius: 5px;
232-
background-color: rgb(88,137,193);
232+
border-radius: 0;
233+
background-color: #e7e7e7;
233234
display: inline;
234235
}
235236
hr.news {
@@ -243,40 +244,43 @@ hr.news {
243244
width: 99%;
244245
}
245246
.newsNav ul li {
246-
border-radius: 5px;
247+
border-radius: 0;
247248
background-color: #fff;
248249
display: inline;
249250
border: 1px solid rgb(230,230,230);
250251
margin-right: 5px;
251252
}
252253
.newsNav ul li.current-menu-item a {
253-
color: #fff;
254+
color: #555;
254255
}
255256
.newsNav ul li a {
256-
color: rgb(88,137,193);
257+
color: #666;
257258
font-size: 12pt;
258259
}
259260
body.tax-bibliotech_issues .newsNav ul li a {
260-
color: rgb(88,137,193);
261+
color: #666;
261262
}
262263
.newsNav ul li a:hover {
263-
text-decoration: none;
264+
color: #0000ff;
265+
background-color: #fff;
266+
text-decoration: underline;
264267
}
265268
.newsNav {
266269
margin-bottom: 13px;
267270
padding-left: 0px;
268271
}
269272
.newsNav ul li.current-menu-item a:hover {
270-
color: rgb(88,137,193);
273+
background-color: #e7e7e7;
274+
color: #0000ff;
271275
}
272276
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 {
273-
border-radius: 5px;
274-
background-color: rgb(88,137,193);
277+
border-radius: 0;
278+
background-color: #e7e7e7;
275279
display: inline;
276-
color: white;
280+
color: #555;
277281
}
278282
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 {
279-
color: #fff;
283+
color: #555;
280284
}
281285
/*NAV*/
282286

‎web/app/themes/mitlib-news/inc/sub-header.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<hr class="hidden-xs news">
3535
<div class="subNavH">
3636
<div class="row">
37-
<div class="no-padding-left col-xs-6 col-sm-6 col-sm-6 col-md-6 col-lg-6 newsNav dropdown">
37+
<div class="no-padding-left col-xs-6 col-sm-8 col-md-6 col-lg-6 newsNav dropdown">
3838
<?php
3939
// Main navigation.
4040
$defaults = array(
@@ -77,7 +77,7 @@
7777

7878

7979

80-
<div class="hidden-xs col-sm-6 col-sm-6 col-md-6 col-lg-6 catNav">
80+
<div class="hidden-xs col-sm-4 col-md-6 col-lg-6 catNav">
8181

8282
<ul>
8383

0 commit comments

Comments
 (0)