diff --git a/ckeditor.css b/ckeditor.css index 796615a..b5765ab 100644 --- a/ckeditor.css +++ b/ckeditor.css @@ -81,11 +81,10 @@ a.link-button:hover { figure.image { display: table; - margin: 1rem; + margin: 0; } figure.image img { - max-width: 100%; display: block; margin: 0; } @@ -110,9 +109,15 @@ figure.image br { display: none; } -figure.image.floated-left { margin: 0.25rem 1rem 0.25rem 0; } +figure.image.floated-left, +.cke_widget_image[style*="float: left"] { + margin: 0.25rem 1rem 0.25rem 0; +} -figure.image.floated-right { margin: 0.25rem 0 0.25rem 1rem; } +figure.image.floated-right, +.cke_widget_image[style*="float: right"] { + margin: 0.25rem 0 0.25rem 1rem; +} figure.image.floated-left img, figure.image.floated-right img { margin: 0; } diff --git a/css/suitcase.css b/css/suitcase.css index a609a94..ea02dbd 100644 --- a/css/suitcase.css +++ b/css/suitcase.css @@ -287,10 +287,16 @@ a.link-button:hover { font-family: 'FontAwesome'; font-size: 0.75em; display: inline-block; + width: 2rem; + margin-right: -2rem; /* Same as width. Helps prevent wrapping */ margin-left: 4px; vertical-align: text-top; } +#section-content a.external p { + display: inherit; +} + /* Exceptions */ #section-content .pane-menu-menu-social a.external:after, @@ -801,6 +807,11 @@ input[type=submit].form-submit { color: #f77737; } +.block-menu-social .menu a:hover .fa-linkedin-square, +.pane-menu-menu-social .menu a:hover .fa-linkedin-square { + color: #2867B2; +} + /* -------------------- */ /* Image link blocks */ @@ -1556,6 +1567,7 @@ ul.tabs.secondary img { } .flexslider-numbered .flex-pauseplay { + display: inline-flex; height: 2.5rem; margin-top: -2.5rem; left: 0; diff --git a/js/suitcase_responsive_tables.js b/js/suitcase_responsive_tables.js index 9509828..a9e255f 100644 --- a/js/suitcase_responsive_tables.js +++ b/js/suitcase_responsive_tables.js @@ -25,18 +25,21 @@ structure and assign classes. var bothHeader = $(table.has('tr:nth-of-type(1) th:nth-of-type(2)').has('tr:nth-of-type(2) th:nth-of-type(1)')); bothHeader.attr('class', 'table-both'); + /* --- All Responsive Tables --- */ + table.addClass('responsive-table'); + /* --- Colspan or Rowspan --- */ var tdColFreeze = $(table.has('td[colspan]')); var thColFreeze = $(table.has('th[colspan]')); var tdRowFreeze = $(table.has('td[rowspan]')); var thRowFreeze = $(table.has('th[rowspan]')); - tdColFreeze.attr('class', 'table-freeze'); - thColFreeze.attr('class', 'table-freeze'); - tdRowFreeze.attr('class', 'table-freeze'); - thRowFreeze.attr('class', 'table-freeze'); + tdColFreeze.attr('class', 'table-freeze').removeClass('responsive-table'); + thColFreeze.attr('class', 'table-freeze').removeClass('responsive-table'); + tdRowFreeze.attr('class', 'table-freeze').removeClass('responsive-table'); + thRowFreeze.attr('class', 'table-freeze').removeClass('responsive-table'); + + - /* --- All Responsive Tables --- */ - table.addClass('responsive-table'); /* --------------------- Now apply any jQuery needed diff --git a/suitcase_interim.info b/suitcase_interim.info index d1eaa0c..5c2d246 100644 --- a/suitcase_interim.info +++ b/suitcase_interim.info @@ -4,7 +4,7 @@ core = '7.x' engine = 'phptemplate' screenshot = 'screenshot.png' base theme = 'omega' -version = '1.2.0' +version = '1.2.2' plugins[panels][layouts] = panels/layouts plugins[panels][styles] = panels/styles regions[page_top] = 'Page Top' @@ -53,7 +53,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[suitcase_interim_config_isu_nameplate_alt_text] = 'Iowa State University Logo' settings[default_favicon] = '0' settings[favicon_path] = 'sites/all/themes/suitcase_interim/images/favicon.ico' settings[favicon_upload] = '' diff --git a/template.php b/template.php index 402aef1..fc4c6d1 100644 --- a/template.php +++ b/template.php @@ -350,7 +350,8 @@ function suitcase_interim_menu_link__menu_social($variables) { 'github' => 'fa-github-square', 'rss' => 'fa-rss-square', 'snapchat' => 'fa-snapchat-square', - 'flickr' => 'fa-flickr' + 'flickr' => 'fa-flickr', + 'linkedin' => 'fa-linkedin-square' ); $font_awesome_icon = ''; diff --git a/templates/region--branding.tpl.php b/templates/region--branding.tpl.php index 7f67e63..53dbdf4 100644 --- a/templates/region--branding.tpl.php +++ b/templates/region--branding.tpl.php @@ -4,7 +4,7 @@ - <?php print $wordmark_alt_text; ?> + <?php print $wordmark_alt_text; ?> <?php print $wordmark_alt_text; ?> diff --git a/theme-settings.php b/theme-settings.php index 7d85305..a71151f 100644 --- a/theme-settings.php +++ b/theme-settings.php @@ -88,8 +88,8 @@ function suitcase_interim_form_system_theme_settings_alter(&$form, &$form_state) $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.'), - '#default_value' => variable_get('suitcase_interim_config_isu_nameplate_alt_text', 'Iowa State University'), + '#description' => t('Alt text for the site\'s wordmark. Defaults to Iowa State University Logo.'), + '#default_value' => variable_get('suitcase_interim_config_isu_nameplate_alt_text', 'Iowa State University Logo'), '#weight' => 3, );