From 2c6e1b7aee2928c077bc090b1c4fe65c599d5d12 Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Sat, 23 Nov 2013 20:01:11 +0100 Subject: [PATCH 1/2] replaced rhash icon --- boot.php | 2 +- images/rm-32.png | Bin 0 -> 2451 bytes images/rm-64.png | Bin 0 -> 5236 bytes include/api.php | 4 ++-- util/Doxyfile | 2 +- view/tpl/email_notify_html.tpl | 2 +- view/tpl/opensearch.tpl | 6 +++--- 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 images/rm-32.png create mode 100644 images/rm-64.png 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 0000000000000000000000000000000000000000..c9c942dee15346c530360ccd53a55540e3eef822 GIT binary patch literal 2451 zcmV;E32gR>P)5H8(f=9z$p#ERl$WXcZMo)mCeD)QZ(%rpy$_ZL}4&Qb(y{ zOWUa(Kv7^Am%4&Gs7R!;C}2^7P-BD;LKZ^ygqz&``@Xk-+?x^!zNs-!##=?kz$G8xRO=Op5OP4SJ^k z>``q=wB;ntOIFbP<~AfU@gc`O>8Ce%9Gxhaz;Ye}~pbp20lTk3a=QLre1^b~8f?)Wk_4P+SgVG={Y7BvgWFvNnK3 zXc|*KdE_Do}kM^qdT0C%Ui#gWo|Qp@|g=Vuk{M zg~UQ09ac*L>;y@iC^(T=xX#I=WW{}?&Z|0|X;=Y}*u;=n$y%$UpvG6hRZ)ijr`5<% z6gv_{nijFnUIN>{7*S6WM`8g2XI=rGSyM@!UrkE&biA{tomKz@3I-B0(SWKG)#t_> z7y@aJkVqs;oK`(9yj9c4TyRD5s+zPsxQf8XUnI+9;+DSI3tpEsJ!&6a4%A88v6+c4tdFXk03w@hE0o%qViX$TjG=*qq2Lgd&xXHig zW^(UZK-cq|XnSlOwiO3#QmW5m!ipuh&n+X|&_cNG7(<`e5!kVxz?TP*n21j(mkI^~ z4aI4Yv-o;SRxTOQrSs|6Ilg2CX807T7gmvf->s-=K04RFN%zM05U2>DPjZ8{sW%#r<{2uqcOsD#|ZAPr)NVATH)P`=-;xN@X==MNR&`rBbXLwi5{>* z5o9ce#3W_Td8GZ~5`>}SDlfrzaV4$G)?)UZVqoWID5wZjyww$yuKgqK8I#6zj^Z%z z%q+(NDwM)M-A3+RH(?V&A_>(s();d?(~N^*Y%2yxjGPRlOjOLs&m#BEUs3$$ zyO5YD=t#iG&!*s^MdN~hJDd{>QM5E4nKxg7BP|zzct=A$m7{MC-#(C&`}$0ikPTFS-VYKL>zldpkWFY7$?qX@HWP5sauY@cyTCzxaM~ zaw=plxSZ*qy+Hcqmtk6ibgp}wlPh06I|2YkUKWLqF2*Jds06m}r+@P<6pt%uMj&Kz zUQ3(fzk32Z8c%q8VKx)jJ&c~6&V(l)#9uv|c(|XFPrSsy2fNRXfNFtp z(Vh-^U*Cq=A3#mylDo=Fz_bYLI6$!W2q{(5aF!J%yk#g%w6Tq@ z^>2@!1<6^RlTPlvzb3G=mRNT;n92I1Gq~p{i90i!4fI})X1_3Ly!{}w{%2r0+j6&Z`u{=|zkFI|N|Ib#rsWYtu^kC}~| z(9(V1zyEFBOVb_82_I|5ci~Ki_I-tI#qmrlBlFg)#wq|H44urIuOzUumcFgKMpm(5 z!?B4`{J_EyaBDD#**}OC2qu1mLF`b3cvnBxKmf(#0wAz=KcJxb{iI(v5AUog<0~-2 zzUDKIEqkz2uzEq0;dN+0`O87|gSOVetCWiLc6RvL}xWAs@fx{@@J|-o> zufIn3Ws+WX8Sbg2xTZ|ND9A?7%f!gbM9V}cigK8aBAB= zhW_&vMUUN%6^_!r{8>(}dX3UGOA&^ScKqIdFu3;+k;b+pXrkxk@S=%=5IUUEDK?IC z@<_XS&JTKh=uiXL67K~Scq%8;^U??Oyz(JMkKc)rpNZ13dLx7Tz9in;hr~t_L-VDP zb;DIm_{)Q&UQ&&eaS#HVFg7s+8hvkXr+?F~?*)%{^%1IT#9cWFqaX_{-AC&D*;vsK zy>Dy-TcX%zauZf`vKL%K`70|pxAtWwu73pol|KfVcmr56MBxLsk$K$}AQa5OK^kv+ zoJd2L{ryzz`xlDSF_u8j0P)UVoTZnc`cnW% znR6aSQ7%JY))W5bILeH=jpY6Q796Dos41QiaDd3sRw5nkNNiH)&BiFmMi@GiHvWy& zOJ^l&T-Qj$O%IK$fZ2Nr>(mgA;=D8RrvLI%1S&lnYEV?K8=;T213MBW($t=O2blOS zu0+d7P56M*pnS`dq*PacZPWkZ9-8l8InJXr3W_q~gu{_}<9rmClb)Bi@ISaK-PKEy RJmLTV002ovPDHLkV1i;9h`#^; literal 0 HcmV?d00001 diff --git a/images/rm-64.png b/images/rm-64.png new file mode 100644 index 0000000000000000000000000000000000000000..30341bfa48558ec0f2c892fd45a4048868fb5138 GIT binary patch literal 5236 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 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/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 @@ - + 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 @@ Red Matrix@{{$nodename}}Search in The Red Matrix@{{$nodename}}http://github.com/friendica/red/ - {{$baseurl}}/images/rhash-16.png - {{$baseurl}}/images/rhash-64.png + {{$baseurl}}/images/rm-16.png + {{$baseurl}}/images/rm-64.png - \ No newline at end of file + From d126c2bcaae4c25eda03b99b4422398ad781c582 Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Sat, 23 Nov 2013 20:04:09 +0100 Subject: [PATCH 2/2] redbasic nav bar gradient is now similar to the red shade in the logo --- view/theme/redbasic/php/style.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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'; }
{{$product}}
{{$product}}
{{$preamble}}