diff --git a/bl-kernel/admin/themes/booty/css/bludit.css b/bl-kernel/admin/themes/booty/css/01-bludit.css similarity index 60% rename from bl-kernel/admin/themes/booty/css/bludit.css rename to bl-kernel/admin/themes/booty/css/01-bludit.css index 5844d778..97f670a7 100644 --- a/bl-kernel/admin/themes/booty/css/bludit.css +++ b/bl-kernel/admin/themes/booty/css/01-bludit.css @@ -2,6 +2,10 @@ html { font-size: 0.9rem; } +.link { + text-decoration: underline; +} + /* Left sidebar */ @@ -30,33 +34,6 @@ div.sidebar .nav-item h4 { .link { cursor: pointer; text-decoration: underline; - color: #555; -} - -.link:hover { - color: #0a58ca; -} - -/* - OLD >>>>>>>>> -*/ - - -/* - AUTOCOMPLETE SEARCH -*/ - -.search-suggestion { - padding: 5px; -} - -.search-suggestion-options { - font-size: 0.9em; - padding-top: 2px; -} - -.list-group-sortable { - cursor: pointer; } diff --git a/bl-kernel/admin/themes/booty/css/02-bootstrap-hacks.css b/bl-kernel/admin/themes/booty/css/02-bootstrap-hacks.css new file mode 100644 index 00000000..81b5fdd7 --- /dev/null +++ b/bl-kernel/admin/themes/booty/css/02-bootstrap-hacks.css @@ -0,0 +1,12 @@ +/* Remove Focus glow */ +.btn:focus, +.form-control:focus, +.form-select:focus { + outline: none !important; + box-shadow: none !important; +} + +/* Icons */ +.bi { + margin-right: .5rem!important; +} diff --git a/bl-kernel/admin/themes/booty/css/99-darkmode.css b/bl-kernel/admin/themes/booty/css/99-darkmode.css new file mode 100644 index 00000000..95168c93 --- /dev/null +++ b/bl-kernel/admin/themes/booty/css/99-darkmode.css @@ -0,0 +1,134 @@ +body { + background-color: #1C1C1E; + color: #b3b3b3; +} + +.bg-dark { + background-color: #111111 !important; +} + +.bg-light { + background-color: #111111 !important; +} + +.bg-info { + background-color: #003c58!important; +} + +a, +a.nav-link, +.link, +a.dropdown-menu, +.dropdown-item { + color: #b3b3b3; +} + +a:hover, +a.nav-link:hover, +.link:hover { + color: #e2e2e2 !important +} + +.form-text { + color: #989899 !important; +} + +.form-control:disabled, .form-control[readonly] { + background-color: #444; +} + +.color-blue { + color: #688bbd !important; +} + +.btn { + color: #e0e0e0; +} + +.btn-outline-primary { + color: #688bbd !important; + border-color: #688bbd !important; +} + +.btn-outline-primary:hover { + background-color: #1C1C1E !important; + color: #fff !important; +} + +.page-link { + color: #688bbd !important; + border-color: #688bbd !important; + background-color: #1C1C1E !important; +} + +.form-control, +.form-select { + background-color: #111111; + border-color: #302F33; + color: #b3b3b3; +} + +.form-control:focus { + background-color: #111111; + border-color: #302F33; + color: #b3b3b3; +} + +.nav-tabs .nav-item.show .nav-link, +.nav-tabs .nav-link.active { + background-color: #1C1C1E !important; + border-color: #302F33 !important; + color: #b3b3b3 !important; +} + +.nav-tabs .nav-link:focus, +.nav-tabs .nav-link:hover { + border-color: #302F33 !important; +} + +.nav-tabs { + border-bottom-color:#302F33 !important; +} + +.table { + color: #b3b3b3 !important; + border-bottom-color:#302F33 !important; +} + +.table-striped>tbody>tr:nth-of-type(odd) { + background-color: #171717; + color: #b3b3b3; +} + +.border-bottom { + border-bottom-color:#302F33 !important; +} + +.alert-primary { + background-color: #97A4B9; + border-color: #aebcd2; +} + +.modal-content { + background-color: #121212 !important; + color: #b3b3b3 !important; + border-color: #2f3233; +} + +.modal-footer { + border-top-color: #302F33; +} + +.dropdown-menu { + background-color: #121212 !important; + color: #b3b3b3 !important; +} + +.list-group-item { + background-color: inherit; + color: #b3b3b3; +} + +.list-group-item a { + text-decoration: none; +} \ No newline at end of file diff --git a/bl-kernel/admin/themes/booty/css/99-lightmode.css b/bl-kernel/admin/themes/booty/css/99-lightmode.css new file mode 100644 index 00000000..32cc34c3 --- /dev/null +++ b/bl-kernel/admin/themes/booty/css/99-lightmode.css @@ -0,0 +1,17 @@ +a { + color: #555; +} + +a.nav-link { + color: #555; +} + +.form-control:focus, +.form-select:focus { + border-color: #999999; +} + +.btn-primary-disabled { + background-color: #4792ff !important; + border-color: #4792ff !important; +} \ No newline at end of file diff --git a/bl-kernel/admin/themes/booty/css/bludit-bootstrap.css b/bl-kernel/admin/themes/booty/css/bludit-bootstrap.css deleted file mode 100644 index 142b4511..00000000 --- a/bl-kernel/admin/themes/booty/css/bludit-bootstrap.css +++ /dev/null @@ -1,29 +0,0 @@ -/* Commons */ -a { - color: #555; -} - -/* Remove Focus glow */ -.btn:focus, -.form-control:focus, -.form-select:focus { - outline: none !important; - box-shadow: none !important; -} - -.form-control:focus, -.form-select:focus { - border-color: #999999; -} - - -/* Icons */ -.bi { - margin-right: .5rem!important; -} - -/* Buttons */ -.btn-primary-disabled { - background-color: #4792ff !important; - border-color: #4792ff !important; -} \ No newline at end of file diff --git a/bl-kernel/admin/themes/booty/css/bludit.bootstrap_old.css b/bl-kernel/admin/themes/booty/css/bludit.bootstrap_old.css deleted file mode 100644 index f62896e4..00000000 --- a/bl-kernel/admin/themes/booty/css/bludit.bootstrap_old.css +++ /dev/null @@ -1,143 +0,0 @@ -/* Tables */ - -.table { - background-color: #F4F4F4; -} - -.table-striped tbody tr:nth-of-type(odd) { - background-color: rgba(0, 0, 0, 0.02); -} - -.table thead th { - font-size: 0.8em; - text-transform: uppercase!important; -} - -.table td { - border-top: none; -} - - -/* Common elements */ - -a { - color: #1A66A6; -} - -a:hover { - color: #1A66A6; - text-decoration: none; -} - -.bg-success { - background-color: #8BC34A!important; -} - -.text-primary { - color: #06A8C5!important; -} - -.text-danger { - color: #D40000!important; -} - -a.text-danger:focus, -a.text-danger:hover { - color: #790000!important; -} - - -/* Buttons */ - -.btn { - border-radius: 2px; -} - -.btn-sm { - padding: .25rem .75rem; -} - -.btn-save { - color: #5b8e09; -} - -.btn-save:hover { - color: #466d07; -} - -.btn-cancel:hover { - color: #000; -} - -.btn-primary { - background-color: #0378D3; - border-color: #0378D3; -} - -.btn-primary:hover { - background-color: #0270c4; - border-color: #0270c4; -} - -.btn-primary-disabled { - background-color: #71b6ff !important; - border-color: #71b6ff !important; -} - -.btn-secondary { - background-color: #6c757d; - border-color: #6c757d; -} - -.btn-secondary:hover { - background-color: #5a6268; - border-color: #5a6268; -} - -.btn-light { - color: #212529; - background-color: #f3f3f3; - border-color: #ced4d9; -} - -.btn-light.focus, -.btn-light:focus { - box-shadow: none !important; -} - -.btn.focus, -.btn:focus { - box-shadow: none !important; -} - - -/* Form */ - -.form-control:focus { - box-shadow: none; -} - - -/* Right sidebar Options */ - -#sidebarOptions .card { - background: none; - border: none; -} - -#sidebarOptions a { - color: #212529; -} - -.nav-link { - border-color: #f9f9f9; -} - -.nav-link.active { - background-color: #f9f9f9 !important; - border-color: #dee2e6 #dee2e6 #f9f9f9 !important; -} - -.tab-content>.active { - background-color: #f9f9f9 !important; -} \ No newline at end of file diff --git a/bl-kernel/admin/themes/booty/html/alert.old.php b/bl-kernel/admin/themes/booty/html/alert.old.php deleted file mode 100644 index dc9770dc..00000000 --- a/bl-kernel/admin/themes/booty/html/alert.old.php +++ /dev/null @@ -1,17 +0,0 @@ - - -
diff --git a/bl-kernel/admin/themes/booty/index.php b/bl-kernel/admin/themes/booty/index.php index 086fd993..b86f3a6e 100644 --- a/bl-kernel/admin/themes/booty/index.php +++ b/bl-kernel/admin/themes/booty/index.php @@ -1,6 +1,5 @@ - <?php echo $layout['title'] ?> @@ -13,19 +12,30 @@ darkModeAdmin()) { + echo HTML::css(array( + '99-darkmode.css' + ), DOMAIN_ADMIN_THEME_CSS); + } else { + echo HTML::css(array( + '99-lightmode.css' + ), DOMAIN_ADMIN_THEME_CSS); + } ?> @@ -48,7 +58,7 @@ - + diff --git a/bl-kernel/admin/themes/booty/init.php b/bl-kernel/admin/themes/booty/init.php index 3e9bf9b5..07fd601a 100644 --- a/bl-kernel/admin/themes/booty/init.php +++ b/bl-kernel/admin/themes/booty/init.php @@ -4,4 +4,4 @@ // This theme use the API to work activatePlugin('pluginAPI'); -$plugins['all']['pluginAPI']->newToken(); \ No newline at end of file +$plugins['all']['pluginAPI']->newToken(); diff --git a/bl-kernel/admin/views/categories.php b/bl-kernel/admin/views/categories.php index 75245011..e9644bc8 100644 --- a/bl-kernel/admin/views/categories.php +++ b/bl-kernel/admin/views/categories.php @@ -49,9 +49,9 @@ foreach ($categories->keys() as $key) { try { $category = new Category($key); echo ''; - echo ''.$category->name().''; - echo ''.$category->description().''; - echo ''.$category->permalink().''; + echo ''.$category->name().''; + echo ''.$category->description().''; + echo ''.$category->permalink().''; echo ''; } catch (Exception $e) { // Continue diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php index 0658934a..591e502b 100644 --- a/bl-kernel/admin/views/content.php +++ b/bl-kernel/admin/views/content.php @@ -118,7 +118,7 @@ function table($type) if (!$page->isChild()) { echo ''; - echo ' + echo '
' . ($page->title() ? $page->title() : '' . $L->g('Empty title') . ' ') . '
@@ -135,16 +135,16 @@ function table($type) '; - echo '' . $L->get('Category') . ': ' . ($page->category() ? $page->category() : $L->get('uncategorized')) . ''; + echo '' . $L->get('Category') . ': ' . ($page->category() ? $page->category() : $L->get('uncategorized')) . ''; - echo '' . (((ORDER_BY == 'position') || ($type != 'published')) ? $L->g('Position') . ': ' . $page->position() : $page->date(MANAGE_CONTENT_DATE_FORMAT)) . ''; + echo '' . (((ORDER_BY == 'position') || ($type != 'published')) ? $L->g('Position') . ': ' . $page->position() : $page->date(MANAGE_CONTENT_DATE_FORMAT)) . ''; echo ''; foreach ($page->children() as $child) { echo ''; - echo ' + echo '
' . ($child->title() ? $child->title() : '' . $L->g('Empty title') . ' ') . '
@@ -155,9 +155,9 @@ function table($type) '; - echo '' . $L->get('Category') . ': ' . ($child->category() ? $child->category() : $L->get('uncategorized')) . ''; + echo '' . $L->get('Category') . ': ' . ($child->category() ? $child->category() : $L->get('uncategorized')) . ''; - echo '' . (((ORDER_BY == 'position') || ($type != 'published')) ? $L->g('Position') . ': ' . $child->position() : $child->date(MANAGE_CONTENT_DATE_FORMAT)) . ''; + echo '' . (((ORDER_BY == 'position') || ($type != 'published')) ? $L->g('Position') . ': ' . $child->position() : $child->date(MANAGE_CONTENT_DATE_FORMAT)) . ''; echo ''; } @@ -172,7 +172,7 @@ function table($type) $page = new Page($pageKey); echo ''; - echo ' + echo '
' . ($page->title() ? $page->title() : '' . $L->g('Empty title') . ' ') . '
@@ -183,9 +183,9 @@ function table($type) '; - echo '' . $L->get('Category') . ': ' . ($page->category() ? $page->category() : $L->get('uncategorized')) . ''; + echo '' . $L->get('Category') . ': ' . ($page->category() ? $page->category() : $L->get('uncategorized')) . ''; - echo ' ' . (((ORDER_BY == 'position') || ($type != 'published')) ? $L->g('Position') . ': ' . $page->position() : $page->date(MANAGE_CONTENT_DATE_FORMAT)) . ''; + echo ' ' . (((ORDER_BY == 'position') || ($type != 'published')) ? $L->g('Position') . ': ' . $page->position() : $page->date(MANAGE_CONTENT_DATE_FORMAT)) . ''; echo ''; } catch (Exception $e) { diff --git a/bl-kernel/admin/views/editor.php b/bl-kernel/admin/views/editor.php index 23187cf2..8c2ec8af 100644 --- a/bl-kernel/admin/views/editor.php +++ b/bl-kernel/admin/views/editor.php @@ -564,25 +564,6 @@ ?> -
- -
@@ -660,6 +641,18 @@ +
More options
+ + - + darkModeWebsite()) { echo HTML::css( 'css/99-darkmode.css' ); diff --git a/bl-themes/popeye/php/home.php b/bl-themes/popeye/php/home.php index f261adc7..fa14b1f5 100644 --- a/bl-themes/popeye/php/home.php +++ b/bl-themes/popeye/php/home.php @@ -18,12 +18,6 @@ - -
- p('No pages found') ?> -
- -
@@ -31,12 +25,36 @@
+
- - + +
+ + + + +
+

p('No pages found') ?>

+
+ + +