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

Issue #1138 - Bootstrap3 theme mostly complete.

This commit is contained in:
Cameron
2015-07-16 01:17:21 -07:00
parent 83288964f1
commit d12eef2f07
15 changed files with 66 additions and 42 deletions

View File

@@ -112,7 +112,7 @@ td.options .btn-group { display: flex; }
#admin-ui-modal { width: 90%; }
.selectize-input { width: 206px }
div.bbcode-panel {

View File

@@ -105,7 +105,7 @@ $E_ADMIN_NAVIGATION['button_pm'] = '
</a>
<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">
<ul class="nav-list">
<li class="nav-header">Unread Messages</li>
<li class="dropdown-header nav-header">Unread Messages</li>
<li><a href="#">Incoming Message Number 1</a></li>
<li><a href="#">Incoming Message Number 2</a></li>
<li><a href="#">Incoming Message Number 3</a></li>

View File

@@ -59,10 +59,13 @@ $no_core_css = TRUE;
class bootstrap3_admintheme
{
function tablestyle($caption, $text, $mode)
function tablestyle($caption, $text, $mode, $data)
{
global $style;
// global $style;
$style = $data['setStyle'];
// echo "Style: ".$style;
$class = '';
if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);
@@ -134,7 +137,7 @@ class bootstrap3_admintheme
if(deftrue('e_IFRAME'))
{
echo '
echo '<!-- Start Style: '.$style.' Mode: '.$mode.' and iFrame active -->
<div class="block">
<div class="block-text">
'.$text.'
@@ -204,7 +207,7 @@ class bootstrap3_admintheme
*/
case 'no_caption' :
echo '
echo '<!-- Start Style: '.$style.' Mode: '.$mode.' -->
<div class="block">
<div class="block-text">
'.$text.'
@@ -215,7 +218,7 @@ class bootstrap3_admintheme
default:
echo '
echo '<!-- Start Style: '.$style.' Mode: '.$mode.' -->
<div class="block">
<h4 class="caption">'.$caption.'</h4>
<div class="block-text">

View File

@@ -1554,9 +1554,9 @@ pre {
line-height: 1.42857143;
word-break: break-all;
word-wrap: break-word;
color: #212121;
color: #999999;
background-color: #f5f5f5;
border: 1px solid #cccccc;
border: 1px solid inherit;
border-radius: 4px;
}
pre code {
@@ -4067,7 +4067,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs > li.active > a:hover,
.nav-tabs > li.active > a:focus {
color: #ffffff;
background-color: #2f2f2f;
background-color: #373737;
border: 1px solid #999999;
border-bottom-color: transparent;
cursor: default;
@@ -6814,6 +6814,21 @@ button.close {
.btn:hover {
border-color: rgba(0, 0, 0, 0.6);
text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
background-image: -webkit-linear-gradient(#303030, #212121 60%, #171717);
background-image: -o-linear-gradient(#303030, #212121 60%, #171717);
background-image: linear-gradient(#303030, #212121 60%, #171717);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff303030', endColorstr='#ff171717', GradientType=0);
filter: none;
}
.btn:hover,
.btn:hover:hover {
background-image: -webkit-linear-gradient(#000000, #000000 40%, #000000);
background-image: -o-linear-gradient(#000000, #000000 40%, #000000);
background-image: linear-gradient(#000000, #000000 40%, #000000);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff000000', endColorstr='#ff000000', GradientType=0);
filter: none;
}
.btn-default {
background-image: -webkit-linear-gradient(#303030, #212121 60%, #171717);