From efa55437d4d14dd81d10a98e5d3201d27bcbfafb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 13:59:16 +0200 Subject: increase width of the aside area and make default profile image size 300x300 --- view/css/widgets.css | 2 +- view/theme/redbasic/css/style.css | 7 ++++--- view/theme/redbasic/js/redbasic.js | 2 +- view/theme/redbasic/php/style.php | 2 +- view/tpl/cropbody.tpl | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index 63c380c75..0cfe98362 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -39,7 +39,7 @@ padding: 5px; width: 100%; resize: vertical; - height: 150px; + height: 245px; } /* saved searches */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 716298845..c2eccc782 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -406,9 +406,10 @@ footer { #profile-photo-wrapper img { + width: 100%; + max-width: 300px; + height: auto; padding: 10px; - width: 197px; - height: 197px; } #profile-photo-wrapper { @@ -571,7 +572,7 @@ footer { } .photo { - border: 1px solid #AAAAAA; + border: 1px solid #ccc; } .photo-top-photo, .photo-album-photo { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 68190778c..9408f5a6c 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,7 +7,7 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 231 ); + $('main').css('width', $(window).width() + 279 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 6e68d38d5..64ddcce7e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 231; + $aside_width = 279; // left aside and right aside are is 231px + converse width if($converse_center) { diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl index da5b1e859..4794c0b83 100755 --- a/view/tpl/cropbody.tpl +++ b/view/tpl/cropbody.tpl @@ -25,8 +25,8 @@ 'croppa', { previewWrap: 'previewWrap', - minWidth: 175, - minHeight: 175, + minWidth: 300, + minHeight: 300, maxWidth: 640, maxHeight: 640, ratioDim: { x: 100, y:100 }, -- cgit v1.2.3 From 59cddef032e3216d82694da6bab3eb3e8ae48203 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 14:05:35 +0200 Subject: remove padding --- view/theme/redbasic/css/style.css | 1 - 1 file changed, 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c2eccc782..449c3a22a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -409,7 +409,6 @@ footer { width: 100%; max-width: 300px; height: auto; - padding: 10px; } #profile-photo-wrapper { -- cgit v1.2.3 From 115c18353ec73c924be7ceadf8ba2a1fd24f05e3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 14:44:24 +0200 Subject: move profile image up and refine the aside width --- view/css/widgets.css | 2 +- view/theme/redbasic/css/style.css | 11 ++++++----- view/theme/redbasic/js/redbasic.js | 2 +- view/theme/redbasic/php/style.php | 2 +- view/tpl/profile_vcard.tpl | 3 +-- view/tpl/xchan_vcard.tpl | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index 0cfe98362..5b6e8aeb9 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -39,7 +39,7 @@ padding: 5px; width: 100%; resize: vertical; - height: 245px; + height: 250px; } /* saved searches */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 449c3a22a..1bfd11f6c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -412,7 +412,8 @@ footer { } #profile-photo-wrapper { - margin-top: 10px; + margin-top: -10px; + margin-bottom: 10px; } @@ -704,8 +705,8 @@ a.rateme, div.rateme { .contact-block-div { float: left; - width: 49px; - height: 49px; + width: 50px; + height: 50px; } .contact-block-textdiv { float: left; @@ -720,8 +721,8 @@ a.rateme, div.rateme { float: left; } .contact-block-img { - width:47px; - height:47px; + width:48px; + height:48px; } #tag-remove { diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 9408f5a6c..ef3fa455c 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,7 +7,7 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 279 ); + $('main').css('width', $(window).width() + 284 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 64ddcce7e..8dc349994 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 279; + $aside_width = 284; // left aside and right aside are is 231px + converse width if($converse_center) { diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 2964d9c4b..9eac48c6d 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,5 +1,5 @@
- +
{{$profile.name}}
{{if $profile.edit}}
@@ -18,7 +18,6 @@
{{$profile.name}}{{if $profile.online}} {{/if}}
{{if $reddress}}
{{$profile.reddress}}
{{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} -
{{$profile.name}}
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index ca0fe76be..2acbb24e4 100755 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -1,6 +1,6 @@
-
{{$name}}
{{$name}}
+
{{$name}}
-- cgit v1.2.3 From 08996e5b9b63efc4ca2fc29acb348b46c9e05741 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 20:54:13 +0200 Subject: fix aside width for collapsed state --- view/theme/redbasic/js/redbasic.js | 2 +- view/theme/redbasic/php/style.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index ef3fa455c..302efc365 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -7,7 +7,7 @@ $(document).ready(function() { if( $('#css3-calc').width() == 10) { $(window).resize(function() { if($(window).width() < 767) { - $('main').css('width', $(window).width() + 284 ); + $('main').css('width', $(window).width() + 285 ); } else { $('main').css('width', '100%' ); } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 8dc349994..96dba59e5 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x = file_get_contents('view/theme/redbasic/css/style.css'); - $aside_width = 284; + $aside_width = 285; // left aside and right aside are is 231px + converse width if($converse_center) { -- cgit v1.2.3 From 2b9a480c2f1060cf423471e6dc2aad0468f8c5b5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jul 2015 22:23:24 +0200 Subject: fix vcard title spacing --- view/theme/redbasic/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1bfd11f6c..321b30a43 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -347,7 +347,8 @@ footer { word-wrap: break-word; } -.vcard dl { +.vcard dl, +.vcard .title { margin-top: 10px; margin-bottom: 0px; } -- cgit v1.2.3 From e1f64b6748218dd2668e407dfe780348433d4a63 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 10:09:54 +0200 Subject: move section and aside padding from default.css to style.css --- view/css/default.css | 3 +-- view/theme/redbasic/css/style.css | 5 +++++ view/theme/redbasic/schema/focus.css | 4 ---- view/theme/redbasic/schema/focus.php | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-) (limited to 'view') diff --git a/view/css/default.css b/view/css/default.css index fb6705894..e1edc2cbf 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -17,12 +17,11 @@ main { aside { display: table-cell; vertical-align: top; - padding: 65px 7px 0px 7px; + } section { width: 100%; display: table-cell; vertical-align: top; - padding: 65px 7px 200px 7px; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 321b30a43..5b65226ca 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -28,12 +28,17 @@ aside#region_1 { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; + padding: 65px 7px 0px 7px; } main { max-width: $main_widthpx; } +section { + padding: 65px 7px 200px 7px; +} + h1, .h1, h2, .h2 { font-size: 1.667em; } diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css index 3d64b8a7d..ea983ffc8 100644 --- a/view/theme/redbasic/schema/focus.css +++ b/view/theme/redbasic/schema/focus.css @@ -16,10 +16,6 @@ background-color: #fff; } -#redbasic_converse_center_container { - display: none; -} - .wall-item-conv { padding-top: 10px; padding-left: 10px; diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php index 4186c9f64..9ffedab0d 100644 --- a/view/theme/redbasic/schema/focus.php +++ b/view/theme/redbasic/schema/focus.php @@ -61,5 +61,3 @@ else { $nav_float_min_opacity = (float) $nav_min_opacity; $nav_percent_min_opacity = (int) 100 * $nav_min_opacity; } - -$converse_center = "1"; -- cgit v1.2.3 From 7eb614c8aafc2f830479e1026e6a4924bda657cb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 11:15:05 +0200 Subject: schema focus: refine content width to be more in balance with the recent aside width --- view/theme/redbasic/schema/focus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php index 9ffedab0d..1f1963764 100644 --- a/view/theme/redbasic/schema/focus.php +++ b/view/theme/redbasic/schema/focus.php @@ -46,7 +46,7 @@ if (! $radius) if (! $shadow) $shadow = "0"; if (! $converse_width) - $converse_width = "656"; + $converse_width = "790"; if(! $top_photo) $top_photo = '48px'; if(! $comment_indent) -- cgit v1.2.3 From 1554b5a2eea889284ed2e13111d72029dfc96963 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 12:46:20 +0200 Subject: add generic content wrapper to post/webpage editor and make editpost render correctly --- view/theme/redbasic/css/style.css | 4 ++-- view/tpl/edpost_head.tpl | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5b65226ca..b2d52c8a6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1594,8 +1594,8 @@ img.mail-list-sender-photo { } .jothidden > input { - border: 1px solid $bgcolour; - background-color: $bgcolour; + border: 1px solid transparent; + background-color: transparent; } .jothidden > input:hover, .jothidden > input:focus { diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index 20e597909..3be40e978 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,12 +1,14 @@ -
- {{if $delete}} -
-  {{$delete}} +
+
+ {{if $delete}} +
+  {{$delete}} +
+ {{/if}} +

{{$title}}

+
+
+
+ {{$editor}}
- {{/if}} -

{{$title}}

-
-
-
- {{$editor}}
-- cgit v1.2.3 From fee607db56f9e87320ce2644ba61ca49266ea7ab Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:16:45 +0200 Subject: more webpages - generic-content-wrapper fixes --- view/tpl/menuedit.tpl | 4 +++ view/tpl/mitemedit.tpl | 71 +++++++++++++++++++++++++++----------------------- view/tpl/mitemlist.tpl | 61 +++++++++++++++++++++---------------------- 3 files changed, 72 insertions(+), 64 deletions(-) (limited to 'view') diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 7fc17471c..0e5df2c47 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -1,4 +1,5 @@ {{if $header}} +
{{if $menu_id}}
@@ -27,3 +28,6 @@
+{{if $header}} +
+{{/if}} diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index cdc022c5c..8715d6391 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -1,37 +1,42 @@ {{if $header}} -
-

{{$header}}

-
+
+
+

{{$header}}

+
{{/if}} -
-
- - {{if $mitem_id}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_desc}} - {{include file="field_input.tpl" field=$mitem_link}} - {{if $menu_names}} - - {{foreach $menu_names as $menu_name}} - - {{/if}} - {{include file="field_input.tpl" field=$mitem_order}} - {{include file="field_checkbox.tpl" field=$usezid}} - {{include file="field_checkbox.tpl" field=$newwin}} -
-
- - {{if $submit_more}} - - {{/if}} - +
+ + + {{if $mitem_id}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_desc}} + {{include file="field_input.tpl" field=$mitem_link}} + {{if $menu_names}} + + {{foreach $menu_names as $menu_name}} + + {{/if}} + {{include file="field_input.tpl" field=$mitem_order}} + {{include file="field_checkbox.tpl" field=$usezid}} + {{include file="field_checkbox.tpl" field=$newwin}} +
+
+ + {{if $submit_more}} + + {{/if}} + +
+ {{$aclselect}}
- {{$aclselect}} -
- +
+ +
+{{if $header}}
+{{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 4e606654f..8686d4204 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -1,35 +1,34 @@ -
-
- +
+
+
+ +
+

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

+
-

{{$title}} {{if $menudesc}}{{$menudesc}}{{else}}{{$menuname}}{{/if}}

-
-
-{{$create}} + {{$create}} -{{if $mlist }} -
- - - - - - - - - {{foreach $mlist as $m }} - - - - - - - - {{/foreach}} -
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+ {{if $mlist }} +
+ + + + + + + + + {{foreach $mlist as $m }} + + + + + + + + {{/foreach}} +
{{$nametitle}}{{$targettitle}}
{{$m.mitem_desc}}{{$m.mitem_link}}{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}{{/if}}
+
+ {{/if}}
-{{/if}} - - - -- cgit v1.2.3 From ebb07de7883b5b94b1fb10b3adf0b5370afc40f3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:25:50 +0200 Subject: re-enable selected/active class --- view/theme/redbasic/css/style.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index b2d52c8a6..1efa64b6d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -269,12 +269,11 @@ footer { } /*TODO: we should use one class for all this. */ -/* + .group-selected, .fileas-selected, .categories-selected, .search-selected, .active { - color: #444 !important; - text-decoration: none !important; + color: $font_colour; } -*/ + .fileas-all { text-decoration: none !important; -- cgit v1.2.3 From 39d68bf7c73d15062ec9807b4be669910a03f54c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:34:36 +0200 Subject: do not change selected/active class color on hover --- view/theme/redbasic/css/style.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1efa64b6d..0bb5a928f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -270,7 +270,16 @@ footer { /*TODO: we should use one class for all this. */ -.group-selected, .fileas-selected, .categories-selected, .search-selected, .active { +.group-selected, +.fileas-selected, +.categories-selected, +.search-selected, +.active, +.group-selected:hover, +.fileas-selected:hover, +.categories-selected:hover, +.search-selected:hover, +.active:hover { color: $font_colour; } -- cgit v1.2.3 From 071a233fb8aa427ae0637cda1ca0b47631d6b521 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 10 Jul 2015 13:44:23 +0200 Subject: css fixes --- view/theme/redbasic/css/style.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0bb5a928f..a44cf331c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -28,7 +28,7 @@ aside#region_1 { width: $aside_widthpx; min-width: $aside_widthpx; max-width: $aside_widthpx; - padding: 65px 7px 0px 7px; + padding: 80px 7px 0px 7px; } main { @@ -36,7 +36,7 @@ main { } section { - padding: 65px 7px 200px 7px; + padding: 80px 7px 200px 7px; } h1, .h1, h2, .h2 { @@ -2124,9 +2124,15 @@ nav .badge.mail-update:hover { } @media screen and (max-width: 767px) { + + section { + padding: 65px 7px 200px 7px; + } + aside#region_1 { background: rgba(0, 0, 0, .1); border-right: 1px solid $nav_bd; + padding: 65px 7px 0px 7px; } main { -- cgit v1.2.3