mirror of
https://github.com/friendica/friendica
synced 2024-11-20 11:43:41 +00:00
Merge pull request #500 from fabrixxm/quattro-fontsoptions
Quattro fixes
This commit is contained in:
fabrixxm
commit
9d4fdee65d
22 changed files with 403 additions and 74 deletions
BIN
images/tag.png
BIN
images/tag.png
Binary file not shown.
|
Before Width: | Height: | Size: 528 B |
BIN
images/tag_b.png
BIN
images/tag_b.png
Binary file not shown.
|
Before Width: | Height: | Size: 346 B |
|
|
@ -102,13 +102,19 @@ function editpost_content(&$a) {
|
|||
'$action' => 'item',
|
||||
'$share' => t('Edit'),
|
||||
'$upload' => t('Upload photo'),
|
||||
'$shortupload' => t('upload photo'),
|
||||
'$attach' => t('Attach file'),
|
||||
'$shortattach' => t('attach file'),
|
||||
'$weblink' => t('Insert web link'),
|
||||
'$youtube' => t('Insert YouTube video'),
|
||||
'$video' => t('Insert Vorbis [.ogg] video'),
|
||||
'$audio' => t('Insert Vorbis [.ogg] audio'),
|
||||
'$shortweblink' => t('web link'),
|
||||
'$video' => t('Insert video link'),
|
||||
'$shortvideo' => t('video link'),
|
||||
'$audio' => t('Insert audio link'),
|
||||
'$shortaudio' => t('audio link'),
|
||||
'$setloc' => t('Set your location'),
|
||||
'$shortsetloc' => t('set location'),
|
||||
'$noloc' => t('Clear browser location'),
|
||||
'$shortnoloc' => t('clear location'),
|
||||
'$wait' => t('Please wait'),
|
||||
'$permset' => t('Permission settings'),
|
||||
'$ptyp' => $itm[0]['type'],
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ class Item extends BaseObject {
|
|||
}
|
||||
|
||||
if ($this->is_toplevel()) {
|
||||
$result['total_comments_num'] = $total_children;
|
||||
$result['total_comments_num'] = "$total_children";
|
||||
$result['total_comments_text'] = tt('comment', 'comments', $total_children);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
all:
|
||||
cd dark; make; cd ..
|
||||
cd green; make; cd ..
|
||||
cd lilac; make; cd ..
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,10 @@ function theme_content(&$a){
|
|||
|
||||
$align = get_pconfig(local_user(), 'quattro', 'align' );
|
||||
$color = get_pconfig(local_user(), 'quattro', 'color' );
|
||||
$tfs = get_pconfig(local_user(),"quattro","tfs");
|
||||
$pfs = get_pconfig(local_user(),"quattro","pfs");
|
||||
|
||||
return quattro_form($a,$align, $color);
|
||||
return quattro_form($a,$align, $color, $tfs, $pfs);
|
||||
}
|
||||
|
||||
function theme_post(&$a){
|
||||
|
|
@ -22,6 +24,8 @@ function theme_post(&$a){
|
|||
if (isset($_POST['quattro-settings-submit'])){
|
||||
set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
|
||||
set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
|
||||
set_pconfig(local_user(), 'quattro', 'tfs', $_POST['quattro_tfs']);
|
||||
set_pconfig(local_user(), 'quattro', 'pfs', $_POST['quattro_pfs']);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -29,25 +33,32 @@ function theme_post(&$a){
|
|||
function theme_admin(&$a){
|
||||
$align = get_config('quattro', 'align' );
|
||||
$color = get_config('quattro', 'color' );
|
||||
$tfs = get_config("quattro","tfs");
|
||||
$pfs = get_config("quattro","pfs");
|
||||
|
||||
return quattro_form($a,$align, $color);
|
||||
return quattro_form($a,$align, $color, $tfs, $pfs);
|
||||
}
|
||||
|
||||
function theme_admin_post(&$a){
|
||||
if (isset($_POST['quattro-settings-submit'])){
|
||||
set_config('quattro', 'align', $_POST['quattro_align']);
|
||||
set_config('quattro', 'color', $_POST['quattro_color']);
|
||||
set_config('quattro', 'tfs', $_POST['quattro_tfs']);
|
||||
set_config('quattro', 'pfs', $_POST['quattro_pfs']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function quattro_form(&$a, $align, $color){
|
||||
function quattro_form(&$a, $align, $color, $tfs, $pfs){
|
||||
$colors = array(
|
||||
"dark"=>"Quattro",
|
||||
"lilac"=>"Lilac",
|
||||
"green"=>"Green"
|
||||
);
|
||||
|
||||
if ($tfs===false) $tfs="20";
|
||||
if ($pfs===false) $pfs="12";
|
||||
|
||||
$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
|
||||
$o .= replace_macros($t, array(
|
||||
'$submit' => t('Submit'),
|
||||
|
|
@ -55,6 +66,8 @@ function quattro_form(&$a, $align, $color){
|
|||
'$title' => t("Theme settings"),
|
||||
'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
|
||||
'$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
|
||||
'$pfs' => array('quattro_pfs', t('Posts font size'), $pfs),
|
||||
'$tfs' => array('quattro_tfs',t('Textareas font size'), $tfs),
|
||||
));
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,6 +89,7 @@
|
|||
@CommentBoxFullBorderColor: @Grey5;
|
||||
|
||||
@TagColor: @Grey1;
|
||||
@MentionColor: @Grey4;
|
||||
|
||||
@JotToolsBackgroundColor: @Metalic4;
|
||||
@JotToolsBorderColor: @Metalic2;
|
||||
|
|
|
|||
|
|
@ -404,9 +404,6 @@ code {
|
|||
padding: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
textarea {
|
||||
font-size: 20px;
|
||||
}
|
||||
#panel {
|
||||
position: absolute;
|
||||
width: 10em;
|
||||
|
|
@ -1088,7 +1085,6 @@ section {
|
|||
padding: 0.3em;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-text-full {
|
||||
font-size: 20px;
|
||||
height: 4em;
|
||||
color: #2d2d2d;
|
||||
border: 1px solid #2d2d2d;
|
||||
|
|
@ -1142,23 +1138,46 @@ section {
|
|||
padding-top: 5px;
|
||||
}
|
||||
.tag {
|
||||
background: url("../../../images/tag_b.png") no-repeat center left;
|
||||
background: url("icons/tag.png") no-repeat center right;
|
||||
color: #ffffff;
|
||||
padding-right: 8px;
|
||||
padding-left: 3px;
|
||||
}
|
||||
.tag a {
|
||||
padding-right: 8px;
|
||||
background: url("../../../images/tag.png") no-repeat center right;
|
||||
color: #ffffff;
|
||||
}
|
||||
.filesavetags {
|
||||
padding: 3px 0px 3px 0px;
|
||||
opacity: 0.5;
|
||||
.mention {
|
||||
background: url("icons/men.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 18px;
|
||||
}
|
||||
.mention a {
|
||||
color: #666666;
|
||||
}
|
||||
.folder {
|
||||
background: url("icons/folder.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.folder a {
|
||||
color: #666666;
|
||||
}
|
||||
.category {
|
||||
background: url("icons/category.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.category a {
|
||||
color: #666666;
|
||||
}
|
||||
/*.filesavetags {
|
||||
padding: 3px 0px 3px 0px;
|
||||
opacity: 0.5;
|
||||
}*/
|
||||
.wwto {
|
||||
position: absolute !important;
|
||||
width: 25px;
|
||||
height: 25px;
|
||||
background: #FFFFFF;
|
||||
border: 2px solid #364e59;
|
||||
height: 25px;
|
||||
|
|
@ -1334,9 +1353,6 @@ span[id^="showmore-wrap"] {
|
|||
border: 1px solid #999999;
|
||||
padding: 0.3em;
|
||||
}
|
||||
#jot .profile-jot-text:focus {
|
||||
font-size: 20px;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2147,3 +2163,47 @@ footer {
|
|||
.videobb:hover {
|
||||
background-position: -112px -16px;
|
||||
}
|
||||
/** range input css **/
|
||||
/* slider root element */
|
||||
.slider {
|
||||
height: 2px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
border: 1px solid #333;
|
||||
width: 200px;
|
||||
margin: 10px 0px 10px 0px;
|
||||
float: left;
|
||||
}
|
||||
/* progress bar (enabled with progress: true) */
|
||||
.progress {
|
||||
height: 9px;
|
||||
background-color: #C5FF00;
|
||||
display: none;
|
||||
opacity: 0.6;
|
||||
}
|
||||
/* drag handle */
|
||||
.handle {
|
||||
background-color: #ccc;
|
||||
height: 16px;
|
||||
width: 8px;
|
||||
top: -8px;
|
||||
position: absolute;
|
||||
display: block;
|
||||
margin-top: 1px;
|
||||
border: 1px solid #000;
|
||||
cursor: move;
|
||||
-moz-border-radius: 0 0 5px 5px;
|
||||
-webkit-border-radius: 0 0 5px 5px;
|
||||
border-radius: 0 0 5px 5px;
|
||||
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
}
|
||||
/* the input field */
|
||||
.range {
|
||||
width: 20px!important;
|
||||
font-size: 8pt;
|
||||
margin-left: 10px;
|
||||
border: 0px;
|
||||
color: #999999;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@
|
|||
@CommentBoxFullBorderColor: @Grey5;
|
||||
|
||||
@TagColor: @Grey1;
|
||||
@MentionColor: @Grey4;
|
||||
|
||||
@JotToolsBackgroundColor: @Green3;
|
||||
@JotToolsBorderColor: @Metalic2;
|
||||
|
|
|
|||
|
|
@ -404,9 +404,6 @@ code {
|
|||
padding: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
textarea {
|
||||
font-size: 20px;
|
||||
}
|
||||
#panel {
|
||||
position: absolute;
|
||||
width: 10em;
|
||||
|
|
@ -1088,7 +1085,6 @@ section {
|
|||
padding: 0.3em;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-text-full {
|
||||
font-size: 20px;
|
||||
height: 4em;
|
||||
color: #2d2d2d;
|
||||
border: 1px solid #2d2d2d;
|
||||
|
|
@ -1142,23 +1138,46 @@ section {
|
|||
padding-top: 5px;
|
||||
}
|
||||
.tag {
|
||||
background: url("../../../images/tag_b.png") no-repeat center left;
|
||||
background: url("icons/tag.png") no-repeat center right;
|
||||
color: #ffffff;
|
||||
padding-right: 8px;
|
||||
padding-left: 3px;
|
||||
}
|
||||
.tag a {
|
||||
padding-right: 8px;
|
||||
background: url("../../../images/tag.png") no-repeat center right;
|
||||
color: #ffffff;
|
||||
}
|
||||
.filesavetags {
|
||||
padding: 3px 0px 3px 0px;
|
||||
opacity: 0.5;
|
||||
.mention {
|
||||
background: url("icons/men.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 18px;
|
||||
}
|
||||
.mention a {
|
||||
color: #666666;
|
||||
}
|
||||
.folder {
|
||||
background: url("icons/folder.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.folder a {
|
||||
color: #666666;
|
||||
}
|
||||
.category {
|
||||
background: url("icons/category.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.category a {
|
||||
color: #666666;
|
||||
}
|
||||
/*.filesavetags {
|
||||
padding: 3px 0px 3px 0px;
|
||||
opacity: 0.5;
|
||||
}*/
|
||||
.wwto {
|
||||
position: absolute !important;
|
||||
width: 25px;
|
||||
height: 25px;
|
||||
background: #FFFFFF;
|
||||
border: 2px solid #364e59;
|
||||
height: 25px;
|
||||
|
|
@ -1334,9 +1353,6 @@ span[id^="showmore-wrap"] {
|
|||
border: 1px solid #999999;
|
||||
padding: 0.3em;
|
||||
}
|
||||
#jot .profile-jot-text:focus {
|
||||
font-size: 20px;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2147,3 +2163,47 @@ footer {
|
|||
.videobb:hover {
|
||||
background-position: -112px -16px;
|
||||
}
|
||||
/** range input css **/
|
||||
/* slider root element */
|
||||
.slider {
|
||||
height: 2px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
border: 1px solid #333;
|
||||
width: 200px;
|
||||
margin: 10px 0px 10px 0px;
|
||||
float: left;
|
||||
}
|
||||
/* progress bar (enabled with progress: true) */
|
||||
.progress {
|
||||
height: 9px;
|
||||
background-color: #C5FF00;
|
||||
display: none;
|
||||
opacity: 0.6;
|
||||
}
|
||||
/* drag handle */
|
||||
.handle {
|
||||
background-color: #ccc;
|
||||
height: 16px;
|
||||
width: 8px;
|
||||
top: -8px;
|
||||
position: absolute;
|
||||
display: block;
|
||||
margin-top: 1px;
|
||||
border: 1px solid #000;
|
||||
cursor: move;
|
||||
-moz-border-radius: 0 0 5px 5px;
|
||||
-webkit-border-radius: 0 0 5px 5px;
|
||||
border-radius: 0 0 5px 5px;
|
||||
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
}
|
||||
/* the input field */
|
||||
.range {
|
||||
width: 20px!important;
|
||||
font-size: 8pt;
|
||||
margin-left: 10px;
|
||||
border: 0px;
|
||||
color: #999999;
|
||||
}
|
||||
|
|
|
|||
BIN
view/theme/quattro/icons/category.png
Normal file
BIN
view/theme/quattro/icons/category.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 550 B |
BIN
view/theme/quattro/icons/folder.png
Normal file
BIN
view/theme/quattro/icons/folder.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 472 B |
BIN
view/theme/quattro/icons/men.png
Normal file
BIN
view/theme/quattro/icons/men.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 394 B |
BIN
view/theme/quattro/icons/tag.png
Normal file
BIN
view/theme/quattro/icons/tag.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 661 B |
|
|
@ -20,7 +20,7 @@
|
|||
<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
|
||||
<li><a href="#" onclick="return false;" id="wall-file-upload" title="$attach">$shortattach</a></li>
|
||||
<li><a id="profile-link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
|
||||
<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
|
||||
<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$video">$shortvideo</a></li>
|
||||
<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
|
||||
<!-- TODO: waiting for a better placement
|
||||
<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
|
||||
|
|
|
|||
11
view/theme/quattro/jquery.tools.min.js
vendored
Normal file
11
view/theme/quattro/jquery.tools.min.js
vendored
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
/*!
|
||||
* jQuery Tools v1.2.7 - The missing UI library for the Web
|
||||
*
|
||||
* rangeinput/rangeinput.js
|
||||
*
|
||||
* NO COPYRIGHTS OR LICENSES. DO WHAT YOU LIKE.
|
||||
*
|
||||
* http://flowplayer.org/tools/
|
||||
*
|
||||
*/
|
||||
(function(a){a.tools=a.tools||{version:"v1.2.7"};var b;b=a.tools.rangeinput={conf:{min:0,max:100,step:"any",steps:0,value:0,precision:undefined,vertical:0,keyboard:!0,progress:!1,speed:100,css:{input:"range",slider:"slider",progress:"progress",handle:"handle"}}};var c,d;a.fn.drag=function(b){document.ondragstart=function(){return!1},b=a.extend({x:!0,y:!0,drag:!0},b),c=c||a(document).on("mousedown mouseup",function(e){var f=a(e.target);if(e.type=="mousedown"&&f.data("drag")){var g=f.position(),h=e.pageX-g.left,i=e.pageY-g.top,j=!0;c.on("mousemove.drag",function(a){var c=a.pageX-h,e=a.pageY-i,g={};b.x&&(g.left=c),b.y&&(g.top=e),j&&(f.trigger("dragStart"),j=!1),b.drag&&f.css(g),f.trigger("drag",[e,c]),d=f}),e.preventDefault()}else try{d&&d.trigger("dragEnd")}finally{c.off("mousemove.drag"),d=null}});return this.data("drag",!0)};function e(a,b){var c=Math.pow(10,b);return Math.round(a*c)/c}function f(a,b){var c=parseInt(a.css(b),10);if(c)return c;var d=a[0].currentStyle;return d&&d.width&&parseInt(d.width,10)}function g(a){var b=a.data("events");return b&&b.onSlide}function h(b,c){var d=this,h=c.css,i=a("<div><div/><a href='#'/></div>").data("rangeinput",d),j,k,l,m,n;b.before(i);var o=i.addClass(h.slider).find("a").addClass(h.handle),p=i.find("div").addClass(h.progress);a.each("min,max,step,value".split(","),function(a,d){var e=b.attr(d);parseFloat(e)&&(c[d]=parseFloat(e,10))});var q=c.max-c.min,r=c.step=="any"?0:c.step,s=c.precision;s===undefined&&(s=r.toString().split("."),s=s.length===2?s[1].length:0);if(b.attr("type")=="range"){var t=b.clone().wrap("<div/>").parent().html(),u=a(t.replace(/type/i,"type=text data-orig-type"));u.val(c.value),b.replaceWith(u),b=u}b.addClass(h.input);var v=a(d).add(b),w=!0;function x(a,f,g,h){g===undefined?g=f/m*q:h&&(g-=c.min),r&&(g=Math.round(g/r)*r);if(f===undefined||r)f=g*m/q;if(isNaN(g))return d;f=Math.max(0,Math.min(f,m)),g=f/m*q;if(h||!j)g+=c.min;j&&(h?f=m-f:g=c.max-g),g=e(g,s);var i=a.type=="click";if(w&&k!==undefined&&!i){a.type="onSlide",v.trigger(a,[g,f]);if(a.isDefaultPrevented())return d}var l=i?c.speed:0,t=i?function(){a.type="change",v.trigger(a,[g])}:null;j?(o.animate({top:f},l,t),c.progress&&p.animate({height:m-f+o.height()/2},l)):(o.animate({left:f},l,t),c.progress&&p.animate({width:f+o.width()/2},l)),k=g,n=f,b.val(g);return d}a.extend(d,{getValue:function(){return k},setValue:function(b,c){y();return x(c||a.Event("api"),undefined,b,!0)},getConf:function(){return c},getProgress:function(){return p},getHandle:function(){return o},getInput:function(){return b},step:function(b,e){e=e||a.Event();var f=c.step=="any"?1:c.step;d.setValue(k+f*(b||1),e)},stepUp:function(a){return d.step(a||1)},stepDown:function(a){return d.step(-a||-1)}}),a.each("onSlide,change".split(","),function(b,e){a.isFunction(c[e])&&a(d).on(e,c[e]),d[e]=function(b){b&&a(d).on(e,b);return d}}),o.drag({drag:!1}).on("dragStart",function(){y(),w=g(a(d))||g(b)}).on("drag",function(a,c,d){if(b.is(":disabled"))return!1;x(a,j?c:d)}).on("dragEnd",function(a){a.isDefaultPrevented()||(a.type="change",v.trigger(a,[k]))}).click(function(a){return a.preventDefault()}),i.click(function(a){if(b.is(":disabled")||a.target==o[0])return a.preventDefault();y();var c=j?o.height()/2:o.width()/2;x(a,j?m-l-c+a.pageY:a.pageX-l-c)}),c.keyboard&&b.keydown(function(c){if(!b.attr("readonly")){var e=c.keyCode,f=a([75,76,38,33,39]).index(e)!=-1,g=a([74,72,40,34,37]).index(e)!=-1;if((f||g)&&!(c.shiftKey||c.altKey||c.ctrlKey)){f?d.step(e==33?10:1,c):g&&d.step(e==34?-10:-1,c);return c.preventDefault()}}}),b.blur(function(b){var c=a(this).val();c!==k&&d.setValue(c,b)}),a.extend(b[0],{stepUp:d.stepUp,stepDown:d.stepDown});function y(){j=c.vertical||f(i,"height")>f(i,"width"),j?(m=f(i,"height")-f(o,"height"),l=i.offset().top+m):(m=f(i,"width")-f(o,"width"),l=i.offset().left)}function z(){y(),d.setValue(c.value!==undefined?c.value:c.min)}z(),m||a(window).load(z)}a.expr[":"].range=function(b){var c=b.getAttribute("type");return c&&c=="range"||a(b).filter("input").data("rangeinput")},a.fn.rangeinput=function(c){if(this.data("rangeinput"))return this;c=a.extend(!0,{},b.conf,c);var d;this.each(function(){var b=new h(a(this),a.extend(!0,{},c)),e=b.getInput().data("rangeinput",b);d=d?d.add(e):e});return d?d:this}})(jQuery);
|
||||
|
|
@ -92,6 +92,7 @@
|
|||
@CommentBoxFullBorderColor: @Grey5;
|
||||
|
||||
@TagColor: @Grey1;
|
||||
@MentionColor: @Grey4;
|
||||
|
||||
@JotToolsBackgroundColor: @lilacDark;
|
||||
@JotToolsBorderColor: @Metalic2;
|
||||
|
|
|
|||
|
|
@ -404,9 +404,6 @@ code {
|
|||
padding: 10px;
|
||||
margin-top: 20px;
|
||||
}
|
||||
textarea {
|
||||
font-size: 20px;
|
||||
}
|
||||
#panel {
|
||||
position: absolute;
|
||||
width: 10em;
|
||||
|
|
@ -1088,7 +1085,6 @@ section {
|
|||
padding: 0.3em;
|
||||
}
|
||||
.wall-item-comment-wrapper .comment-edit-text-full {
|
||||
font-size: 20px;
|
||||
height: 4em;
|
||||
color: #2d2d2d;
|
||||
border: 1px solid #2d2d2d;
|
||||
|
|
@ -1142,23 +1138,46 @@ section {
|
|||
padding-top: 5px;
|
||||
}
|
||||
.tag {
|
||||
background: url("../../../images/tag_b.png") no-repeat center left;
|
||||
background: url("icons/tag.png") no-repeat center right;
|
||||
color: #ffffff;
|
||||
padding-right: 8px;
|
||||
padding-left: 3px;
|
||||
}
|
||||
.tag a {
|
||||
padding-right: 8px;
|
||||
background: url("../../../images/tag.png") no-repeat center right;
|
||||
color: #ffffff;
|
||||
}
|
||||
.filesavetags {
|
||||
padding: 3px 0px 3px 0px;
|
||||
opacity: 0.5;
|
||||
.mention {
|
||||
background: url("icons/men.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 18px;
|
||||
}
|
||||
.mention a {
|
||||
color: #666666;
|
||||
}
|
||||
.folder {
|
||||
background: url("icons/folder.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.folder a {
|
||||
color: #666666;
|
||||
}
|
||||
.category {
|
||||
background: url("icons/category.png") no-repeat 1px center;
|
||||
color: #666666;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
.category a {
|
||||
color: #666666;
|
||||
}
|
||||
/*.filesavetags {
|
||||
padding: 3px 0px 3px 0px;
|
||||
opacity: 0.5;
|
||||
}*/
|
||||
.wwto {
|
||||
position: absolute !important;
|
||||
width: 25px;
|
||||
height: 25px;
|
||||
background: #FFFFFF;
|
||||
border: 2px solid #364e59;
|
||||
height: 25px;
|
||||
|
|
@ -1334,9 +1353,6 @@ span[id^="showmore-wrap"] {
|
|||
border: 1px solid #999999;
|
||||
padding: 0.3em;
|
||||
}
|
||||
#jot .profile-jot-text:focus {
|
||||
font-size: 20px;
|
||||
}
|
||||
#jot #jot-tools {
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
|
|
@ -2147,3 +2163,47 @@ footer {
|
|||
.videobb:hover {
|
||||
background-position: -112px -16px;
|
||||
}
|
||||
/** range input css **/
|
||||
/* slider root element */
|
||||
.slider {
|
||||
height: 2px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
border: 1px solid #333;
|
||||
width: 200px;
|
||||
margin: 10px 0px 10px 0px;
|
||||
float: left;
|
||||
}
|
||||
/* progress bar (enabled with progress: true) */
|
||||
.progress {
|
||||
height: 9px;
|
||||
background-color: #C5FF00;
|
||||
display: none;
|
||||
opacity: 0.6;
|
||||
}
|
||||
/* drag handle */
|
||||
.handle {
|
||||
background-color: #ccc;
|
||||
height: 16px;
|
||||
width: 8px;
|
||||
top: -8px;
|
||||
position: absolute;
|
||||
display: block;
|
||||
margin-top: 1px;
|
||||
border: 1px solid #000;
|
||||
cursor: move;
|
||||
-moz-border-radius: 0 0 5px 5px;
|
||||
-webkit-border-radius: 0 0 5px 5px;
|
||||
border-radius: 0 0 5px 5px;
|
||||
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
}
|
||||
/* the input field */
|
||||
.range {
|
||||
width: 20px!important;
|
||||
font-size: 8pt;
|
||||
margin-left: 10px;
|
||||
border: 0px;
|
||||
color: #999999;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,9 +71,6 @@ code {
|
|||
margin-top: 20px;
|
||||
}
|
||||
|
||||
textarea { font-size: 20px; }
|
||||
|
||||
|
||||
#panel {
|
||||
position: absolute;
|
||||
width: 10em;
|
||||
|
|
@ -554,7 +551,6 @@ section {
|
|||
padding:0.3em;
|
||||
}
|
||||
.comment-edit-text-full {
|
||||
font-size: 20px;
|
||||
height: 4em;
|
||||
color: @CommentBoxFullColor;
|
||||
border: 1px solid @CommentBoxFullBorderColor;
|
||||
|
|
@ -595,19 +591,37 @@ section {
|
|||
|
||||
.wall-item-tags { padding-top: 5px; }
|
||||
.tag {
|
||||
background: url("../../../images/tag_b.png") no-repeat center left;
|
||||
background: url("icons/tag.png") no-repeat center right;
|
||||
color: @TagColor;
|
||||
padding-right: 8px;
|
||||
padding-left: 3px;
|
||||
a {
|
||||
padding-right: 8px;
|
||||
background: url("../../../images/tag.png") no-repeat center right;
|
||||
color: @TagColor;
|
||||
}
|
||||
a { color: @TagColor; }
|
||||
}
|
||||
.filesavetags {
|
||||
.mention {
|
||||
background: url("icons/men.png") no-repeat 1px center;
|
||||
color: @MentionColor;
|
||||
padding-right: 3px;
|
||||
padding-left: 18px;
|
||||
a { color: @MentionColor; }
|
||||
}
|
||||
.folder {
|
||||
background: url("icons/folder.png") no-repeat 1px center;
|
||||
color: @MentionColor;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
a { color: @MentionColor; }
|
||||
}
|
||||
.category {
|
||||
background: url("icons/category.png") no-repeat 1px center;
|
||||
color: @MentionColor;
|
||||
padding-right: 3px;
|
||||
padding-left: 15px;
|
||||
a { color: @MentionColor; }
|
||||
}
|
||||
/*.filesavetags {
|
||||
padding: 3px 0px 3px 0px;
|
||||
opacity: 0.5;
|
||||
}
|
||||
}*/
|
||||
|
||||
.wwto {
|
||||
position: absolute !important;
|
||||
|
|
@ -756,8 +770,6 @@ span[id^="showmore-wrap"] {
|
|||
color: @CommentBoxEmptyColor;
|
||||
border: 1px solid @CommentBoxEmptyBorderColor;
|
||||
padding:0.3em;
|
||||
|
||||
&:focus { font-size: 20px; }
|
||||
}
|
||||
|
||||
#jot-tools {
|
||||
|
|
@ -1463,3 +1475,48 @@ footer { height: 100px; display: table-row; }
|
|||
.videobb:hover { background-position: -112px -16px; }
|
||||
|
||||
|
||||
/** range input css **/
|
||||
/* slider root element */
|
||||
.slider {
|
||||
height:2px;
|
||||
position:relative;
|
||||
cursor:pointer;
|
||||
border:1px solid #333;
|
||||
width:200px;
|
||||
margin:10px 0px 10px 0px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
/* progress bar (enabled with progress: true) */
|
||||
.progress {
|
||||
height:9px;
|
||||
background-color:#C5FF00;
|
||||
display:none;
|
||||
opacity:0.6;
|
||||
}
|
||||
|
||||
/* drag handle */
|
||||
.handle {
|
||||
background-color:#ccc;
|
||||
height:16px;
|
||||
width:8px;
|
||||
top:-8px;
|
||||
position:absolute;
|
||||
display:block;
|
||||
margin-top:1px;
|
||||
border:1px solid #000;
|
||||
cursor:move;
|
||||
.roundbottom();
|
||||
.shadow();
|
||||
|
||||
}
|
||||
|
||||
/* the input field */
|
||||
.range {
|
||||
width: 20px!important;
|
||||
font-size: 8pt;
|
||||
margin-left: 10px;
|
||||
border: 0px;
|
||||
color: @FieldHelpColor;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,3 +28,28 @@
|
|||
}
|
||||
";
|
||||
}
|
||||
|
||||
|
||||
|
||||
$textarea_font_size = false;
|
||||
$post_font_size = false;
|
||||
|
||||
$site_textarea_font_size = get_config("quattro","tfs");
|
||||
$site_post_font_size = get_config("quattro","pfs");
|
||||
if ($site_textarea_font_size===false) $site_textarea_font_size="20";
|
||||
if ($site_post_font_size===false) $site_post_font_size="12";
|
||||
|
||||
if (local_user()) {
|
||||
$textarea_font_size = get_pconfig(local_user(), "quattro","tfs");
|
||||
$post_font_size = get_pconfig(local_user(), "quattro","pfs");
|
||||
}
|
||||
|
||||
if ($textarea_font_size===false) $textarea_font_size = $site_textarea_font_size;
|
||||
if ($post_font_size===false) $post_font_size = $site_post_font_size;
|
||||
|
||||
echo "
|
||||
textarea { font-size: ${textarea_font_size}px; }
|
||||
.wall-item-comment-wrapper .comment-edit-text-full { font-size: ${textarea_font_size}px; }
|
||||
#jot .profile-jot-text:focus { font-size: ${textarea_font_size}px; }
|
||||
.wall-item-container .wall-item-content { font-size: ${post_font_size}px; }
|
||||
";
|
||||
|
|
@ -1,8 +1,32 @@
|
|||
<script src="$baseurl/view/theme/quattro/jquery.tools.min.js"></script>
|
||||
|
||||
{{inc field_select.tpl with $field=$color}}{{endinc}}
|
||||
|
||||
{{inc field_select.tpl with $field=$align}}{{endinc}}
|
||||
|
||||
|
||||
<div class="field">
|
||||
<label for="id_$pfs.0">$pfs.1</label>
|
||||
<input type="range" class="inputRange" id="id_$pfs.0" name="$pfs.0" value="$pfs.2" min="10" max="22" step="1" />
|
||||
<span class="field_help"></span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="field">
|
||||
<label for="id_$tfs.0">$tfs.1</label>
|
||||
<input type="range" class="inputRange" id="id_$tfs.0" name="$tfs.0" value="$tfs.2" min="10" max="22" step="1" />
|
||||
<span class="field_help"></span>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="settings-submit-wrapper">
|
||||
<input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
|
||||
</div>
|
||||
|
||||
<script>
|
||||
|
||||
$(".inputRange").rangeinput();
|
||||
</script>
|
||||
|
|
@ -60,9 +60,18 @@
|
|||
<div class="wall-item-links">
|
||||
</div>
|
||||
<div class="wall-item-tags">
|
||||
{{ for $item.tags as $tag }}
|
||||
{{ for $item.hashtags as $tag }}
|
||||
<span class='tag'>$tag</span>
|
||||
{{ endfor }}
|
||||
{{ for $item.mentions as $tag }}
|
||||
<span class='mention'>$tag</span>
|
||||
{{ endfor }}
|
||||
{{ for $item.folders as $cat }}
|
||||
<span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
|
||||
{{ endfor }}
|
||||
{{ for $item.categories as $cat }}
|
||||
<span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
|
||||
{{ endfor }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="wall-item-bottom">
|
||||
|
|
|
|||
Loading…
Reference in a new issue