From: <jon...@us...> - 2013-07-31 16:40:33
|
Revision: 46941 http://sourceforge.net/p/tikiwiki/code/46941 Author: jonnybradley Date: 2013-07-31 16:40:30 +0000 (Wed, 31 Jul 2013) Log Message: ----------- [MRG] Automatic merge, branches/11.x 46937 to 46940 Modified Paths: -------------- trunk/css/cssmenus.css trunk/styles/darkroom.css Property Changed: ---------------- trunk/ Index: trunk =================================================================== --- trunk 2013-07-31 16:32:32 UTC (rev 46940) +++ trunk 2013-07-31 16:40:30 UTC (rev 46941) Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -1,5 +1,5 ## /branches/10.x:43596-44410,44444-44836,44907 -/branches/11.x:45702-46937 +/branches/11.x:45702-46940 /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 \ No newline at end of property Modified: trunk/css/cssmenus.css =================================================================== --- trunk/css/cssmenus.css 2013-07-31 16:32:32 UTC (rev 46940) +++ trunk/css/cssmenus.css 2013-07-31 16:40:30 UTC (rev 46941) @@ -205,6 +205,16 @@ .box-data ul.cssmenu_vert li ul { overflow: visible !important; } +.box-quickadmin .sf-arrows .sf-with-ul:after { + border-color: #888 transparent transparent; /* IE8 */ + border-color: rgba(0,0,0,.5) transparent transparent; +} +.box-quickadmin .sf-arrows > li > .sf-with-ul:focus:after, +.box-quickadmin .sf-arrows > li:hover > .sf-with-ul:after, +.box-quickadmin .sf-arrows > .sfHover > .sf-with-ul:after { + border-color: #333 transparent transparent; /* IE8 */ + border-color: rgba(0,0,0,.8) transparent transparent; +} /*** adding a parent div.sf-navbar to .cssmenu_horiz to create an all-horizontal nav-bar menu ***/ .navbar .cssmenu_horiz { Modified: trunk/styles/darkroom.css =================================================================== --- trunk/styles/darkroom.css 2013-07-31 16:32:32 UTC (rev 46940) +++ trunk/styles/darkroom.css 2013-07-31 16:40:30 UTC (rev 46941) @@ -388,7 +388,6 @@ background: #474747; } - .siteloginbar_popup .pass a:hover, .siteloginbar_popup .register a:hover, #logout_link_1 a:hover { @@ -581,6 +580,19 @@ padding: 3px 2px 3px 8px; } +.box-quickadmin .sf-arrows .sf-with-ul:after { + border-color: #888 transparent transparent; /* IE8 */ + border-color: rgba(255,255,255,.5) transparent transparent; +} +.box-quickadmin .cssmenu_horiz li { + background-color: transparent; +} + +.box-quickadmin .cssmenu_horiz ul li { + background-color: #474747; + padding-left: 1em; +} + /* left column width */ #col2 .box-data .cssmenu_vert ul { padding-left: 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |