From 6deb0708901367a1c674ae9aa2bf57159fab9bea Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 17 Sep 2012 03:29:58 -0400 Subject: [PATCH 1/8] quattro: first work on font size options --- view/theme/quattro/dark/style.css | 7 ------- view/theme/quattro/green/style.css | 7 ------- view/theme/quattro/jquery.tools.min.js | 11 +++++++++++ view/theme/quattro/quattro.less | 6 ------ view/theme/quattro/style.php | 8 ++++++++ view/theme/quattro/theme_settings.tpl | 8 ++++++++ 6 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 view/theme/quattro/jquery.tools.min.js diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 0bb2cd10eb..69ead70451 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -404,9 +404,6 @@ code { padding: 10px; margin-top: 20px; } -textarea { - font-size: 20px; -} #panel { position: absolute; width: 10em; @@ -1072,7 +1069,6 @@ section { padding: 0.3em; } .wall-item-comment-wrapper .comment-edit-text-full { - font-size: 20px; height: 4em; color: #2d2d2d; border: 1px solid #2d2d2d; @@ -1315,9 +1311,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; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 4897471eac..b698ca3492 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -404,9 +404,6 @@ code { padding: 10px; margin-top: 20px; } -textarea { - font-size: 20px; -} #panel { position: absolute; width: 10em; @@ -1072,7 +1069,6 @@ section { padding: 0.3em; } .wall-item-comment-wrapper .comment-edit-text-full { - font-size: 20px; height: 4em; color: #2d2d2d; border: 1px solid #2d2d2d; @@ -1315,9 +1311,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; diff --git a/view/theme/quattro/jquery.tools.min.js b/view/theme/quattro/jquery.tools.min.js new file mode 100644 index 0000000000..4a643d25c8 --- /dev/null +++ b/view/theme/quattro/jquery.tools.min.js @@ -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("
").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("
").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); diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 84aa13ac03..2daed85c31 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -71,9 +71,6 @@ code { margin-top: 20px; } -textarea { font-size: 20px; } - - #panel { position: absolute; width: 10em; @@ -542,7 +539,6 @@ section { padding:0.3em; } .comment-edit-text-full { - font-size: 20px; height: 4em; color: @CommentBoxFullColor; border: 1px solid @CommentBoxFullBorderColor; @@ -744,8 +740,6 @@ span[id^="showmore-wrap"] { color: @CommentBoxEmptyColor; border: 1px solid @CommentBoxEmptyBorderColor; padding:0.3em; - - &:focus { font-size: 20px; } } #jot-tools { diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php index fa02a04b63..33c8a246ef 100644 --- a/view/theme/quattro/style.php +++ b/view/theme/quattro/style.php @@ -28,3 +28,11 @@ } "; } + + $textarea_font_size = "20"; + + 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; } + "; \ No newline at end of file diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl index 9771ae1621..54416cc16a 100644 --- a/view/theme/quattro/theme_settings.tpl +++ b/view/theme/quattro/theme_settings.tpl @@ -1,8 +1,16 @@ + + {{inc field_select.tpl with $field=$color}}{{endinc}} {{inc field_select.tpl with $field=$align}}{{endinc}} + + +
+ \ No newline at end of file From f058414ff1119b921e36e5d48aa2b2d9d76d796c Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 28 Sep 2012 10:03:03 -0400 Subject: [PATCH 2/8] Item: $item.total_comments_num as string --- object/Item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/object/Item.php b/object/Item.php index 04d52a896e..2c9d655981 100644 --- a/object/Item.php +++ b/object/Item.php @@ -283,7 +283,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); } From de076afd6b7659f5ad3556d1436ad0e3dc6de0b2 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 28 Sep 2012 10:17:26 -0400 Subject: [PATCH 3/8] quattro: update wall_thread.tpl to separate tags/mentions/folder/category display --- view/theme/quattro/wall_thread.tpl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl index 3221311fc7..2e5c49392f 100644 --- a/view/theme/quattro/wall_thread.tpl +++ b/view/theme/quattro/wall_thread.tpl @@ -60,9 +60,18 @@
- {{ for $item.tags as $tag }} + {{ for $item.hashtags as $tag }} $tag {{ endfor }} + {{ for $item.mentions as $tag }} + $tag + {{ endfor }} + {{ for $item.folders as $cat }} + $cat.name{{if $cat.removeurl}} (x) {{endif}} + {{ endfor }} + {{ for $item.categories as $cat }} + $cat.name{{if $cat.removeurl}} (x) {{endif}} + {{ endfor }}
From 9d738570eef76f5f896898ba5f70a5149a20c1ce Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 1 Oct 2012 08:58:05 -0400 Subject: [PATCH 4/8] quattro: options for posts and textareas font size --- view/theme/quattro/config.php | 25 ++++++++++---- view/theme/quattro/dark/style.css | 47 +++++++++++++++++++++++++-- view/theme/quattro/green/style.css | 47 +++++++++++++++++++++++++-- view/theme/quattro/quattro.less | 45 +++++++++++++++++++++++++ view/theme/quattro/style.php | 19 ++++++++++- view/theme/quattro/theme_settings.tpl | 20 ++++++++++-- 6 files changed, 188 insertions(+), 15 deletions(-) diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php index e3d5b78102..0f2fc53ca0 100644 --- a/view/theme/quattro/config.php +++ b/view/theme/quattro/config.php @@ -11,8 +11,10 @@ function theme_content(&$a){ $align = get_pconfig(local_user(), 'quattro', 'align' ); $color = get_pconfig(local_user(), 'quattro', 'color' ); - - return quattro_form($a,$align, $color); + $tfs = get_pconfig(local_user(),"quattro","tfs"); + $pfs = get_pconfig(local_user(),"quattro","pfs"); + + 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' ); - - return quattro_form($a,$align, $color); + $tfs = get_config("quattro","tfs"); + $pfs = get_config("quattro","pfs"); + + 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; } diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index c2dd472afd..524edf4e3d 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1152,9 +1152,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -2140,3 +2137,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; +} diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 47db715f92..a89277a128 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1152,9 +1152,6 @@ section { opacity: 0.5; } .wwto { - position: absolute !important; - width: 25px; - height: 25px; background: #FFFFFF; border: 2px solid #364e59; height: 25px; @@ -2140,3 +2137,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; +} diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index e7325b7ccb..ca4ec2625d 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1457,3 +1457,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; +} + diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php index 33c8a246ef..c75091eb5b 100644 --- a/view/theme/quattro/style.php +++ b/view/theme/quattro/style.php @@ -29,10 +29,27 @@ "; } - $textarea_font_size = "20"; + + + $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; } "; \ No newline at end of file diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl index 54416cc16a..47105d7aa4 100644 --- a/view/theme/quattro/theme_settings.tpl +++ b/view/theme/quattro/theme_settings.tpl @@ -4,7 +4,22 @@ {{inc field_select.tpl with $field=$align}}{{endinc}} - + +
+ + + +
+ + +
+ + + +
+ + +
@@ -12,5 +27,6 @@
\ No newline at end of file From ca34d89482172a524f4f81b8079ead24388e156f Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 1 Oct 2012 09:38:25 -0400 Subject: [PATCH 5/8] quattro: fix post tags style, add icons for mentions, folders and categories --- images/tag.png | Bin 528 -> 0 bytes images/tag_b.png | Bin 346 -> 0 bytes view/theme/quattro/dark/colors.less | 1 + view/theme/quattro/dark/style.css | 38 ++++++++++++++++++++++---- view/theme/quattro/green/colors.less | 1 + view/theme/quattro/green/style.css | 38 ++++++++++++++++++++++---- view/theme/quattro/icons/category.png | Bin 0 -> 550 bytes view/theme/quattro/icons/folder.png | Bin 0 -> 472 bytes view/theme/quattro/icons/men.png | Bin 0 -> 394 bytes view/theme/quattro/icons/tag.png | Bin 0 -> 661 bytes view/theme/quattro/quattro.less | 34 +++++++++++++++++------ 11 files changed, 92 insertions(+), 20 deletions(-) delete mode 100644 images/tag.png delete mode 100644 images/tag_b.png create mode 100644 view/theme/quattro/icons/category.png create mode 100644 view/theme/quattro/icons/folder.png create mode 100644 view/theme/quattro/icons/men.png create mode 100644 view/theme/quattro/icons/tag.png diff --git a/images/tag.png b/images/tag.png deleted file mode 100644 index 40c5fd44e2d3822244e0843596e76ce133ce1211..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 zcmV+r0`L8aP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2ipq| z4<8a@f?|RQ_pyu(guNqs(P%kOwRi9A+-4@5-ODSoCucUi2+i2@ zKt9bACxli*z&s746^JO{BNUK;wE5MPLTEJ#&;-2eA}ICnl|~S0H3Vtgr+@7e^~rWz zdu?@Le&4gcgVS>Y!!Q5B!e1b5H57)6l z1Wbm*)c$y1;S+>m21wV%^<{4R_A0k5T?fWQXp1)p!wj&ko_wv>*Hfv~p<_EO!!V}! zip4Mr-LFnEYMMIA+F}|JHl$5-f>3IJnqw<`y{38zf{T_yXo|%8vhNZ!r<>&kwco1b4tVba{}0HBa;W=KSdbAE1a zYF-JD%fR4Vl$uzQnxasiS(2gP?&%wlqL<1J6yNCS;uvCa`stL7d`$)-uKCegDjg1U zKJ1?JNAK~ItT}%~*~9G*Ok@+1X^9gzozmjiZd9@C`kmWLmLC@W{Wz1kbM6$aqui7D zcXUj=X<0DA(pGVf&WoJgy^AfjZppCzt(WTs{|37d zgPO75CLWc)($|munP|B7smQTSW>0lzsb5HZ@_qIC>7T12*YJ70eDqmL^)Bn7e;&KM hoi|KREXX&hW}4a%`1ah>`a+PeJYD@<);T3K0RYaMfxG|! diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less index 5c9de37531..35a8d8468f 100644 --- a/view/theme/quattro/dark/colors.less +++ b/view/theme/quattro/dark/colors.less @@ -89,6 +89,7 @@ @CommentBoxFullBorderColor: @Grey5; @TagColor: @Grey1; +@MentionColor: @Grey4; @JotToolsBackgroundColor: @Metalic4; @JotToolsBorderColor: @Metalic2; diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 524edf4e3d..fff08b2e4c 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1138,19 +1138,45 @@ 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 { background: #FFFFFF; border: 2px solid #364e59; diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less index f14c636331..78c67a13b4 100644 --- a/view/theme/quattro/green/colors.less +++ b/view/theme/quattro/green/colors.less @@ -87,6 +87,7 @@ @CommentBoxFullBorderColor: @Grey5; @TagColor: @Grey1; +@MentionColor: @Grey4; @JotToolsBackgroundColor: @Green3; @JotToolsBorderColor: @Metalic2; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index a89277a128..9584b019aa 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1138,19 +1138,45 @@ 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 { background: #FFFFFF; border: 2px solid #364e59; diff --git a/view/theme/quattro/icons/category.png b/view/theme/quattro/icons/category.png new file mode 100644 index 0000000000000000000000000000000000000000..ec4ad1dc59a245f895fd9b938677e3f42965f569 GIT binary patch literal 550 zcmV+>0@?kEP);rqKWZ010qNS#tmY3ljhU3ljkVnw%H_000McNliru+zJ5=BMJ?G1RMYW06A$? zSad^gZEa<4bN~PV001asDIhX1Ff<@aVQY0_AX9W@X>Mh53JODVWnpw>WFU8GbZ8({ zXk{QrNlj2`^sR&d00C}EL_t(2&vlSJYgADXhM)JGb8(F%*xXUiai08b)>8thE>CU)i5X0YkL$au0 zErKMx_lNn%A|~U_#x7OiaYDHN4%?KMW#}Y?zisD)*4oRqyL!Cfoa4;m z0!c7C(_z%MM=+iw3(iIk1p_v|Y_qksO){fxjRa)DjR6VucXsV!(N`D@9)=hrsrqfp zz0NTu4rp}BKJ`mI4m0s{jB107*qoM6N<$f=uw@~ literal 0 HcmV?d00001 diff --git a/view/theme/quattro/icons/folder.png b/view/theme/quattro/icons/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..fee43955216c32102063cc4b3fb3d3049d8e3340 GIT binary patch literal 472 zcmV;}0Vn>6P);rqKWZ010qNS#tmY4c7nw4c7reD4Tcy000McNliru+zJ5=ArZCHuW|qY0cA-< zK~yNub&)%66JZpEzdQ3Y8G;c)PGiIZ5RzE{YzCK9u3cvVtiTniZ1w_0K&NQ6fahDXva&b#xv!9*=ufRdvja8{~O@H5d$z{0BCfOn&rwz31)@fV(rF z&p*y)vq87pJuS2!MR_xleIhXd}8nXy zM?wg*gv8+T`!7OMH&TqedU3{jAF<>*y!{jQ>En#AS8IjXwj?eRGg^tn?=~Zex^WCs zh_UhDEfPFP4a0B=NjTuGXdNUlP-yB#xx~I~*d8KL`dj*z?#q-`QfR$(G>zZJ+JFKK}zrOW0hE_*$(1 O0000o|!Y9wk?l=xzV+^y|j9-c4nC^42C<@B5WH=l$8jV^BJ&4qG z&33zGGMSL3Da+*&&+`D-Y&I{=i^bx95k-;QSg+TTB#G?zdr6W+R;!hKBZ?w4Y(cs;cPqdM}M{MJ|^MVHl#6LTioh z`^@Ka@;oO9f{$-vMXuK?07@y8QUGYJ?f+=yWIP_T+wE{12N6L;Fvc*QPQPb-pUyAX obPk8Z$3d>^+SFXvwdvjVf8@;OJP59ci2wiq07*qoM6N<$fx|=|#r>V2Msk5iKv!|)6yQ!c;j-zAm(N_fYSyw*lOlKNo~H%v-f? z9+0tm!@SiS<^#z!8|SatXwd)eEYLxWB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SV3 z8`nXY(Me-=1yGQ^#M9T6{SFr+FDqkYPuvEeo<>g>$B>A_Z)eo{A2JX)wz{wIOwwJg zuJ`)V8w{WPuD4nLcJ1r5FZ`D!ecy>Y?fh1@cexE`@}mnTw;Q${4L|VlM&0R*yD{_ZgHey7Z`uSEgXWTV&wcuMiVWg@bVasx zSI)aEcY0|j@2MaWuak;9ouk9F*Xrx;TFiZRQsXE0(3nhS-v`%DZGAkcnT>stXK(*= zO^cH!J&YX8Ch$~LElhcHuqNy@x1`s#RymJz?vnzi2E}dCb-a6Ff`VfQbFQcJf|*&D oUS7N~Uo@3%`th5cIjVLHCvF@$yeZ6B5EwrUp00i_>zopr05~`>^Z)<= literal 0 HcmV?d00001 diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index ca4ec2625d..62260ef393 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -591,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; From 871f182414c6837cc45753b8bc28cd7e467b5c17 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 1 Oct 2012 09:53:02 -0400 Subject: [PATCH 6/8] quattro: add quattro-lilac to theme Makefile --- view/theme/quattro/Makefile | 1 + view/theme/quattro/lilac/colors.less | 1 + view/theme/quattro/lilac/style.css | 92 +++++++++++++++++++++++----- 3 files changed, 78 insertions(+), 16 deletions(-) diff --git a/view/theme/quattro/Makefile b/view/theme/quattro/Makefile index 5df58c821b..5b3d692a21 100644 --- a/view/theme/quattro/Makefile +++ b/view/theme/quattro/Makefile @@ -1,5 +1,6 @@ all: cd dark; make; cd .. cd green; make; cd .. + cd lilac; make; cd .. diff --git a/view/theme/quattro/lilac/colors.less b/view/theme/quattro/lilac/colors.less index 2df0e41f1e..d48f9552f4 100644 --- a/view/theme/quattro/lilac/colors.less +++ b/view/theme/quattro/lilac/colors.less @@ -92,6 +92,7 @@ @CommentBoxFullBorderColor: @Grey5; @TagColor: @Grey1; +@MentionColor: @Grey4; @JotToolsBackgroundColor: @lilacDark; @JotToolsBorderColor: @Metalic2; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index c6229e8858..4c9c74e758 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -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; +} From c7a4c0808127443b5e7473f6dd15dc4ebc201bbd Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 1 Oct 2012 09:59:55 -0400 Subject: [PATCH 7/8] quattro: fix jot "video link" tooltip --- view/theme/quattro/jot.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 95c0ff6b16..7f9f9bbaf1 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -20,7 +20,7 @@
  • $shortupload
  • $shortattach
  • $shortweblink
    • -
  • $shortvideo
    • +
  • $shortvideo
  • $shortaudio