1
0
mirror of https://github.com/e107inc/e107.git synced 2025-09-01 18:32:44 +02:00

Merged upstream changes.

This commit is contained in:
Lóna Lore
2017-01-15 23:10:46 +01:00
83 changed files with 1606 additions and 796 deletions

View File

@@ -260,7 +260,11 @@ img.image-selector { margin-bottom:0; }
.dropdown-menu img { padding: 0 0; margin-right: 10px; }
ul.navbar-nav li ul.dropdown-menu > li a img,
ul.navbar-nav li ul.dropdown-menu > li a i {
ul.navbar-nav li ul.dropdown-menu > li a i,
ul#e-latest img,
ul#e-latest i,
ul#e-status img,
ul#e-status i {
-webkit-filter: grayscale(100%);
-moz-filter: grayscale(100%);
-ms-filter: grayscale(100%);
@@ -270,7 +274,11 @@ ul.navbar-nav li ul.dropdown-menu > li a i {
}
ul.navbar-nav li ul.dropdown-menu a:hover i,
ul.navbar-nav li ul.dropdown-menu a:hover img
ul.navbar-nav li ul.dropdown-menu a:hover img,
ul#e-latest a:hover img,
ul#e-latest a:hover i,
ul#e-status a:hover img,
ul#e-status a:hover i
{
filter: none;
-webkit-filter: none;
@@ -1230,8 +1238,10 @@ li.rssRow > div {
/* Theme selection */
.admin-theme-thumb { width:100%; height:130px;overflow:hidden;border:1px solid black; margin:0; margin-bottom:10px; padding:0; }
.admin-theme-thumb { position:relative; width:100%; height:130px;overflow:hidden;border:1px solid black; margin:0; margin-bottom:10px; padding:0; }
.admin-theme-thumb:hover { opacity:0.4 }
.admin-theme-thumb img { position:absolute; height:130px; left:-10px; min-width:110%; }
.admin-theme-options {
transition: opacity .20s ease-in-out;
@@ -1325,6 +1335,14 @@ footer {
}
*/
@media (max-width: 1400px ){
ul.navbar-nav.navbar-left > li > a > i { display:none; }
}
@media (max-width: 1100px) {
.navbar-header {
float: none;

View File

@@ -26,8 +26,8 @@ $E_ADMIN_NAVIGATION['start_other'] = '<ul class="nav navbar-nav navbar-right">';
$E_ADMIN_NAVIGATION['button'] = '
<li class="dropdown">
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_TEXT}
<a class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
{LINK_IMAGE} {LINK_TEXT}
<b class="caret"></b>
</a>
{SUB_MENU}
@@ -284,11 +284,12 @@ else
</div>
{ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu}
{SETSTYLE=lists}
{ADMIN_LATEST=infopanel}
{ADMIN_STATUS=infopanel}
{SETSTYLE=admin_menu}
{ADMIN_LOG=request}
{ADMIN_MSG=request}
{ADMIN_PLUGINS}

View File

@@ -165,6 +165,17 @@ class bootstrap3_admintheme
</div>';
break;
case 'lists':
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">' . $caption . '</h3>
</div>
' . $text . '
</div>';
break;
case 'no_caption':
echo '<!-- Start Style: ' . $style . ' Mode: ' . $mode . ' -->
<div class="block">