wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better support for custom sprites

Browse Source
This commit is contained in:
Hannes Mannerheim 2015-06-06 16:20:26 +02:00
parent d079f94936
commit 9e45bcab47
5 changed files with 63 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QvitterPlugin.php
View File

@ -62,6 +62,9 @@ class QvitterPlugin extends Plugin {
// DEFAULT FAVICON // DEFAULT FAVICON
$settings['favicon'] = 'img/favicon.ico?v=5'; $settings['favicon'] = 'img/favicon.ico?v=5';
// DEFAULT SPRITE
$settings['sprite'] = Plugin::staticPath('Qvitter', '').'img/sprite.png?v=40';
// DEFAULT LINK COLOR // DEFAULT LINK COLOR
$settings['defaultlinkcolor'] = '#0084B4'; $settings['defaultlinkcolor'] = '#0084B4';

1
README.md
View File

@ -56,6 +56,7 @@ $config['site']['qvitter']['urlshortenerapiurl'] = 'http://qttr.at/yourls-api.ph
$config['site']['qvitter']['urlshortenersignature'] = 'b6afeec983'; $config['site']['qvitter']['urlshortenersignature'] = 'b6afeec983';
$config['site']['qvitter']['sitebackground'] = 'img/vagnsmossen.jpg'; $config['site']['qvitter']['sitebackground'] = 'img/vagnsmossen.jpg';
$config['site']['qvitter']['favicon'] = 'img/favicon.ico?v=4'; $config['site']['qvitter']['favicon'] = 'img/favicon.ico?v=4';
$config['site']['qvitter']['sprite'] = Plugin::staticPath('Qvitter', '').'img/sprite.png?v=40';
$config['site']['qvitter']['enablewelcometext'] = true; $config['site']['qvitter']['enablewelcometext'] = true;
$config['site']['qvitter']['customwelcometext']['sv'] = '<h1>Välkommen till Quitter.se – en federerad<sup>1</sup> mikrobloggsallmänning!</h1><p>Etc etc...</p>'; $config['site']['qvitter']['customwelcometext']['sv'] = '<h1>Välkommen till Quitter.se – en federerad<sup>1</sup> mikrobloggsallmänning!</h1><p>Etc etc...</p>';
$config['site']['qvitter']['customwelcometext']['en'] = '<h1>Welcome to Quitter.se – a federated microblog common!</h1><p>Etc etc...</p>'; $config['site']['qvitter']['customwelcometext']['en'] = '<h1>Welcome to Quitter.se – a federated microblog common!</h1><p>Etc etc...</p>';

50
actions/qvitter.php
View File

@ -110,6 +110,9 @@ class QvitterAction extends ApiAction
<title><?php print $sitetitle; ?></title> <title><?php print $sitetitle; ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
<style>
</style>
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/css/qvitter.css')); ?>" /> <link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/css/qvitter.css')); ?>" />
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/jquery.minicolors.css" /> <link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/jquery.minicolors.css" />
<link rel="shortcut icon" type="image/x-icon" href="<?php print $qvitterpath; ?><?php print QvitterPlugin::settings("favicon"); ?>"> <link rel="shortcut icon" type="image/x-icon" href="<?php print $qvitterpath; ?><?php print QvitterPlugin::settings("favicon"); ?>">
@ -287,7 +290,7 @@ class QvitterAction extends ApiAction
ul.stats a strong, ul.stats a strong,
.queet-box-extras button, .queet-box-extras button,
#openid-login:hover:after { #openid-login:hover:after {
color:<?php print QvitterPlugin::settings("defaultlinkcolor"); ?>;/*COLOREND*/ color:/*COLORSTART*/<?php print QvitterPlugin::settings("defaultlinkcolor"); ?>/*COLOREND*/;
} }
#unseen-notifications, #unseen-notifications,
.stream-item.notification .not-seen, .stream-item.notification .not-seen,
@ -305,15 +308,15 @@ class QvitterAction extends ApiAction
.crop-and-save-button, .crop-and-save-button,
.topbar .global-nav.show-logo:before, .topbar .global-nav.show-logo:before,
.topbar .global-nav.pulse-logo:before { .topbar .global-nav.pulse-logo:before {
background-color:<?php print QvitterPlugin::settings("defaultlinkcolor"); ?>;/*BACKGROUNDCOLOREND*/ background-color:/*BACKGROUNDCOLORSTART*/<?php print QvitterPlugin::settings("defaultlinkcolor"); ?>/*BACKGROUNDCOLOREND*/;
} }
.queet-box-syntax[contenteditable="true"]:focus { .queet-box-syntax[contenteditable="true"]:focus {
border-color:#999999;/*BORDERCOLOREND*/ border-color:/*BORDERCOLORSTART*/#999999/*BORDERCOLOREND*/;
} }
#user-footer-inner, #user-footer-inner,
.inline-reply-queetbox, .inline-reply-queetbox,
#popup-faq #faq-container p.indent { #popup-faq #faq-container p.indent {
background-color:rgb(205,230,239);/*LIGHTERBACKGROUNDCOLOREND*/ background-color:/*LIGHTERBACKGROUNDCOLORSTART*/rgb(205,230,239)/*LIGHTERBACKGROUNDCOLOREND*/;
} }
#user-footer-inner, #user-footer-inner,
.queet-box, .queet-box,
@ -322,10 +325,45 @@ class QvitterAction extends ApiAction
span.inline-reply-caret, span.inline-reply-caret,
.stream-item.expanded .stream-item.first-visible-after-parent, .stream-item.expanded .stream-item.first-visible-after-parent,
#popup-faq #faq-container p.indent { #popup-faq #faq-container p.indent {
border-color:rgb(155,206,224);/*LIGHTERBORDERCOLOREND*/ border-color:/*LIGHTERBORDERCOLORSTART*/rgb(155,206,224)/*LIGHTERBORDERCOLOREND*/;
} }
span.inline-reply-caret .caret-inner { span.inline-reply-caret .caret-inner {
border-bottom-color:rgb(205,230,239);/*LIGHTERBORDERBOTTOMCOLOREND*/ border-bottom-color:/*LIGHTERBORDERBOTTOMCOLORSTART*/rgb(205,230,239)/*LIGHTERBORDERBOTTOMCOLOREND*/;
}
.modal-close .icon,
.chev-right,
.close-right,
button.icon.nav-search,
.member-button .join-text i,
.external-member-button .join-text i,
.external-follow-button .follow-text i,
.qvitter-follow-button .follow-text i,
#logo,
.upload-cover-photo,
.upload-avatar,
.upload-background-image,
button.shorten i,
.reload-stream,
.topbar .global-nav:before,
.stream-item.notification.repeat .dogear,
.stream-item.notification.like .dogear,
.ostatus-link,
.close-edit-profile-window {
background-image: url("<?php print QvitterPlugin::settings("sprite"); ?>");
background-size: 500px 1329px;
}
@media (max-width: 910px) {
#search-query,
.menu-container a,
.menu-container a.current,
.stream-selection.friends-timeline:after,
.stream-selection.notifications:after,
.stream-selection.my-timeline:after,
.stream-selection.public-timeline:after {
background-image: url("<?php print QvitterPlugin::settings("sprite"); ?>");
background-size: 500px 1329px;
}
} }
</style> </style>

4
css/qvitter.css
View File

@ -3506,6 +3506,7 @@ button.shorten:after {
margin-left:-20px; margin-left:-20px;
top: 2px; top: 2px;
z-index:10000; z-index:10000;
background-color:#fff;
} }
#footer-spinner-container .loader, #footer-spinner-container .loader,
.queet-box-loading-cover .loader { .queet-box-loading-cover .loader {
@ -4466,7 +4467,6 @@ body.rtl #feed-header-inner h2 {
} }
#search-query { #search-query {
background-image: url("../img/sprite.png?v=40");
background-size: 500px 1329px; background-size: 500px 1329px;
background-position: -100px -804px; background-position: -100px -804px;
border: 0 none; border: 0 none;
@ -4770,7 +4770,6 @@ body.rtl #feed-header-inner h2 {
padding:0 !important; padding:0 !important;
margin:0; margin:0;
border-radius:0 0 0 0 !important; border-radius:0 0 0 0 !important;
background-image: url("../img/sprite.png?v=40");
background-size: 500px 1329px; background-size: 500px 1329px;
background-position: center -1003px; background-position: center -1003px;
} }
@ -4804,7 +4803,6 @@ body.rtl #feed-header-inner h2 {
margin-left: -35px; margin-left: -35px;
width: 70px; width: 70px;
height: 55px; height: 55px;
background-image: url("../img/sprite.png?v=40");
background-size: 500px 1329px; background-size: 500px 1329px;
background-color:#ccc; background-color:#ccc;
} }

26
js/misc-functions.js
View File

@ -702,19 +702,21 @@ function changeLinkColor(newLinkColor) {
return false; return false;
} }
var lighterColor08 = blendRGBColors(hex2rgb(validHexColor),'rgb(255,255,255)',0.8);
var lighterColor06 = blendRGBColors(hex2rgb(validHexColor),'rgb(255,255,255)',0.6)
var headStyle = $('head').children('style'); var headStyle = $('head').children('style');
var linkstyle = headStyle.text(); var headStyleText = headStyle.text();
headStyle.text(linkstyle.substring(0,linkstyle.indexOf('color:')+6) + validHexColor + linkstyle.substring(linkstyle.indexOf(';/*COLOREND*/'))); headStyleText = replaceFromStringEndToStringStart(headStyleText,'/*COLORSTART*/','/*COLOREND*/',validHexColor);
var linkstyle = headStyle.html(); headStyleText = replaceFromStringEndToStringStart(headStyleText,'/*BACKGROUNDCOLORSTART*/','/*BACKGROUNDCOLOREND*/',validHexColor);
headStyle.text(linkstyle.substring(0,linkstyle.indexOf('background-color:')+17) + validHexColor + linkstyle.substring(linkstyle.indexOf(';/*BACKGROUNDCOLOREND*/'))); headStyleText = replaceFromStringEndToStringStart(headStyleText,'/*BORDERCOLORSTART*/','/*BORDERCOLOREND*/',validHexColor);
var linkstyle = headStyle.html(); headStyleText = replaceFromStringEndToStringStart(headStyleText,'/*LIGHTERBACKGROUNDCOLORSTART*/','/*LIGHTERBACKGROUNDCOLOREND*/',lighterColor08);
headStyle.text(linkstyle.substring(0,linkstyle.indexOf('border-color:')+13) + validHexColor + linkstyle.substring(linkstyle.indexOf(';/*BORDERCOLOREND*/'))); headStyleText = replaceFromStringEndToStringStart(headStyleText,'/*LIGHTERBORDERCOLORSTART*/','/*LIGHTERBORDERCOLOREND*/',lighterColor06);
var linkstyle = headStyle.html(); headStyleText = replaceFromStringEndToStringStart(headStyleText,'/*LIGHTERBORDERBOTTOMCOLORSTART*/','/*LIGHTERBORDERBOTTOMCOLOREND*/',lighterColor08);
headStyle.text(linkstyle.substring(0,linkstyle.indexOf('background-color:rgb(')+17) + blendRGBColors(hex2rgb(validHexColor),'rgb(255,255,255)',0.8) + linkstyle.substring(linkstyle.indexOf(';/*LIGHTERBACKGROUNDCOLOREND*/'))); headStyle.text(headStyleText);
var linkstyle = headStyle.html(); }
headStyle.text(linkstyle.substring(0,linkstyle.indexOf('border-color:rgb(')+13) + blendRGBColors(hex2rgb(validHexColor),'rgb(255,255,255)',0.6) + linkstyle.substring(linkstyle.indexOf(';/*LIGHTERBORDERCOLOREND*/'))); function replaceFromStringEndToStringStart(string,fromStringEnd,toStringStart,withString) {
var linkstyle = headStyle.html(); return string.substring(0,string.indexOf(fromStringEnd)+fromStringEnd.length) + withString + string.substring(string.indexOf(toStringStart));
headStyle.text(linkstyle.substring(0,linkstyle.indexOf('border-bottom-color:rgb(')+20) + blendRGBColors(hex2rgb(validHexColor),'rgb(255,255,255)',0.8) + linkstyle.substring(linkstyle.indexOf(';/*LIGHTERBORDERBOTTOMCOLOREND*/')));
} }
function blendRGBColors(c0, c1, p) { function blendRGBColors(c0, c1, p) {
var f=c0.split(","),t=c1.split(","),R=parseInt(f[0].slice(4)),G=parseInt(f[1]),B=parseInt(f[2]); var f=c0.split(","),t=c1.split(","),R=parseInt(f[0].slice(4)),G=parseInt(f[1]),B=parseInt(f[2]);