1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 19:44:09 +02:00

Issue #1138 - Dark style re-created from scratch.

This commit is contained in:
Cameron
2015-07-14 18:24:46 -07:00
parent 83f7b90d0b
commit dbd25a74ca
7 changed files with 7251 additions and 37 deletions

View File

@@ -59,11 +59,16 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
#admin-ui-list-db-language { padding-top:20px ; padding-right:30px }
#admin-ui-list-total-records { padding-top:5px }
#admin-ui-list-filter .row-fluid { margin-left: -15px; margin-right: -15px }
#admin-ui-edit { }
#admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
.table .nav-tabs a, .table th a, .table td a { text-decoration: none }
.label, .badge {
text-shadow: 1px 1px 0px #000;
box-shadow: 1px 1px 0px #000;
}
@@ -712,6 +717,8 @@ ul.scroll-menu { max-height:350px; overflow:auto; }
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.2);
}
.navbar-brand { padding: 10px 15px; }
ul.recent-comments {padding: 0px;
margin: 0px;
list-style: none outside none;
@@ -889,7 +896,7 @@ span.tag button.close {
vertical-align:middle;
}
h4.caption { margin-bottom:20px; }
h4.caption { margin-bottom:30px; }
.plupload_container {
padding:0px;

View File

@@ -191,7 +191,7 @@ $ADMIN_HEADER = '<div class="navbar '.$inverse.' navbar-nav navbar-fixed-top">
*/
$ADMIN_HEADER = '<div class="navbar navbar-fixed-top" role="navigation">
$ADMIN_HEADER = '<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container" >
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">

View File

@@ -9,21 +9,18 @@ e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.m
// e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css');
e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
// be107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css");
e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css");
e107::js('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css');
// e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css');
// e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cyborg/bootstrap.min.css');
// e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cosmo/bootstrap.min.css");
// e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
//e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cosmo/bootstrap.min.css");
// e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
e107::css('theme','css/bootstrap_dark.css');
e107::css('theme','admin_style.css');
// e107::css('core', 'bootstrap/css/darkstrap.css');
e107::css('theme','admin_style.css');
// e107::css('theme','admin_dark.css');
e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");
@@ -67,10 +64,7 @@ class bootstrap3_admintheme
global $style;
$class = '';
if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);
if($mode == 'e_help')
@@ -100,7 +94,7 @@ class bootstrap3_admintheme
if($mode == 'personalize')
{
echo '
/*echo '
<!-- Mode: '.$mode.' -->
<div class="well" style="padding:10px">
<div class="nav-header">'.$caption.'</div>
@@ -109,13 +103,13 @@ class bootstrap3_admintheme
<!-- Content End -->
</div>
<!-- End Mode: '.$mode.' -->
';
return;
';*/
$style = 'admin_menu';
// return;
}
/*
if($style == 'core-infopanel')
{
@@ -136,7 +130,7 @@ class bootstrap3_admintheme
';
return;
}
*/
if(deftrue('e_IFRAME'))
{
@@ -155,13 +149,19 @@ class bootstrap3_admintheme
{
$style = 'no_caption';
}
$panelType = array('core-infopanel'=>'panel-default','admin_menu'=>'panel-primary', 'site_info'=>'panel-default');
switch(varset($style, 'admin_content'))
{
case 'core-infopanel' :
case 'admin_menu' :
echo '<div class="panel panel-default">
case 'site_info' :
echo '<div class="panel '.$panelType[$style].'">
<div class="panel-heading">
<h3 class="panel-title">'.$caption.'</h3>
</div>
@@ -180,16 +180,16 @@ class bootstrap3_admintheme
**/
break;
case 'site_info' :
/*case 'site_info' :
echo '
<div class="well sidebar-nav" >
<div class="nav-header">'.$caption.'</div>
<div class="panel panel-primary" >
<div class="panel-heading">'.$caption.'</div>
<p style="padding:10px">
'.$text.'
</p>
</div>
';
break;
break;*/
/*
case 'admin_content':
echo '

File diff suppressed because it is too large Load Diff