Commit a7ab8ebc authored by catch's avatar catch

Issue #1825446 by sun, barraponto: Simplify and remove stone-age CSS styling for tabs.

parent 12eefe56
......@@ -1638,7 +1638,7 @@ function theme_menu_local_task($variables) {
$link_text = t('!local-task-title!active', array('!local-task-title' => $link['title'], '!active' => $active));
}
return '<li' . (!empty($variables['element']['#active']) ? ' class="active"' : '') . '>' . l($link_text, $link['href'], $link['localized_options']) . "</li>\n";
return '<li' . (!empty($variables['element']['#active']) ? ' class="active"' : '') . '>' . l($link_text, $link['href'], $link['localized_options']) . '</li>';
}
/**
......
......@@ -33,6 +33,3 @@ html {
left: 20px;
right: auto;
}
#overlay-tabs li {
margin: 0 -3px 0 0;
}
......@@ -83,16 +83,16 @@
* Tabs on the overlay.
*/
#overlay-tabs {
line-height: 27px;
line-height: 26px;
margin: -28px 0 0 0;
position: absolute;
right: 20px; /* LTR */
text-transform: uppercase;
}
#overlay-tabs li {
display: inline;
display: inline-block;
list-style: none;
margin: 0 0 0 -3px; /* LTR */
margin: 0;
padding: 0;
}
#overlay-tabs li a,
......@@ -105,7 +105,7 @@
display: inline-block;
font-size: 11px;
font-weight: bold;
margin: 0 0 2px 0;
margin: 0 1px;
outline: 0;
padding: 0 14px;
text-decoration: none;
......@@ -115,7 +115,7 @@
#overlay-tabs li.active a:active,
#overlay-tabs li.active a:visited {
background-color: #fff;
margin: 0;
margin-bottom: 0;
padding-bottom: 2px;
}
#overlay-tabs li a:focus,
......
......@@ -67,18 +67,9 @@ ul.menu {
/**
* Markup generated by theme_menu_local_tasks().
*/
ul.primary {
padding: 0 1em 0 0;
}
ul.primary li a {
margin-right: 5px;
margin-left: 0.5em;
}
ul.secondary li {
border-left: 1px solid #ccc;
border-right: none;
display: inline;
padding: 0 1em;
.tabs > li {
margin-left: 0.3em;
margin-right: 0;
}
/**
......
......@@ -306,55 +306,29 @@ ul.inline li {
/**
* Markup generated by theme_menu_local_tasks().
*/
ul.primary {
border-bottom: 1px solid #bbb;
border-collapse: collapse;
height: auto;
line-height: normal;
div.tabs {
margin: 1em 0;
}
ul.tabs {
list-style: none;
margin: 5px;
padding: 0 0 0 1em; /* LTR */
white-space: nowrap;
margin: 0 0 0.5em;
padding: 0;
}
ul.primary li {
display: inline;
.tabs > li {
display: inline-block;
margin-right: 0.3em; /* LTR */
}
ul.primary li a {
background-color: #ddd;
border-color: #bbb;
border-style: solid solid none solid;
border-width: 1px;
height: auto;
margin-right: 0.5em; /* LTR */
padding: 0 1em;
.tabs a {
display: block;
padding: 0.2em 1em;
text-decoration: none;
}
ul.primary li.active a {
background-color: #fff;
border: 1px solid #bbb;
border-bottom: 1px solid #fff;
}
ul.primary li a:hover {
.tabs a.active {
background-color: #eee;
border-color: #ccc;
border-bottom-color: #eee;
}
ul.secondary {
border-bottom: 1px solid #bbb;
padding: 0.5em 1em;
margin: 5px;
}
ul.secondary li {
border-right: 1px solid #ccc; /* LTR */
display: inline;
padding: 0 1em;
}
ul.secondary a {
padding: 0;
text-decoration: none;
}
ul.secondary a.active {
border-bottom: 4px solid #999;
.tabs a:focus,
.tabs a:hover {
background-color: #f5f5f5;
}
/**
......
......@@ -194,6 +194,8 @@ a.button {
zoom: 1;
}
.tabs ul.secondary li {
border-left: 1px solid #ccc;
border-right: none;
float: right;
}
.tabs ul.secondary li:first-child {
......
......@@ -960,16 +960,20 @@ ul.links {
/* --------------- System Tabs --------------- */
.tabs {
div.tabs {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
margin-bottom: 20px;
}
.tabs ul.primary {
border-collapse: collapse;
height: auto;
line-height: normal;
padding: 0 3px;
margin: 0;
overflow: hidden;
border: none;
background: transparent url(../images/tabs-border.png) repeat-x left bottom;
white-space: nowrap;
}
.tabs ul.primary li {
display: block;
......@@ -983,6 +987,9 @@ ul.links {
.tabs ul.primary li a {
color: #000;
background-color: #ededed;
border-color: #bbb;
border-style: solid solid none solid;
border-width: 1px;
height: 1.8em;
line-height: 1.9;
display: block;
......@@ -996,14 +1003,20 @@ ul.links {
}
.tabs ul.primary li.active a {
background-color: #ffffff;
border: 1px solid #bbb;
border-bottom: 1px solid #fff;
}
.tabs ul.secondary {
border-bottom: none;
margin: 5px;
padding: 0.5em 0;
}
.tabs ul.secondary li {
border-right: 1px solid #ccc; /* LTR */
display: block;
float: left; /* LTR */
margin: 0;
padding: 0 1em;
}
.tabs ul.secondary li:last-child {
border-right: none; /* LTR */
......@@ -1012,7 +1025,9 @@ ul.links {
padding-left: 0; /* LTR */
}
.tabs ul.secondary li a {
display: inline;
padding: 0.25em 0.5em;
text-decoration: none;
}
.tabs ul.secondary li a.active {
background: #f2f2f2;
......
......@@ -974,9 +974,6 @@ ol.task-list li.done {
line-height: 1.54em;
margin: 0;
}
#overlay-tabs li {
margin: 0 -2px;
}
.overlay ul.secondary {
background: transparent none;
margin: -1.4em 0 0.3em 0; /* LTR */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment