Merge pull request #213 from tuscanhobbit/master

replaced icons and shade of red
This commit is contained in:
friendica 2013-11-23 12:24:36 -08:00
commit 49488a6363
8 changed files with 14 additions and 16 deletions

View file

@ -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);

BIN
images/rm-32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
images/rm-64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

@ -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');

View file

@ -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

View file

@ -114,11 +114,9 @@
// 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';
}

View file

@ -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>

View file

@ -3,8 +3,8 @@
<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"