From 794b7ef71a7d610dc0c196d901682e1c9dcc4da8 Mon Sep 17 00:00:00 2001 From: sacarney Date: Fri, 1 Sep 2017 12:56:58 -0500 Subject: [PATCH 01/10] NREM-216 Change white text in month view event cells (#139) * NREM-216 Change white text in month view event cells Also applied event cell styling to cells in week view. * NREM-216 Stronger selector to change link color --- css/suitcase.css | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/css/suitcase.css b/css/suitcase.css index ddc7b45..d44fd40 100644 --- a/css/suitcase.css +++ b/css/suitcase.css @@ -2324,7 +2324,7 @@ h2.node-title { /* --- Month View --- */ -/* Big stick... */ +/* The td is required to override the powerful module selector */ .calendar-calendar .month-view .full td.single-day div.monthview, .calendar-calendar .week-view .full td.single-day div.weekview, .calendar-calendar .day-view .full td.single-day div.dayview { @@ -2332,15 +2332,23 @@ h2.node-title { border: 1px solid #ddd; } +/* The div is required to override the powerful module selector */ +.calendar-calendar .month-view .full div.single-day div.monthview, +.calendar-calendar .week-view .full div.single-day div.weekview, +.calendar-calendar .day-view .full div.single-day div.dayview { + background: #efefef; + border: 1px solid #ddd; +} + .calendar-calendar .month-view .full td.multi-day div.monthview, .calendar-calendar .week-view .full td.multi-day div.weekview, .calendar-calendar .day-view .full td.multi-day div.dayview { background: #006ba6; } -.multi-day .calendar.monthview a, -.multi-day .calendar.weekview a, -.multi-day .calendar.dayview a { +td.multi-day .calendar.monthview a, +td.multi-day .calendar.weekview a, +td.multi-day .calendar.dayview a { color: #fff; } From 030b21384cdf659ce9c10ae3381afe6fb78fa7db Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Tue, 5 Sep 2017 17:02:13 -0500 Subject: [PATCH 02/10] INTERIM-134 Made taxonomy styling selectors more general --- css/suitcase.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/css/suitcase.css b/css/suitcase.css index d44fd40..33d63ab 100644 --- a/css/suitcase.css +++ b/css/suitcase.css @@ -1909,19 +1909,16 @@ ul.menu li { /* Field Name: Field Tags */ /* Field Name: Field Category */ -.field-name-field-tags .field-label, -.field-name-field-category .field-label { +.field-type-taxonomy-term-reference .field-label { margin-top: 2px; margin-bottom: 5px; } -.field-name-field-tags .field-item, -.field-name-field-category .field-item { +.field-type-taxonomy-term-reference .field-item { display: inline-block; } -.field-name-field-tags .field-item a, -.field-name-field-category .field-item a { +.field-type-taxonomy-term-reference .field-item a { display: inline-block; margin-right: 0.5em; margin-bottom: 0.5rem; @@ -1933,8 +1930,7 @@ ul.menu li { border: 1px solid #e2e2e2; transition: background 0.25s ease; } - .field-name-field-tags .field-item a:hover, - .field-name-field-category .field-item a:hover { + .field-type-taxonomy-term-reference .field-item a:hover { text-decoration: none; background: #f5f5f5; } From 644414231b57f18337ee7b44371312fafdad3591 Mon Sep 17 00:00:00 2001 From: Nick Booher Date: Fri, 15 Sep 2017 10:29:07 -0500 Subject: [PATCH 03/10] Consistency --- theme-settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/theme-settings.php b/theme-settings.php index e696e81..09dce1e 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -258,7 +258,7 @@ function suitcase_interim_config_form_submit($form, &$form_state) { ); $menu_exists = (bool) db_query_range('SELECT 1 FROM {menu_custom} WHERE menu_name = :menu_name', 0, 1, array(':menu_name' => $menu['menu_name']))->fetchField(); - $link_exists = db_query_range('SELECT 1 FROM {menu_links} WHERE menu_name = :menu_name', 0, 1, array(':menu_name' => $menu['menu_name']))->fetchField(); + $link_exists = (bool) db_query_range('SELECT 1 FROM {menu_links} WHERE menu_name = :menu_name', 0, 1, array(':menu_name' => $menu['menu_name']))->fetchField(); if (!$menu_exists && !$link_exists) { From 1bc8e8552dcb96153d59415a75b6933a8a22149a Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Wed, 20 Sep 2017 09:42:46 -0500 Subject: [PATCH 04/10] INTERIM-138 Added form settings for wordmark alt text --- preprocess/preprocess-region.inc | 1 + theme-settings.php | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/preprocess/preprocess-region.inc b/preprocess/preprocess-region.inc index f511cd3..2819fe0 100644 --- a/preprocess/preprocess-region.inc +++ b/preprocess/preprocess-region.inc @@ -18,6 +18,7 @@ function suitcase_interim_alpha_preprocess_region(&$vars) { // Get the level 1 url $vars['level_1_url'] = variable_get('suitcase_interim_config_level_1_url'); + $vars['wordmark_alt_text'] = variable_get('suitcase_interim_config_isu_nameplate_alt_text'); $vars['suitcase_interim_config_level_2_url'] = variable_get('suitcase_interim_config_level_2_url'); diff --git a/theme-settings.php b/theme-settings.php index 09dce1e..1bd9011 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -85,6 +85,14 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state) '#weight' => 2, ); + $form['suitcase_interim_config']['suitcase_interim_config_logo']['suitcase_interim_config_isu_nameplate_alt_text'] = array( + '#type' => 'textfield', + '#title' => t('Wordmark Alt Text'), + '#description' => t('Alt text for the site\'s wordmark. Defaults to Iowa State University.'), + '#default_value' => variable_get('suitcase_interim_config_isu_nameplate_alt_text', 'Iowa State University'), + '#weight' => 3, + ); + $form['suitcase_interim_config']['suitcase_interim_config_logo']['suitcase_interim_config_level_2_url'] = array( '#type' => 'hidden', '#attributes' => array( @@ -174,6 +182,8 @@ function suitcase_interim_config_form_submit($form, &$form_state) { variable_set('suitcase_interim_config_isu_nameplate_display', $form_state['values']['suitcase_interim_config_isu_nameplate_display']); + variable_set('suitcase_interim_config_isu_nameplate_alt_text', $form_state['values']['suitcase_interim_config_isu_nameplate_alt_text']); + variable_set('suitcase_interim_config_show_advanced_settings', $form_state['values']['suitcase_interim_config_show_advanced_settings']); // Decide which level the site name should be set to From d886a73ff117ee9275df827bb52402ea2aef8896 Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Wed, 20 Sep 2017 09:43:06 -0500 Subject: [PATCH 05/10] INTERIM-138 Changed template to allow wordmark alt text customization --- templates/region--branding.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php index d3be6a0..7d7cd98 100644 --- a/templates/region--branding.tpl.php +++ b/templates/region--branding.tpl.php @@ -4,9 +4,9 @@ - Iowa State University + <?php print $wordmark_alt_text; ?> - Iowa State University - <?php print $site_name; ?> + <?php print $wordmark_alt_text; ?> From dcf279d083cd6af60d6538eba8a35bb0e5da1812 Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Wed, 20 Sep 2017 10:41:30 -0500 Subject: [PATCH 06/10] INTERIM-138 Added default config for wordmark alt text --- suitcase_interim.info | 1 + 1 file changed, 1 insertion(+) diff --git a/suitcase_interim.info b/suitcase_interim.info index 628dacf..a71f351 100644 --- a/suitcase_interim.info +++ b/suitcase_interim.info @@ -52,6 +52,7 @@ settings[toggle_secondary_menu] = '1' settings[default_logo] = '1' settings[logo_path] = 'sites/all/themes/suitcase_interim/images/isu.svg' settings[logo_upload] = '' +settings[suitcase_interim_config_isu_nameplate_alt_text] = 'Iowa State University' settings[default_favicon] = '0' settings[favicon_path] = 'sites/all/themes/suitcase_interim/images/favicon.ico' settings[favicon_upload] = '' From cf4f16af83c396fcf18b60bc2fd5e9d7e05d451b Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Wed, 20 Sep 2017 11:30:49 -0500 Subject: [PATCH 07/10] INTERIM-138 Added logic needed to set default alt text value --- preprocess/preprocess-region.inc | 2 +- theme-settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/preprocess/preprocess-region.inc b/preprocess/preprocess-region.inc index 2819fe0..3d3890e 100644 --- a/preprocess/preprocess-region.inc +++ b/preprocess/preprocess-region.inc @@ -18,7 +18,7 @@ function suitcase_interim_alpha_preprocess_region(&$vars) { // Get the level 1 url $vars['level_1_url'] = variable_get('suitcase_interim_config_level_1_url'); - $vars['wordmark_alt_text'] = variable_get('suitcase_interim_config_isu_nameplate_alt_text'); + $vars['wordmark_alt_text'] = theme_get_setting('suitcase_interim_config_isu_nameplate_alt_text'); $vars['suitcase_interim_config_level_2_url'] = variable_get('suitcase_interim_config_level_2_url'); diff --git a/theme-settings.php b/theme-settings.php index 1bd9011..4e500b4 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -85,7 +85,7 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state) '#weight' => 2, ); - $form['suitcase_interim_config']['suitcase_interim_config_logo']['suitcase_interim_config_isu_nameplate_alt_text'] = array( + $form['suitcase_interim_config']['suitcase_interim_config_logo']['settings']['suitcase_interim_config_isu_nameplate_alt_text'] = array( '#type' => 'textfield', '#title' => t('Wordmark Alt Text'), '#description' => t('Alt text for the site\'s wordmark. Defaults to Iowa State University.'), From 61a3be68640bd01e3904df6e50729d7d93488760 Mon Sep 17 00:00:00 2001 From: Joshua Pilcher Date: Wed, 20 Sep 2017 11:54:08 -0500 Subject: [PATCH 08/10] Interim 137 Subtheme wordmark support * Can now set wordmark via path in appearance setting within a subtheme * Modified region--branding to make hide logo when subtheme settings demanded * form--system-theme-settings.tpl.php modified to make Appearance page reflect subtheme logo --- preprocess/preprocess-region.inc | 4 ++-- templates/form--system-theme-settings.tpl.php | 2 +- templates/region--branding.tpl.php | 2 +- theme-settings.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/preprocess/preprocess-region.inc b/preprocess/preprocess-region.inc index f511cd3..527bcc3 100644 --- a/preprocess/preprocess-region.inc +++ b/preprocess/preprocess-region.inc @@ -33,7 +33,7 @@ function suitcase_interim_alpha_preprocess_region(&$vars) { $vars['suitcase_interim_config_header_type'] = variable_get('suitcase_interim_config_header_type', 1); // Get the uploaded wordmark if is exists and the header type allows - $vars['wordmark_image'] = (theme_get_setting('default_logo', 'suitcase_interim')) ? file_create_url(drupal_get_path('theme', 'suitcase_interim') . '/images/isu.svg') : file_create_url(theme_get_setting('logo_path', 'suitcase_interim')); + $vars['wordmark_image'] = (theme_get_setting('default_logo')) ? file_create_url(drupal_get_path('theme', 'suitcase_interim') . '/images/isu.svg') : file_create_url(theme_get_setting('logo_path')); } elseif ($vars['region'] == 'menu') { @@ -60,4 +60,4 @@ function suitcase_interim_alpha_preprocess_region(&$vars) { elseif (strpos($vars['region'], 'sidebar') === 0) { $vars['attributes_array']['role'] = 'complementary'; } -} \ No newline at end of file +} diff --git a/templates/form--system-theme-settings.tpl.php b/templates/form--system-theme-settings.tpl.php index 6eefbec..11e2525 100644 --- a/templates/form--system-theme-settings.tpl.php +++ b/templates/form--system-theme-settings.tpl.php @@ -5,7 +5,7 @@ */ ?>
- +
    diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php index d3be6a0..08bfa0a 100644 --- a/templates/region--branding.tpl.php +++ b/templates/region--branding.tpl.php @@ -3,7 +3,7 @@ - + Iowa State University Iowa State University - <?php print $site_name; ?> diff --git a/theme-settings.php b/theme-settings.php index 09dce1e..add2b81 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -48,7 +48,7 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state) $form['suitcase_interim_config']['suitcase_interim_config_logo']['default_logo'] = array( '#type' => 'checkbox', '#title' => t('Use the default ISU wordmark'), - '#default_value' => theme_get_setting('default_logo', 'suitcase_interim'), + '#default_value' => theme_get_setting('default_logo'), '#tree' => FALSE, '#description' => t('Check here if you want to use the default ISU wordmark.') ); @@ -67,7 +67,7 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state) '#type' => 'textfield', '#title' => t('Path to custom wordmark'), '#description' => t('The path to the file you would like to use as your logo file instead of the ISU wordmark.'), - '#default_value' => theme_get_setting('logo_path', 'suitcase_interim'), + '#default_value' => theme_get_setting('logo_path'), ); $form['suitcase_interim_config']['suitcase_interim_config_logo']['settings']['logo_upload'] = array( From a3243e2ccff79e62ecdc3e835b9e3cbfef626858 Mon Sep 17 00:00:00 2001 From: sacarney Date: Thu, 28 Sep 2017 11:36:27 -0500 Subject: [PATCH 09/10] EEOB-56 Helps images not squish as screen narrows * EEOB-56 Helps images not squish as screen narrows * EEOB-56 Removed redundant height This selector will inherit a more generic height: auto !important. --- css/suitcase.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/css/suitcase.css b/css/suitcase.css index 33d63ab..c2fe903 100644 --- a/css/suitcase.css +++ b/css/suitcase.css @@ -434,13 +434,12 @@ sup { vertical-align: super; } figure figcaption { color: #333333; } img { - height: auto; + height: auto !important; max-width: 100%; } /* Target only images in content */ .field-name-body img { - height: auto !important; max-width: calc(100% - 1rem); margin: 0.5rem; } From fae1a4d3d003011dfa25215ca77cace749061f4c Mon Sep 17 00:00:00 2001 From: Angela McMahon Date: Mon, 2 Oct 2017 09:52:16 -0500 Subject: [PATCH 10/10] PPP-24 Added flickr to social media menu --- template.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/template.php b/template.php index 1026854..1a3f649 100644 --- a/template.php +++ b/template.php @@ -349,7 +349,8 @@ function suitcase_interim_menu_link__menu_social($variables) { 'pinterest' => 'fa-pinterest-square', 'github' => 'fa-github-square', 'rss' => 'fa-rss-square', - 'snapchat' => 'fa-snapchat-square' + 'snapchat' => 'fa-snapchat-square', + 'flickr' => 'fa-flickr' ); $font_awesome_icon = '';