aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-23 12:24:36 -0800
committerfriendica <info@friendica.com>2013-11-23 12:24:36 -0800
commit49488a636391433f43ccdd4932d445b063260b30 (patch)
tree93bd14ee31254d27e0b8310c062721f0428a31b5
parentb7c39e7ac937f87824c0e0bf19bb4def167709b9 (diff)
parentd126c2bcaae4c25eda03b99b4422398ad781c582 (diff)
downloadvolse-hubzilla-49488a636391433f43ccdd4932d445b063260b30.tar.gz
volse-hubzilla-49488a636391433f43ccdd4932d445b063260b30.tar.bz2
volse-hubzilla-49488a636391433f43ccdd4932d445b063260b30.zip
Merge pull request #213 from tuscanhobbit/master
replaced icons and shade of red
-rwxr-xr-xboot.php2
-rw-r--r--images/rm-32.pngbin0 -> 2451 bytes
-rw-r--r--images/rm-64.pngbin0 -> 5236 bytes
-rw-r--r--include/api.php4
-rw-r--r--util/Doxyfile2
-rw-r--r--view/theme/redbasic/php/style.php14
-rwxr-xr-xview/tpl/email_notify_html.tpl2
-rwxr-xr-xview/tpl/opensearch.tpl6
8 files changed, 14 insertions, 16 deletions
diff --git a/boot.php b/boot.php
index 3fabff55a..53d756e93 100755
--- a/boot.php
+++ b/boot.php
@@ -773,7 +773,7 @@ class App {
$this->is_mobile = $mobile_detect->isMobile();
$this->is_tablet = $mobile_detect->isTablet();
- $this->head_set_icon('/images/rhash-32.png');
+ $this->head_set_icon('/images/rm-32.png');
BaseObject::set_app($this);
diff --git a/images/rm-32.png b/images/rm-32.png
new file mode 100644
index 000000000..c9c942dee
--- /dev/null
+++ b/images/rm-32.png
Binary files differ
diff --git a/images/rm-64.png b/images/rm-64.png
new file mode 100644
index 000000000..30341bfa4
--- /dev/null
+++ b/images/rm-64.png
Binary files differ
diff --git a/include/api.php b/include/api.php
index 1dd970cbc..8f7be37c7 100644
--- a/include/api.php
+++ b/include/api.php
@@ -233,7 +233,7 @@ require_once('include/photos.php');
'updated' => api_date(null),
'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME),
'language' => $user_info['language'],
- 'logo' => $a->get_baseurl()."/images/rhash-64.png",
+ 'logo' => $a->get_baseurl()."/images/rm-64.png",
);
return $arr;
@@ -1581,7 +1581,7 @@ require_once('include/photos.php');
$name = get_config('system','sitename');
$server = $a->get_hostname();
- $logo = $a->get_baseurl() . '/images/rhash-64.png';
+ $logo = $a->get_baseurl() . '/images/rm-64.png';
$email = get_config('system','admin_email');
$closed = ((get_config('system','register_policy') == REGISTER_CLOSED) ? 'true' : 'false');
$private = ((get_config('system','block_public')) ? 'true' : 'false');
diff --git a/util/Doxyfile b/util/Doxyfile
index edb8a8464..fce6c1359 100644
--- a/util/Doxyfile
+++ b/util/Doxyfile
@@ -1,7 +1,7 @@
INPUT = boot.php mod include setup util view
RECURSIVE = YES
PROJECT_NAME = "The Red Matrix"
-PROJECT_LOGO = images/rhash-64.png
+PROJECT_LOGO = images/rm-64.png
EXCLUDE = .htconfig.php library doc .git
EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test*
OUTPUT_DIRECTORY = doc
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 1eb5abfbb..9956ccd31 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -114,22 +114,20 @@
// Nav colours have nested values, so we have to define the actual variables
// used in the CSS from the higher level "red", "black", etc here
if ($nav_colour == "red") {
- $nav_bg_1 = "#f88";
- $nav_bg_2 = "#b00";
- $nav_bg_3 = "#f00";
- $nav_bg_4 = "#b00";
- $search_background = '#FFDDDD';
+ $nav_bg_1 = $nav_bg_3 = "#ba002f";
+ $nav_bg_2 = $nav_bg_4 = "#ad002c";
+ $search_background = "#EEEEEE";
$active_colour = '#444444';
}
if ($nav_colour == "black") {
- $nav_bg_1 = $nav_bg_3 = "#000";
- $nav_bg_2 = $nav_bg_4 = "#222";
+ $nav_bg_1 = $nav_bg_3 = "#000";
+ $nav_bg_2 = $nav_bg_4 = "#222";
$search_background = '#EEEEEE';
$active_colour = '#AAAAAA';
}
if ($nav_colour == "silver") {
- $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
+ $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver";
$search_background = '#EEEEEE';
}
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 85939ac22..41bbe16a9 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -7,7 +7,7 @@
<body>
<table style="border:1px solid #ccc">
<tbody>
- <tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rhash-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+ <tr><td colspan="2" style="background:#c60032; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rm-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index 26fb5a799..ea260c6ae 100755
--- a/view/tpl/opensearch.tpl
+++ b/view/tpl/opensearch.tpl
@@ -3,11 +3,11 @@
<ShortName>Red Matrix@{{$nodename}}</ShortName>
<Description>Search in The Red Matrix@{{$nodename}}</Description>
<Contact>http://github.com/friendica/red/</Contact>
- <Image height="16" width="16" type="image/png">{{$baseurl}}/images/rhash-16.png</Image>
- <Image height="64" width="64" type="image/png">{{$baseurl}}/images/rhash-64.png</Image>
+ <Image height="16" width="16" type="image/png">{{$baseurl}}/images/rm-16.png</Image>
+ <Image height="64" width="64" type="image/png">{{$baseurl}}/images/rm-64.png</Image>
<Url type="text/html"
template="{{$baseurl}}/search?search={searchTerms}"/>
<Url type="application/opensearchdescription+xml"
rel="self"
template="{{$baseurl}}/opensearch" />
-</OpenSearchDescription> \ No newline at end of file
+</OpenSearchDescription>