aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-06 00:06:44 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-06 00:06:44 -0700
commit3fc5b854cbb8a1133139e928c8adbf7d36ad0872 (patch)
treeb93db030a69e409c443084752397a03d862e5148
parentb832444dc256979e5c6664fa5318d2565274b59a (diff)
parentf51cfa696052fb38123dd2f495b98fd2feb6d24c (diff)
downloadvolse-hubzilla-3fc5b854cbb8a1133139e928c8adbf7d36ad0872.tar.gz
volse-hubzilla-3fc5b854cbb8a1133139e928c8adbf7d36ad0872.tar.bz2
volse-hubzilla-3fc5b854cbb8a1133139e928c8adbf7d36ad0872.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--doc/webpages.bb80
-rw-r--r--mod/impel.php1
-rw-r--r--mod/webpages.php3
-rw-r--r--view/theme/redbasic/css/style.css6
-rw-r--r--view/theme/redbasic/schema/dark.css123
-rw-r--r--view/theme/redbasic/schema/dark.php80
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.css126
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.php92
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.css143
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.php101
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.css122
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.php36
12 files changed, 498 insertions, 415 deletions
diff --git a/doc/webpages.bb b/doc/webpages.bb
index 780bde45c..040ad0c5c 100644
--- a/doc/webpages.bb
+++ b/doc/webpages.bb
@@ -2,13 +2,89 @@
Red enables users to create static webpages. To activate this feature, enable the web pages feature in your Additional Features section.
-Once enabled, a new tab will appear on your channel page labelled &quot;Webpages&quot;. Clicking this link will take you to the webpage editor. Here you can create a post using either BBCode or the rich text editor.
-
+Once enabled, a new tab will appear on your channel page labelled &quot;Webpages&quot;. Clicking this link will take you to the webpage editor.
Pages will be accessible at mydomain/page/username/pagelinktitle
The &quot;page link title&quot; box allows a user to specify the &quot;pagelinktitle&quot; of this URL. If no page link title is set, we will set one for you automatically, using the message ID of the item.
Beneath the page creation box, a list of existing pages will appear with an &quot;edit&quot; link. Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages.
+
+[b]Using Blocks[/b]
+
+Blocks can be parts of webpages. The basic HTML of a block looks like this
+[code]
+ <div>
+ Block Content
+ </div>
+
+[/code]
+
+If a block has text/html content type it can also contain menu elements. Sample content of
+[code]
+ <p>HTML block content</p>
+ [menu]menuname[/menu]
+
+[/code]
+will produce HTML like this
+[code]
+ <div>
+ <p>HTML block content</p>
+ <div>
+ <ul>
+ <li><a href="#">Link 1</a></li>
+ <li><a href="#">Link 2</a></li>
+ <li><a href="#">Link 3</a></li>
+ </ul>
+ </div>
+ </div>
+
+[/code]
+
+Via the $content macro a block can also contain the actual webpage content. For this create a block with only
+[code]
+ $content
+
+[/code]as content.
+
+To make a block appear in the webpage it must be defined in the page layout inside a region.
+[code]
+ [region=aside]
+ [block]blockname[/block]
+ [/region]
+
+[/code]
+
+The block appearance can be manipulated in the page layout.
+
+Custom classes can be assigned
+[code]
+ [region=aside]
+ [block=myclass]blockname[/block]
+ [/region]
+
+[/code]
+will produce this HTML
+[code]
+ <div class="myclass">
+ Block Content
+ </div>
+
+[/code]
+
+Via the wrap variable a block can be stripped off its wrapping <div></div> tag
+[code]
+ [region=aside]
+ [block][var=wrap]none[/var]blockname[/block]
+ [/region]
+
+[/code]
+will produce this HTML
+[code]
+ Block Content
+
+[/code]
+
+
#include doc/macros/main_footer.bb;
diff --git a/mod/impel.php b/mod/impel.php
index 67a7a21a9..0b29bcf02 100644
--- a/mod/impel.php
+++ b/mod/impel.php
@@ -116,6 +116,7 @@ function impel_init(&$a) {
$arr['title'] = $j['title'];
$arr['body'] = $j['body'];
$arr['term'] = $j['term'];
+ $arr['layout_mid'] = $j['layout_mid'];
$arr['created'] = datetime_convert('UTC','UTC', $j['created']);
$arr['edited'] = datetime_convert('UTC','UTC',$j['edited']);
$arr['owner_xchan'] = get_observer_hash();
diff --git a/mod/webpages.php b/mod/webpages.php
index 62abfb34a..362f7bacb 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -155,7 +155,8 @@ function webpages_content(&$a) {
'edited' => $rr['edited'],
'mimetype' => $rr['mimetype'],
'pagetitle' => $rr['sid'],
- 'mid' => $rr['mid']
+ 'mid' => $rr['mid'],
+ 'layout_mid' => $rr['layout_mid']
);
$pages[$rr['iid']][] = array(
'url' => $rr['iid'],
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 83b10b527..8edb06a3e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1506,6 +1506,7 @@ margin-right: 50px;
.admin-icons {
font-size: 1.2em;
color: $toolicon_colour;
+ margin-right: 10px;
}
a .drop-icons {
@@ -1548,11 +1549,6 @@ a .drop-icons:hover {
list-style-type: none;
}
-.admin-icons {
- color: $toolicon_colour;
- margin-right: 10px;
-}
-
#adminpage table tr:hover {
background-color: #BBC7D7;
}
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 78aa27d38..02ee4707e 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -1,13 +1,5 @@
-.vcard {
- border-bottom: 1px solid #333;
-}
-
-#contact-block {
- border-bottom: 1px solid #333;
-}
-
-.widget {
- border-bottom: 1px solid #333;
+.vcard, #contact-block, .widget {
+ border-bottom: 1px solid #fff;
}
.abook-pending-contact, .abook-permschange {
@@ -136,7 +128,6 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
background-image: none;
}
-
nav .dropdown-menu .divider{
background-color: #222;
}
@@ -150,3 +141,113 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
nav .dropdown-menu {
background-color: #000;
}
+
+#nav-search-text {
+ background-color: #999;
+}
+
+.autocomplete .selected {
+ background: #999;
+}
+
+.nav-tabs{
+ border-bottom:1px solid #333;
+}
+
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+ border:1px solid #333;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus {
+ color: #fff;
+ background-color: #111;
+}
+
+.nav-tabs.nav-justified > li > a {
+ color: #ccc;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+ text-decoration: underline;
+ background-color: #222;
+ color: #ccc;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+ text-decoration: underline;
+ background-color: #222;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
+ font-weight: bold;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+ color: #fff !important;
+ text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+ background-color: rgba(28,28,28,0.8);
+}
+
+.autocomplete {
+ background: #222;
+}
+
+blockquote {
+ background-color: #1e1e1e;
+ border-left: 3px solid #666;
+ color: #ccc;
+}
+
+code {
+ border: 1px solid #090909;
+ background: #000;
+ color: #fff;
+}
+
+pre {
+ background: #000;
+ color: #fff;
+ border:1px solid #090909;
+}
+
+.notif-item a {
+ color: #ccc;
+}
+
+.notif-item a:hover {
+ color: #fff;
+}
+
+.dropdown-menu {
+ background-color: #222;
+}
+
+.dropdown-menu >li > a {
+ color: #ccc;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+ color: #ddd;
+ background-color: #333;
+ background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+ color: #ccc;
+ background-color: #222;
+ border-color: #222;
+}
+
+.preview {
+ background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
+}
+
+@media (min-width: 768px) {
+ .nav-tabs.nav-justified > li > a {
+ border-bottom: 1px solid #333;
+ }
+}
+
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index b3addcfff..92e703325 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -16,42 +16,16 @@
$nav_icon_colour = "#999";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
- if (! $navtabs_borderc)
- $navtabs_borderc = "#333";
- if (! $navtabs_fontcolour)
- $navtabs_fontcolour = "#fff";
- if (! $navtabs_bgcolour)
- $navtabs_bgcolour = "#111";
- if (! $navtabs_linkcolour)
- $navtabs_linkcolour = "color: #ccc;";
- if (! $navtabs_linkchover)
- $navtabs_linkchover = "color: #fff;";
- if (! $navtabs_bgchover)
- $navtabs_bgchover = "#222";
- if (! $navtabs_decohover)
- $navtabs_decohover = "underline";
- if (! $navaside_bghover)
- $navaside_bghover = "#222";
if (! $link_colour)
$link_colour = "#fff";
- if (! $link_font_weight)
- $link_font_weight = "bold";
- if (! $selected_active_colour)
- $selected_active_colour = "#fff";
- if (! $selected_active_deco)
- $selected_active_deco = "underline";
if (! $banner_colour)
$banner_colour = "#999";
- if (! $search_background)
- $search_background = "#999";
if (! $bgcolour)
$bgcolour = "#111";
if (! $item_colour)
$item_colour = "rgba(28,28,28,0.8)";
if (! $comment_item_colour)
$comment_item_colour = "rgba(18,18,18,0.4)";
- if (! $genericcontent_bgcolour)
- $genericcontent_bgcolour = "rgba(28,28,28,0.8)";
if (! $comment_border_colour)
$comment_border_colour = "rgba(28,28,28,0.8)";
if (! $toolicon_colour)
@@ -60,55 +34,5 @@
$toolicon_activecolour = '#fff';
if (! $font_colour)
$font_colour = "#ccc";
- if (! $blockquote_colour)
- $blockquote_colour = "#ccc";
- if (! $blockquote_bgcolour)
- $blockquote_bgcolour = "#1e1e1e";
- if (! $blockquote_bordercolour)
- $blockquote_bordercolour = "#666";
- if (! $code_borderc)
- $code_borderc = "#090909";
- if (! $code_bgcolour)
- $code_bgcolour = "#000";
- if (! $code_txtcolour)
- $code_txtcolour = "#fff";
- if (! $pre_borderc)
- $pre_borderc = "#090909";
- if (! $pre_bgcolour)
- $pre_bgcolour = "#000";
- if (! $pre_txtcolour)
- $pre_txtcolour = "#fff";
- if (! $item_bordercolour)
- $item_bordercolour = "#333";
- if (! $notif_itemcolour)
- $notif_itemcolour = "#ccc";
- if (! $notif_itemhovercolour)
- $notif_itemhovercolour = "#fff";
- if (! $acpopup_bgcolour)
- $acpopup_bgcolour = "#222";
- if (! $acpopup_bordercolour)
- $acpopup_bordercolour = "#333";
- if (! $acpopup_tgbl_bgcolour)
- $acpopup_tgbl_bgcolour = "#333";
- if (! $acpopup_hovercolour)
- $acpopup_hovercolour = "#fff";
- if (! $editbuttons_bghover)
- $editbuttons_bghover = "#222";
- if (! $dropdown_bgcolour)
- $dropdown_bgcolour = "#222";
- if (! $dropdown_textcolour)
- $dropdown_textcolour = "#ccc";
- if (! $dropdown_txtcolhover)
- $dropdown_txtcolhover = "#ddd";
- if (! $dropdown_bgcolhover)
- $dropdown_bgcolhover = "#333";
- if (! $dropdown_bgimghover)
- $dropdown_bgimghover = "background-image: none;";
- if (! $dropdown_togglecol)
- $dropdown_togglecol = "#ccc";
- if (! $dropdown_togglebgcol)
- $dropdown_togglebgcol = "#222";
- if (! $dropdown_bordercol)
- $dropdown_bordercol = "#222";
- if (! $preview_backgroundimg)
- $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index dd47a3280..c00f3c260 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -1,12 +1,4 @@
-.vcard {
- border-bottom: 1px solid #fff;
-}
-
-#contact-block {
- border-bottom: 1px solid #fff;
-}
-
-.widget {
+.vcard, #contact-block, .widget {
border-bottom: 1px solid #fff;
}
@@ -136,7 +128,6 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
background-image: none;
}
-
nav .dropdown-menu .divider{
background-color: #F5F5F5;
}
@@ -150,3 +141,118 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
nav .dropdown-menu {
background-color: #fff;
}
+
+a.rateme, div.rateme {
+ border: 1px solid #fff;
+}
+
+#nav-search-text {
+ background-color: #F5F5F5;
+}
+
+.autocomplete .selected {
+ background: #F5F5F5;
+}
+
+.nav-tabs{
+ border-bottom:1px solid #000;
+}
+
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+ border:1px solid #000;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus {
+ color: #000;
+ background-color: #fff;
+}
+
+.nav-tabs.nav-justified > li > a {
+ color: #000;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+ text-decoration: underline;
+ background-color: #fff;
+ color: #000;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+ text-decoration: underline;
+ background-color: #F5F5F5;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
+ font-weight: bold;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+ color: #000 !important;
+ text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+ background-color: rgba(255,255,255,0.8);
+}
+
+.autocomplete {
+ background: #fff;
+}
+
+blockquote {
+ background-color: #fff;
+ border-left: 3px solid #000;
+ color: #111;
+}
+
+code {
+ border: 1px solid #000;
+ background: #fff;
+ color: #000;
+}
+
+pre {
+ background: #fff;
+ color: #111;
+ border:1px solid #000;
+}
+
+.notif-item a {
+ color: #000;
+}
+
+.notif-item a:hover {
+ color: #000;
+}
+
+.dropdown-menu {
+ background-color: #fff;
+}
+
+.dropdown-menu >li > a {
+ color: #000;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+ color: #000;
+ background-color: #F5F5F5;
+ background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+ color: #000;
+ background-color: #fff;
+ border-color: #fff;
+}
+
+.preview {
+ background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
+}
+
+@media (min-width: 768px) {
+ .nav-tabs.nav-justified > li > a {
+ border-bottom: 1px solid #000;
+ }
+}
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white.php
index 7c1c99a32..6853a0ed5 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white.php
@@ -16,98 +16,24 @@
$nav_icon_colour = "#111";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#000";
-
- if (! $navtabs_borderc)
- $navtabs_borderc = "#000";
- if (! $navtabs_fontcolour)
- $navtabs_fontcolour = "#000";
- if (! $navtabs_bgcolour)
- $navtabs_bgcolour = "#fff";
- if (! $navtabs_linkcolour)
- $navtabs_linkcolour = "color: #000;";
- if (! $navtabs_linkchover)
- $navtabs_linkchover = "color: #000;";
- if (! $navtabs_bgchover)
- $navtabs_bgchover = "#fff";
- if (! $navtabs_decohover)
- $navtabs_decohover = "underline";
- if (! $navaside_bghover)
- $navaside_bghover = "#F5F5F5";
- if (! $link_colour)
- $link_colour = "#000";
- if (! $link_font_weight)
- $link_font_weight = "bold";
- if (! $selected_active_colour)
- $selected_active_colour = "#000";
- if (! $selected_active_deco)
- $selected_active_deco = "underline";
if (! $banner_colour)
$banner_colour = "#fff";
- if (! $search_background)
- $search_background = "#F5F5F5";
+ if (! $link_colour)
+ $link_colour = "#000";
if (! $bgcolour)
$bgcolour = "#fff";
- if (! $genericcontent_bgcolour)
- $genericcontent_bgcolour = 'rgba(255,255,255,0.8)';
+ if (! $toolicon_colour)
+ $toolicon_colour = "#111";
+ if (! $toolicon_activecolour)
+ $toolicon_activecolour = "#000";
if (! $item_colour)
$item_colour = "rgba(255,255,255,0.8)";
if (! $comment_item_colour)
$comment_item_colour = "rgba(255,255,255,0.4)";
if (! $comment_border_colour)
$comment_border_colour = "rgba(255,255,255,0.8)";
- if (! $toolicon_colour)
- $toolicon_colour = '#111';
- if (! $toolicon_activecolour)
- $toolicon_activecolour = '#000';
if (! $font_colour)
$font_colour = "#000";
- if (! $blockquote_colour)
- $blockquote_colour = "#111";
- if (! $blockquote_bgcolour)
- $blockquote_bgcolour = "#fff";
- if (! $blockquote_bordercolour)
- $blockquote_bordercolour = "#000";
- if (! $code_borderc)
- $code_borderc = "#000";
- if (! $code_bgcolour)
- $code_bgcolour = "#fff";
- if (! $code_txtcolour)
- $code_txtcolour = "#000";
- if (! $pre_borderc)
- $pre_borderc = "#000";
- if (! $pre_bgcolour)
- $pre_bgcolour = "#fff";
- if (! $pre_txtcolour)
- $pre_txtcolour = "#111";
- if (! $item_bordercolour)
- $item_bordercolour = "#000";
- if (! $notif_itemcolour)
- $notif_itemcolour = "#000";
- if (! $notif_itemhovercolour)
- $notif_itemhovercolour = "#000";
- if (! $acpopup_bgcolour)
- $acpopup_bgcolour = "#fff";
- if (! $acpopup_bordercolour)
- $acpopup_bordercolour = "#000";
- if (! $acpopup_tgbl_bgcolour)
- $acpopup_tgbl_bgcolour = "#fff";
- if (! $acpopup_hovercolour)
- $acpopup_hovercolour = "#000";
- if (! $dropdown_bgcolour)
- $dropdown_bgcolour = "#fff";
- if (! $dropdown_textcolour)
- $dropdown_textcolour = "#000";
- if (! $dropdown_txtcolhover)
- $dropdown_txtcolhover = "#000";
- if (! $dropdown_bgcolhover)
- $dropdown_bgcolhover = "#F5F5F5";
- if (! $dropdown_bgimghover)
- $dropdown_bgimghover = "background-image: none;";
- if (! $dropdown_togglecol)
- $dropdown_togglecol = "#000";
- if (! $dropdown_togglebgcol)
- $dropdown_togglebgcol = "#fff";
- if (! $dropdown_bordercol)
- $dropdown_bordercol = "#fff";
- if (! $preview_backgroundimg)
- $preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
+
+
+
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 671465529..ce4465930 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -1,13 +1,5 @@
-.vcard {
- border-bottom: 1px solid #000;
-}
-
-#contact-block {
- border-bottom: 1px solid #000;
-}
-
-.widget {
- border-bottom: 1px solid #000;
+.vcard, #contact-block, .widget {
+ border-bottom: 1px solid #fff;
}
.abook-pending-contact, .abook-permschange {
@@ -150,3 +142,134 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
nav .dropdown-menu {
background-color: #000;
}
+
+.rconnect {
+ color: #50f148;
+}
+
+a.rateme, div.rateme {
+ color: #50f148;
+ border: 1px solid #000;
+}
+
+a.rconnect, a.rateme, div.rateme {
+ color: #50f148;
+}
+
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+ color: #50f148;
+}
+
+#nav-search-text {
+ background-color: #000;
+}
+
+.autocomplete .selected {
+ background: #000;
+}
+
+.nav-tabs{
+ border-bottom:1px solid #143D12;
+}
+
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+ border:1px solid #143D12;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus {
+ color: #46D43F;
+ background-color: #000;
+}
+
+.nav-tabs.nav-justified > li > a {
+ color: #50f148;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+ text-decoration: underline;
+ background-color: #000;
+ color: #50f148;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+ text-decoration: underline;
+ background-color: #143D12;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
+ font-weight: bold;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+ color: #50f148 !important;
+ text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+ background-color: rgba(0,0,0,0.8);
+}
+
+.autocomplete {
+ background: #000;
+}
+
+blockquote {
+ background-color: #000;
+ border-left: 3px solid #143D12;
+ color: #32962D;
+}
+
+code {
+ border: 1px solid #143D12;
+ background: #000;
+ color: #32962D;
+}
+
+pre {
+ background: #000;
+ color: #32962D;
+ border:1px solid #143D12;
+}
+
+.notif-item a {
+ color: #50f148;
+}
+
+.notif-item a:hover {
+ color: #50f148;
+}
+
+.dropdown-menu {
+ background-color: #000;
+}
+
+.dropdown-menu >li > a {
+ color: #32962D;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+ color: #50f148;
+ background-color: #143D12;
+ background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+ color: #50f148;
+ background-color: #000;
+ border-color: #143D12;
+}
+
+.preview {
+ background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
+}
+
+
+@media (min-width: 768px) {
+ .nav-tabs.nav-justified > li > a {
+ border-bottom: 1px solid #143D12;
+ }
+}
+
+
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black.php
index 6b104a4e6..2660624d6 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black.php
@@ -16,108 +16,21 @@
$nav_icon_colour = "#32962D";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#50f148";
- if (! $navtabs_borderc)
- $navtabs_borderc = "#143D12";
- if (! $navtabs_fontcolour)
- $navtabs_fontcolour = "#46D43F";
- if (! $navtabs_bgcolour)
- $navtabs_bgcolour = "#000";
- if (! $navtabs_linkcolour)
- $navtabs_linkcolour = "color: #50f148;";
- if (! $navtabs_linkchover)
- $navtabs_linkchover = "color: #50f148;";
- if (! $navtabs_bgchover)
- $navtabs_bgchover = "#000";
- if (! $navtabs_decohover)
- $navtabs_decohover = "underline";
-if (! $navaside_bghover)
- $navaside_bghover = "#143D12";
- if (! $link_colour)
- $link_colour = "#50f148";
- if (! $link_font_weight)
- $link_font_weight = "bold";
- if (! $selected_active_colour)
- $selected_active_colour = "#50f148";
- if (! $selected_active_deco)
- $selected_active_deco = "underline";
if (! $banner_colour)
$banner_colour = "#000";
- if (! $search_background)
- $search_background = "#000";
+ if (! $link_colour)
+ $link_colour = "#50f148";
if (! $bgcolour)
- $bgcolour = "#000";
- if (! $genericcontent_bgcolour)
- $genericcontent_bgcolour = 'rgba(0,0,0,0.8)';
+ $bgcolour = "#000";
+ if (! $toolicon_colour)
+ $toolicon_colour = "#32962D";
+ if (! $toolicon_activecolour)
+ $toolicon_activecolour = "#50f148";
if (! $item_colour)
$item_colour = "rgba(0,0,0,0.8)";
if (! $comment_item_colour)
$comment_item_colour = "rgba(0,0,0,0.4)";
if (! $comment_border_colour)
$comment_border_colour = "rgba(0,0,0,0.8)";
- if (! $toolicon_colour)
- $toolicon_colour = '#32962D';
- if (! $toolicon_activecolour)
- $toolicon_activecolour = '#50f148';
if (! $font_colour)
$font_colour = "#46D43F";
- if (! $blockquote_colour)
- $blockquote_colour = "#32962D";
- if (! $blockquote_bgcolour)
- $blockquote_bgcolour = "#000";
- if (! $blockquote_bordercolour)
- $blockquote_bordercolour = "#143D12";
- if (! $code_borderc)
- $code_borderc = "#143D12";
- if (! $code_bgcolour)
- $code_bgcolour = "#000";
- if (! $code_txtcolour)
- $code_txtcolour = "#32962D";
- if (! $pre_borderc)
- $pre_borderc = "#143D12";
- if (! $pre_bgcolour)
- $pre_bgcolour = "#000";
- if (! $pre_txtcolour)
- $pre_txtcolour = "#32962D";
- if (! $item_bordercolour)
- $item_bordercolour = "#143D12";
- if (! $notif_itemcolour)
- $notif_itemcolour = "#50f148";
- if (! $notif_itemhovercolour)
- $notif_itemhovercolour = "#50f148";
- if (! $acpopup_bgcolour)
- $acpopup_bgcolour = "#000";
- if (! $acpopup_bordercolour)
- $acpopup_bordercolour = "#143D12";
- if (! $acpopup_tgbl_bgcolour)
- $acpopup_tgbl_bgcolour = "#000";
- if (! $acpopup_hovercolour)
- $acpopup_hovercolour = "#50f148";
- if (! $dropdown_bgcolour)
- $dropdown_bgcolour = "#000";
- if (! $dropdown_textcolour)
- $dropdown_textcolour = "#32962D";
- if (! $dropdown_txtcolhover)
- $dropdown_txtcolhover = "#50f148";
- if (! $dropdown_bgcolhover)
- $dropdown_bgcolhover = "#143D12";
- if (! $dropdown_bgimghover)
- $dropdown_bgimghover = "background-image: none;";
- if (! $dropdown_togglecol)
- $dropdown_togglecol = "#50f148";
- if (! $dropdown_togglebgcol)
- $dropdown_togglebgcol = "#000";
- if (! $dropdown_bordercol)
- $dropdown_bordercol = "#143D12";
- if (! $preview_backgroundimg)
- $preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
-
-
-
-
-
-
-
-
-
-
-
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 90fafd76e..3504265b9 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -1,6 +1,5 @@
.vcard, #contact-block, .widget {
border-bottom: 1px solid #fff;
- background-color: rgba(0,0,0,0.4);
}
.abook-pending-contact, .abook-permschange {
@@ -143,53 +142,11 @@ nav .dropdown-menu {
background-color: #000;
}
-.rconnect {
- color: #fff;
- background-color: #000;
-}
-
a.rateme, div.rateme {
- color: #fff;
- background-color: #000;
border: 1px solid #000;
}
-a.rconnect, a.rateme, div.rateme {
- color: #fff;
-}
-
-.navbar-inverse {
- background-image: -webkit-linear-gradient(top, #000 0%, #000 100%);
- background-image: linear-gradient(to bottom, #000 0%, #000 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0);
- background-color: #000;
- border-color: #000;
-}
-
-.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-toggle {
- border-color: #000;
-}
-
-.navbar-inverse .navbar-nav > .active > a {
- background-image: -webkit-linear-gradient(top, #000 0%, #000 100%);
- background-image: linear-gradient(to bottom, #000 0%, #000 100%);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0);
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
- background-color: #000;
- color: #fff;
-}
-
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
- background-color: #000;
-}
-
#nav-search-text {
- border-color: #000;
background-color: #000;
}
@@ -197,18 +154,6 @@ a.rconnect, a.rateme, div.rateme {
background: #000;
}
-#nav-search-text-ac .autocomplete {
- border: 1px solid #000;
-}
-
-#usermenu-caret, .navbar-inverse .navbar-nav > li > a {
- color: #eee;
-}
-
-.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs {
- color: #fff;
-}
-
.nav-tabs{
border-bottom:1px solid #fff;
}
@@ -239,19 +184,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
font-weight: bold;
- color: #fff;
-}
-
-a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label {
- color: #fff;
-}
-
-.divgrow-showmore {
- color: #fff;
-}
-
-.field.checkbox:hover > div label {
- border-color: #fff;
}
.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
@@ -259,58 +191,11 @@ a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label {
text-decoration: underline !important;
}
-header #banner {
- color: #000;
-}
-
-body {
- background-color: #000;
- color: #fff;
-}
-
-.jothidden > input {
- border: 1px solid #000;
- background-color: #000;
-}
-
-.jothidden .bootstrap-tagsinput {
- border-color: #000;
- background-color: #000;
-}
-
.generic-content-wrapper-styled {
background-color: rgba(0,0,0,0.8);
}
-.wall-item-content-wrapper.comment, .hide-comments-outer {
- background-color: rgba(0,0,0,0.4);
- border-color: rgba(0,0,0,0.8);
-}
-
-#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td,
-[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after {
- background-color: rgba(0,0,0,0.8);
-}
-
-.onoffswitch-inner:before {
- background-color: rgba(0,0,0,0.8);
- color: #fff;
-}
-
-.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np {
- background-color: rgba(0,0,0,0.4);
-}
-
-.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 {
- color: #eee;
-}
-
-.profile-import input {
- color: #fff;
-}
-
.autocomplete {
- color: #fff;
background: #000;
}
@@ -364,15 +249,10 @@ pre {
background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
}
-
@media (min-width: 768px) {
.nav-tabs.nav-justified > li > a {
border-bottom: 1px solid #fff;
}
}
-@media screen and (max-width: 767px) {
- aside#region_1 {
- border-right: 1px solid #000;
- }
- }
+
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php
new file mode 100644
index 000000000..a76709ac9
--- /dev/null
+++ b/view/theme/redbasic/schema/simple_white_on_black.php
@@ -0,0 +1,36 @@
+<?php
+
+ if (! $nav_bg)
+ $nav_bg = "#000";
+ if (! $nav_gradient_top)
+ $nav_gradient_top = "#000";
+ if (! $nav_gradient_bottom)
+ $nav_gradient_bottom = "#000";
+ if (! $nav_active_gradient_top)
+ $nav_active_gradient_top = "#000";
+ if (! $nav_active_gradient_bottom)
+ $nav_active_gradient_bottom = "#000";
+ if (! $nav_bd)
+ $nav_bd = "#000";
+ if (! $nav_icon_colour)
+ $nav_icon_colour = "#eee";
+ if (! $nav_active_icon_colour)
+ $nav_active_icon_colour = "#fff";
+ if (! $banner_colour)
+ $banner_colour = "#000";
+ if (! $link_colour)
+ $link_colour = "#fff";
+ if (! $bgcolour)
+ $bgcolour = "#000";
+ if (! $toolicon_colour)
+ $toolicon_colour = "#eee";
+ if (! $toolicon_activecolour)
+ $toolicon_activecolour = "#fff";
+ if (! $item_colour)
+ $item_colour = "rgba(0,0,0,0.8)";
+ if (! $comment_item_colour)
+ $comment_item_colour = "rgba(0,0,0,0.4)";
+ if (! $comment_border_colour)
+ $comment_border_colour = "rgba(0,0,0,0.8)";
+ if (! $font_colour)
+ $font_colour = "#fff";