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/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/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 533d151762..fff08b2e4c 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;
@@ -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;
+}
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 429da809d4..9584b019aa 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;
@@ -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;
+}
diff --git a/view/theme/quattro/icons/category.png b/view/theme/quattro/icons/category.png
new file mode 100644
index 0000000000..ec4ad1dc59
Binary files /dev/null and b/view/theme/quattro/icons/category.png differ
diff --git a/view/theme/quattro/icons/folder.png b/view/theme/quattro/icons/folder.png
new file mode 100644
index 0000000000..fee4395521
Binary files /dev/null and b/view/theme/quattro/icons/folder.png differ
diff --git a/view/theme/quattro/icons/men.png b/view/theme/quattro/icons/men.png
new file mode 100644
index 0000000000..e5b9c4a6f6
Binary files /dev/null and b/view/theme/quattro/icons/men.png differ
diff --git a/view/theme/quattro/icons/tag.png b/view/theme/quattro/icons/tag.png
new file mode 100644
index 0000000000..15758af472
Binary files /dev/null and b/view/theme/quattro/icons/tag.png differ
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