Commit d0af57fd authored by matio89's avatar matio89

New version of admin toolbar compatible with 8.0.2

parent 79a7703a
......@@ -28,13 +28,20 @@ class AdminToolbarToolsAlterTest extends WebTestBase {
*
* @var array
*/
public static $modules = array('toolbar', 'admin_toolbar', 'admin_toolbar_tools');
public static $modules = array(
'toolbar',
'admin_toolbar',
'admin_toolbar_tools'
);
protected function setUp() {
parent::setUp();
// Create an administrative user and log it in.
$this->adminUser = $this->drupalCreateUser(array('access toolbar', 'access administration pages'));
$this->adminUser = $this->drupalCreateUser(array(
'access toolbar',
'access administration pages'
));
$this->drupalLogin($this->adminUser);
}
......@@ -44,7 +51,7 @@ class AdminToolbarToolsAlterTest extends WebTestBase {
function testAdminToolbarTools() {
// Test for admin_toolbar_tools if special menu items are added.
$this->assertRaw('class="toolbar-icon toolbar-icon-admin-toolbar-tools-help"');
$this->assertRaw('id="toolbar-link-admin_toolbar_tools-flush"');
}
......
/*---------------------- menu horizontal hover---------*/
.toolbar .menu-item:hover {
.menu-item:hover {
background: #fff;
}
.toolbar .menu-item:focus {
.menu-item:focus {
background: #abeae4;
}
.toolbar .menu-item--expanded .menu {
.menu-item--expanded .menu {
background: #fff;
width: auto;
height: auto;
}
.toolbar .menu-item--expanded {
.menu-item--expanded {
background-color: #f5f5f2;
}
.toolbar-tray-horizontal ul li.menu-item {
border-top: none transparent;
border-right: 1px solid #dddddd;
border-bottom: 1px solid #dddddd;
border-left: 1px solid #dddddd;
}
.toolbar .toolbar-tray-horizontal .menu-item:last-child {
border-left: 1px solid #dddddd;
border-right: 1px solid #dddddd;
}
.toolbar .toolbar-tray-horizontal ul ul li.menu-item:first-child {
border-top: 1px solid #dddddd;
}
.toolbar-tray-horizontal ul li.menu-item{ border-top: none transparent;border-right: 1px solid #dddddd;border-bottom: 1px solid #dddddd;border-left: 1px solid #dddddd; }
.toolbar .toolbar-tray-horizontal .menu-item:last-child{border-left: 1px solid #dddddd;border-right: 1px solid #dddddd;}
.toolbar .toolbar-tray-horizontal ul ul li.menu-item:first-child{border-top: 1px solid #dddddd;}
.toolbar-tray-horizontal li.menu-item--expanded:hover ul ul,
.toolbar-tray-horizontal li.menu-item--expanded:hover ul ul ul,
.toolbar-tray-horizontal li.menu-item--expanded:hover ul ul ul ul,
......@@ -43,20 +34,25 @@
display: block;
left: auto; /* LTR */
}
.toolbar-tray-horizontal .menu ul li a,.toolbar-tray-horizontal .menu ul .toolbar-icon {
padding: 12px 15px 12px 12px;
}
.toolbar-tray-horizontal .menu ul li a,.toolbar-tray-horizontal .menu ul .toolbar-icon{ padding: 12px 15px 12px 12px;}
.toolbar-tray-horizontal ul li.menu-item--expanded:hover ul {
display: block;
position: absolute;
width: 200px;
}
.toolbar-tray-horizontal ul li.menu-item--expanded .menu-item > ul {
.toolbar-tray-horizontal ul li.menu-item--expanded .menu-item > ul
{
display: none;
}
.toolbar-tray-horizontal ul li.menu-item--expanded ul li.menu-item--expanded {
background-position: center right;
background-image: url('../images/chevron-right.svg') ;
background-image: url('/core/misc/icons/0074bd/chevron-right.svg');
background-repeat: no-repeat;
}
.toolbar-tray-horizontal ul li.menu-item--expanded .menu-item:hover ul {
......@@ -64,6 +60,7 @@
margin: -40px 0 0 197px;
}
.toolbar-tray-horizontal li:hover ul li {
float: none;
}
......@@ -74,6 +71,9 @@
left: 200px;
width: 200px;
}
/*.toolbar .toolbar-tray-vertical li.open > ul.toolbar-menu {
display: none;
}*/
.toolbar .toolbar-tray-vertical li.open > ul.toolbar-menu.clearfix {
display: block;
}
}
\ No newline at end of file
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#0074bd" d="M8.053 8.355c.193-.195.193-.517 0-.711l-3.26-3.289c-.193-.195-.192-.514.002-.709l1.371-1.371c.194-.194.512-.193.706.001l5.335 5.369c.195.195.195.515 0 .708l-5.335 5.37c-.194.192-.512.193-.706.002l-1.371-1.371c-.194-.195-.195-.514-.002-.709l3.26-3.29z"/></svg>
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