diff --git a/e107_themes/bootstrap/admin_dark.css b/e107_themes/bootstrap/admin_dark.css index 377348e97..9fda9379f 100644 --- a/e107_themes/bootstrap/admin_dark.css +++ b/e107_themes/bootstrap/admin_dark.css @@ -25,6 +25,9 @@ min-height:50px; background-color: #191919; } + + + /* .bootstrap-select, bootstrap-select button { diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 6e8fb930f..2155c4b85 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -247,7 +247,9 @@ i.s-message-debug { background-position: -1480px 0; width: 32px; height: 32px; } -.button { +.button, +.plupload_button, +.plupload_button:hover{ display: inline-block; *display: inline; /* IE7 inline-block hack */ @@ -790,6 +792,46 @@ span.tag button.close { } h4.caption { margin-bottom:20px; } + +.plupload_container { + padding:0px; + margin: 10px 20px; + background: transparent; +} + +.plupload_header { background: transparent } + +.plupload_header_content { background: transparent; padding-left:0px; min-height:30px; } + +.plupload_wrapper { font: inherit; } +.plupload_header_title { display: none; } + +.plupload_filelist_header, +.plupload_filelist_footer { + + background-color: rgb(54, 54, 54); + background-image: linear-gradient(to bottom, rgb(68, 68, 68), rgb(34, 34, 34)); + border: 1px solid rgb(3, 3, 3); + color: rgb(198, 198, 198); + height: inherit; + } + +.plupload_filelist .plupload_file_name { + width: 80%; +} + +.plupload_filelist li { background: transparent } + +.plupload_file_status span { + color: rgb(198, 198, 198); +} + +.plupload_scroll .plupload_filelist +{ + background: transparent; +} + + /* body { background-color: rgb(68, 68, 68); } diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php index 404b92513..f2d89bfb7 100644 --- a/e107_themes/bootstrap/admin_theme.php +++ b/e107_themes/bootstrap/admin_theme.php @@ -48,17 +48,6 @@ else $no_core_css = TRUE; - -function theme_head() { - - $ret = ' - - '; - return $ret; -} - function tablestyle($caption, $text, $mode) { global $style; @@ -142,52 +131,68 @@ function tablestyle($caption, $text, $mode) return; } + if(trim($caption) == '') + { + $style = 'no_caption'; + } - - switch(varset($style, 'admin_content')) { + switch(varset($style, 'admin_content')) + { - case 'admin_menu' : - echo ' + case 'admin_menu' : + echo ' + + '; + break; + + case 'site_info' : + echo ' - '; - break; - - case 'site_info' : - echo ' - - '; - break; -/* - case 'admin_content': - echo ' -
-

'.$caption.'

-
- '.$text.' + +

+ '.$text.' +

-
- '; - break; -*/ - default: - echo ' -
-

'.$caption.'

-
- '.$text.' + '; + break; + /* + case 'admin_content': + echo ' +
+

'.$caption.'

+
+ '.$text.' +
-
- '; - break; + '; + break; + */ + + case 'no_caption' : + echo ' +
+
+ '.$text.' +
+
+ '; + break; + + + default: + echo ' +
+

'.$caption.'

+
+ '.$text.' +
+
+ '; + break; } }