diff --git a/core/includes/menu.inc b/core/includes/menu.inc index d28316b..bbc5138 100644 --- a/core/includes/menu.inc +++ b/core/includes/menu.inc @@ -1654,18 +1654,16 @@ function theme_menu_local_task($variables) { */ function theme_menu_local_action($variables) { $link = $variables['element']['#link']; + $link += array( + 'href' => '', + 'localized_options' => array(), + ); + $link['localized_options']['attributes']['class'][] = 'button'; + $link['localized_options']['attributes']['class'][] = 'add'; $output = '
  • '; - if (isset($link['href'])) { - $output .= l($link['title'], $link['href'], isset($link['localized_options']) ? $link['localized_options'] : array()); - } - elseif (!empty($link['localized_options']['html'])) { - $output .= $link['title']; - } - else { - $output .= check_plain($link['title']); - } - $output .= "
  • \n"; + $output .= l($link['title'], $link['href'], $link['localized_options']); + $output .= ""; return $output; } diff --git a/core/modules/system/system.theme.css b/core/modules/system/system.theme.css index 61303d2..89d735c 100644 --- a/core/modules/system/system.theme.css +++ b/core/modules/system/system.theme.css @@ -332,6 +332,34 @@ ul.tabs { } /** + * Styles for link buttons and action links. + */ +.action-links { + list-style: none; + padding: 0; + margin: 1em 0; +} +.action-links li { + display: inline-block; + margin: 0 0.3em; +} +.action-links li:first-child { + margin-left: 0; /* LTR */ +} +a.button { + display: inline-block; + line-height: 160%; + padding: 0.2em 0.5em 0.3em; + text-decoration: none; +} +a.button.add:before { + content: '+'; + font-weight: 900; + margin-left: -0.1em; + padding-right: 0.2em; /* LTR */ +} + +/** * Styles for system messages. */ div.messages { diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css index 20f9136..dfa22d8 100644 --- a/core/themes/bartik/css/style.css +++ b/core/themes/bartik/css/style.css @@ -1034,19 +1034,9 @@ div.tabs { border-bottom: none; border-radius: 5px; } -ul.action-links { - list-style: none; - margin: 5px; - padding: 0.5em 1em; -} -ul.action-links li { - display: inline-block; - margin-left: 10px; -} ul.action-links li a { padding-left: 15px; - background: url(../images/add.png) no-repeat left center; - margin: 0 10px 0 0; + margin: 0; } /* ---------------- Messages ----------------- */ diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 65abcc7..bf60cfa 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -720,20 +720,28 @@ select.form-select:focus { .js input.throbbing { background-position: 100% -16px; } -ul.action-links { - margin: 1em 0; - padding: 0 20px 0 20px; /* LTR */ - list-style-type: none; - overflow: hidden; -} -ul.action-links li { - float: left; /* LTR */ - margin: 0 1em 0 0; /* LTR */ +a.button.add { + background-color: #1078D8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#60B0F8), to(#1078D8)); + background-image: -webkit-linear-gradient(top, #60B0F8, #1078D8); + background-image: -moz-linear-gradient(top, #60B0F8, #1078D8); + background-image: -o-linear-gradient(top, #60B0F8, #1078D8); + background-image: linear-gradient(to bottom, #60B0F8, #1078D8); + border-color: #C0E8FF #1068D8 #0048C8; + border-radius: 0.8em; + border-width: 0.1em 0 0; + box-shadow: 0 1px 0 #333; + color: #fff; + font-size: 1em; + line-height: 170%; + margin: 0; + padding: 0.2em 1em 0.3em; } -ul.action-links a { - padding-left: 15px; /* LTR */ - background: transparent url(images/add.png) no-repeat 0 center; - line-height: 30px; +a.button.add:focus, +a.button.add:hover { + border-color: #C0E8FF #1068D8 #0048C8; + background-position: 0 -0.8em; + color: #fff; } /**