diff --git a/core/misc/jquery.intrinsic.js b/core/misc/jquery.intrinsic.js
index e05beaf..3d05412 100644
--- a/core/misc/jquery.intrinsic.js
+++ b/core/misc/jquery.intrinsic.js
@@ -27,13 +27,13 @@
// Style block applied momentarily to the body in order to ensure the
// element’s layout area isn’t constrained.
- //
var tempBodyCSS = {
width: '999em',
height: '999em'
};
$.fn.intrinsic = function (dimension) {
+
// The measured element may be a plain object or jQuery.
var element = this instanceof jQuery ? this[0] : this;
var measurement;
diff --git a/core/modules/shortcut/images/favstar.svg b/core/modules/shortcut/images/favstar.svg
index cb50c24..9c8ef1d 100644
--- a/core/modules/shortcut/images/favstar.svg
+++ b/core/modules/shortcut/images/favstar.svg
@@ -1,87 +1 @@
-
-
-
+
\ No newline at end of file
diff --git a/core/modules/views_ui/css/views_ui.admin.theme.css b/core/modules/views_ui/css/views_ui.admin.theme.css
index 6968515..1a656c2 100644
--- a/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -518,7 +518,6 @@ td.group-title {
border-style: solid;
border-width: 0 1px;
padding: 2px 9px;
-
}
.views-displays .tabs.secondary .action-list li:first-child {
diff --git a/core/themes/seven/js/nav-tabs.js b/core/themes/seven/js/nav-tabs.js
index 9d73b37..079c535 100644
--- a/core/themes/seven/js/nav-tabs.js
+++ b/core/themes/seven/js/nav-tabs.js
@@ -1,5 +1,11 @@
/**
* @file
+ * Javascript behaviors the Seven tabs.
+ * Utilizes jquery.intrinsic.js to calculate if the tabs are larger than their
+ * container and toggles the 'is-horizontal' class.
+ *
+ * This also supports collapsible navigable is the 'is-collasible' class is
+ * added to the main element, and a target element is included.
*/
(function ($, Drupal) {
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 7718f11..0f6da37 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -82,7 +82,11 @@ function seven_menu_local_tasks(&$variables) {
$output = '';
if (!empty($variables['primary'])) {
- drupal_add_library('seven', 'drupal.nav-tabs', FALSE);
+ $variables['primary']['#attached'] = array(
+ 'library' => array(
+ array('seven', 'drupal.nav-tabs'),
+ ),
+ );
$variables['primary']['#prefix'] = '