mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-29 01:00:20 +02:00
Code Issues Releases Wiki Activity

Issue #1138 - Bootstrap3 UI fixes.

Browse Source
This commit is contained in:
Cameron
2015-07-15 19:33:15 -07:00
parent 35f225aa79
commit a26de7bc84
26 changed files with 156 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_themes/bootstrap3/admin_dark.css
View File

@@ -53,6 +53,8 @@ tr.highlight-even, .table-striped > tbody > tr.highlight-even { background-colo
background-image: none;
}
#admin-ui-nav-menu a.link-active { color: #fff }
/*
.bootstrap-select, bootstrap-select button
{

40
e107_themes/bootstrap3/admin_style.css
View File

@@ -78,30 +78,36 @@ table input.form-control, table textarea.form-control, table select.form-contro
width:530px
}
table textarea.input-block-level, input.input-block-level, select.input-block-level { width: 100% }
table textarea.input-block-level,
input.input-block-level,
select.input-block-level { width: 100% }
table label.checkbox { margin-left: 20px }
#admin-ui-nav-menu i.fa-chevron-right { margin-left: -10px }
#admin-ui-list-batch { padding: 10px 15px }
#admin-ui-list-batch img { padding-top:5px }
#admin-ui-list-filter { margin-bottom: 15px }
#admin-ui-list-filter i.searchquery { z-index:100; position:relative; left:-160px; top:3px }
#admin-ui-list-filter #searchquery { padding-left:22px; margin-right:-12px; }
#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-list-no-records-found { margin-bottom: 0 }
#admin-ui-list-batch { padding-left:15px; padding-top:8px; }
#admin-ui-list-batch img { padding-top:5px }
#admin-ui-list-filter { margin-bottom: 15px }
#admin-ui-list-filter i.searchquery { z-index:100; position:relative; left:-160px; top:3px }
#admin-ui-list-filter #searchquery { padding-left:22px; margin-right:-12px; }
#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 }
.panel-default:hover { transition: color .50s ease-in-out; -moz-transition: color .50s ease-in-out; -webkit-transition: color .50s ease-in-out; color: #fff }
#admin-ui-edit { }
#admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
#admin-ui-edit { }
#admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
td.options .btn-group { display: flex; }
td.options .btn-group { display: flex; }
.table .nav-tabs a, .table th a, .table td a { text-decoration: none }
.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;
}
.table > thead > tr > th { padding: 15px 10px; font-weight:bold; font-variant: small-caps; }
.label, .badge { text-shadow: 1px 1px 0px #000; box-shadow: 1px 1px 0px #000; }

9
e107_themes/bootstrap3/admin_template.php
View File

@@ -240,6 +240,7 @@ $ADMIN_HEADER .= '<div class="container-fluid">
{ADMIN_PWORD}
{SETSTYLE=site_info}
{ADMINUI_HELP}
{ADMIN_HELP}
{ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu}
@@ -253,7 +254,7 @@ $ADMIN_HEADER .= '<div class="container-fluid">
{SETSTYLE=none}
{SETSTYLE=default}
</div>
<div class="col-lg-10" id="right-panel" >
@@ -364,18 +365,18 @@ $ADMIN_FOOTER = "
* see function e107::getNav()->admin() in e107_admin/header.php
*/
$E_ADMIN_MENU['start'] = '
<ul class="plugin-navigation nav nav-list">
<ul id="admin-ui-nav-menu" class="plugin-navigation nav nav-list">
';
$E_ADMIN_MENU['button'] = '
<li>
<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="icon-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}</a>
{SUB_MENU}
</li>
';
$E_ADMIN_MENU['button_active'] = '
<li class="active">
<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="icon-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="fa fa-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
{SUB_MENU}
</li>
';

2
e107_themes/bootstrap3/admin_theme.php
View File

@@ -1,7 +1,7 @@
<?php
if ( ! defined('e107_INIT')) { exit(); }
define("SEP"," <span class='glyphicon glyphicon-icon-play e-breadcrumb'></span> ");
define("SEP"," <span class='fa fa-play e-breadcrumb'></span> ");
define("BOOTSTRAP", 3);
define('FONTAWESOME', 4);

86
e107_themes/bootstrap3/css/bootstrap_dark.css vendored
View File

@@ -1372,11 +1372,11 @@ a.bg-primary:focus {
background-color: #285f8f;
}
.bg-success {
background-color: #62c462;
background-color: #51a351;
}
a.bg-success:hover,
a.bg-success:focus {
background-color: #42b142;
background-color: #408140;
}
.bg-info {
background-color: #5bc0de;
@@ -2357,14 +2357,14 @@ table th[class*="col-"] {
.table > thead > tr.success > th,
.table > tbody > tr.success > th,
.table > tfoot > tr.success > th {
background-color: #62c462;
background-color: #51a351;
}
.table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr:hover > .success,
.table-hover > tbody > tr.success:hover > th {
background-color: #4fbd4f;
background-color: #499249;
}
.table > thead > tr > td.info,
.table > tbody > tr > td.info,
@@ -2822,7 +2822,7 @@ select[multiple].input-lg {
.has-success .input-group-addon {
color: #ffffff;
border-color: #ffffff;
background-color: #62c462;
background-color: #51a351;
}
.has-success .form-control-feedback {
color: #ffffff;
@@ -3177,26 +3177,26 @@ fieldset[disabled] .btn-primary.active {
}
.btn-success {
color: #ffffff;
background-color: #62c462;
border-color: #62c462;
background-color: #51a351;
border-color: #51a351;
}
.btn-success:focus,
.btn-success.focus {
color: #ffffff;
background-color: #42b142;
border-color: #2d792d;
background-color: #408140;
border-color: #274e27;
}
.btn-success:hover {
color: #ffffff;
background-color: #42b142;
border-color: #40a940;
background-color: #408140;
border-color: #3d7a3d;
}
.btn-success:active,
.btn-success.active,
.open > .dropdown-toggle.btn-success {
color: #ffffff;
background-color: #42b142;
border-color: #40a940;
background-color: #408140;
border-color: #3d7a3d;
}
.btn-success:active:hover,
.btn-success.active:hover,
@@ -3208,8 +3208,8 @@ fieldset[disabled] .btn-primary.active {
.btn-success.active.focus,
.open > .dropdown-toggle.btn-success.focus {
color: #ffffff;
background-color: #399739;
border-color: #2d792d;
background-color: #346934;
border-color: #274e27;
}
.btn-success:active,
.btn-success.active,
@@ -3234,11 +3234,11 @@ fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #62c462;
border-color: #62c462;
background-color: #51a351;
border-color: #51a351;
}
.btn-success .badge {
color: #62c462;
color: #51a351;
background-color: #ffffff;
}
.btn-info {
@@ -4911,11 +4911,11 @@ a.label:focus {
background-color: #285f8f;
}
.label-success {
background-color: #62c462;
background-color: #51a351;
}
.label-success[href]:hover,
.label-success[href]:focus {
background-color: #42b142;
background-color: #408140;
}
.label-info {
background-color: #5bc0de;
@@ -5083,29 +5083,29 @@ a.thumbnail.active {
color: inherit;
}
.alert-success {
background-color: #62c462;
border-color: #62bd4f;
background-color: #51a351;
border-color: #559249;
color: #ffffff;
}
.alert-success hr {
border-top-color: #55b142;
border-top-color: #4b8140;
}
.alert-success .alert-link {
color: #e6e6e6;
}
.alert-info {
background-color: #5bc0de;
border-color: #3dced8;
background-color: #337ab7;
border-color: #4f93ce;
color: #ffffff;
}
.alert-info hr {
border-top-color: #2ac7d2;
border-top-color: #3b87c8;
}
.alert-info .alert-link {
color: #e6e6e6;
}
.alert-warning {
background-color: #f89406;
background-color: #df8505;
border-color: #e96506;
color: #ffffff;
}
@@ -5180,7 +5180,7 @@ a.thumbnail.active {
animation: progress-bar-stripes 2s linear infinite;
}
.progress-bar-success {
background-color: #62c462;
background-color: #51a351;
}
.progress-striped .progress-bar-success {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -5343,7 +5343,7 @@ button.list-group-item {
}
.list-group-item-success {
color: #ffffff;
background-color: #62c462;
background-color: #51a351;
}
a.list-group-item-success,
button.list-group-item-success {
@@ -5358,7 +5358,7 @@ button.list-group-item-success:hover,
a.list-group-item-success:focus,
button.list-group-item-success:focus {
color: #ffffff;
background-color: #4fbd4f;
background-color: #499249;
}
a.list-group-item-success.active,
button.list-group-item-success.active,
@@ -5741,14 +5741,14 @@ button.list-group-item-danger.active:focus {
}
.panel-success > .panel-heading {
color: #ffffff;
background-color: #62c462;
background-color: #51a351;
border-color: rgba(0, 0, 0, 0.6);
}
.panel-success > .panel-heading + .panel-collapse > .panel-body {
border-top-color: rgba(0, 0, 0, 0.6);
}
.panel-success > .panel-heading .badge {
color: #62c462;
color: #51a351;
background-color: #ffffff;
}
.panel-success > .panel-footer + .panel-collapse > .panel-body {
@@ -6848,19 +6848,19 @@ button.close {
filter: none;
}
.btn-success {
background-image: -webkit-linear-gradient(#78cc78, #62c462 60%, #53be53);
background-image: -o-linear-gradient(#78cc78, #62c462 60%, #53be53);
background-image: linear-gradient(#78cc78, #62c462 60%, #53be53);
background-image: -webkit-linear-gradient(#62b162, #51a351 60%, #4a954a);
background-image: -o-linear-gradient(#62b162, #51a351 60%, #4a954a);
background-image: linear-gradient(#62b162, #51a351 60%, #4a954a);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff78cc78', endColorstr='#ff53be53', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62b162', endColorstr='#ff4a954a', GradientType=0);
filter: none;
}
.btn-success:hover {
background-image: -webkit-linear-gradient(#2f7d2f, #379337 40%, #3da23d);
background-image: -o-linear-gradient(#2f7d2f, #379337 40%, #3da23d);
background-image: linear-gradient(#2f7d2f, #379337 40%, #3da23d);
background-image: -webkit-linear-gradient(#285128, #336633 40%, #397339);
background-image: -o-linear-gradient(#285128, #336633 40%, #397339);
background-image: linear-gradient(#285128, #336633 40%, #397339);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f7d2f', endColorstr='#ff3da23d', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff285128', endColorstr='#ff397339', GradientType=0);
filter: none;
}
.btn-info {
@@ -6929,7 +6929,7 @@ h6 {
}
.text-success,
.text-success:hover {
color: #62c462;
color: #51a351;
}
.text-danger,
.text-danger:hover {
@@ -7016,11 +7016,11 @@ select {
.has-success .help-block,
.has-success .control-label,
.has-success .form-control-feedback {
color: #62c462;
color: #51a351;
}
.has-success .form-control,
.has-success .form-control:focus {
border-color: #62c462;
border-color: #51a351;
}
legend {
color: #fff;