From: Mikael Nordfeldth Date: Fri, 6 Jun 2014 20:11:50 +0000 (+0200) Subject: Revert "Slightly larger avatars and some box-shadow" X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=ad264b70e109f9fc6c8a9038a64fed125aee1fa6;p=quix0rs-gnu-social.git Revert "Slightly larger avatars and some box-shadow" This reverts commit 38f5038cf0ec01dbdcaa00822cd393b285a0696e. Random problems with, I assume, Chromium users. Ranted: "FUCK YOU CHROMIUM WITH VARYING FUNCTIONALITY AND CRAPPY INTEROPERABILITY THE NEW FUCKING INTERNET EXPLORER" This will be back in the future with a vengeance (patches). --- diff --git a/lib/framework.php b/lib/framework.php index ace934e62e..cc716cbdb5 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -29,9 +29,9 @@ define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); define('GNUSOCIAL_CODENAME', 'Not decided yet'); -define('AVATAR_PROFILE_SIZE', 128); -define('AVATAR_STREAM_SIZE', 64); -define('AVATAR_MINI_SIZE', 32); +define('AVATAR_PROFILE_SIZE', 96); +define('AVATAR_STREAM_SIZE', 48); +define('AVATAR_MINI_SIZE', 24); define('NOTICES_PER_PAGE', 20); define('PROFILES_PER_PAGE', 20); diff --git a/lib/groupminilist.php b/lib/groupminilist.php index d522842b74..8e3d2a70ce 100644 --- a/lib/groupminilist.php +++ b/lib/groupminilist.php @@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { require_once INSTALLDIR.'/lib/grouplist.php'; -define('GROUPS_PER_MINILIST', MINILIST_PER_PAGE); +define('GROUPS_PER_MINILIST', 8); /** * Widget to show a list of groups, good for sidebar diff --git a/lib/profilelist.php b/lib/profilelist.php index 7186a77f76..11ed8945e9 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -34,8 +34,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { require_once INSTALLDIR.'/lib/widget.php'; require_once INSTALLDIR.'/lib/peopletags.php'; -define('MINILIST_PER_PAGE', 12); - /** * Widget to show a list of profiles * diff --git a/lib/profileminilist.php b/lib/profileminilist.php index 18f7cb3c8b..049754f721 100644 --- a/lib/profileminilist.php +++ b/lib/profileminilist.php @@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { require_once INSTALLDIR.'/lib/profilelist.php'; -define('PROFILES_PER_MINILIST', MINILIST_PER_PAGE); +define('PROFILES_PER_MINILIST', 8); /** * Widget to show a list of profiles, good for sidebar diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 9330363f73..55d1e8e91a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -648,6 +648,7 @@ address .poweredby { #core .vcard .photo { display: inline; + margin-right: 11px; float: left; } @@ -659,8 +660,8 @@ address .poweredby { } #content .notice .entry-title { - margin: 2px 7px 0px 75px; - min-height: 51px; + margin: 2px 7px 0px 59px; + min-height: 35px; } .vcard .url { @@ -725,7 +726,7 @@ font-style:italic; .notice div.entry-content { clear:left; float:left; - margin-left:75px; + margin-left:59px; margin-top: 10px; } @@ -857,7 +858,7 @@ content: ":"; clear: both; float: left; width: 458px; - margin-left: 75px; + margin-left: 59px; margin-top: 10px; margin-bottom: 10px; padding-right: 2px; @@ -893,19 +894,19 @@ content: ":"; } #content .threaded-replies .notice .author .photo { - height: 48px; - width: 48px; + height: 24px; + width: 24px; top: 12px; } #content .notice .threaded-replies .notice .entry-title { - margin: 2px 7px 0px 57px; + margin: 2px 7px 0px 35px; } #content .notice .threaded-replies .notice div.entry-content { clear:left; float:left; - margin-left: 57px; + margin-left: 35px; margin-top: 6px !important; } @@ -986,7 +987,7 @@ content: ":"; } #conversation .notices .threaded-replies { - margin-left: 75px; + margin-left: 59px; background: #fafafa; } @@ -1901,7 +1902,7 @@ clear:none; .profile .entity_profile .url, .profile .entity_profile .entity_tags, .profile .entity_profile .form_subscription_edit { -margin-left:75px; +margin-left:59px; clear:none; display:block; width:auto; diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css index 20d72bddf6..cd3b46c9e0 100644 --- a/theme/neo/css/display.css +++ b/theme/neo/css/display.css @@ -346,9 +346,9 @@ h6 {font-size: 1em;} } .section .entities li { - margin-right: 4px; - margin-bottom: 4px; - width: 32px; + margin-right: 3.6px; + margin-bottom: 5px; + width: 24px; } #popular_notices .avatar { @@ -366,11 +366,7 @@ h6 {font-size: 1em;} line-height: 1.6em; } -.section .author .avatar, .notice .author .avatar { - border-radius: 5%; - box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.5); -} -.section .author .avatar { +.section .avatar { box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); } @@ -462,6 +458,10 @@ h6 {font-size: 1em;} min-width: 80px; } +#content .threaded-replies .notice .author .photo { + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + .user_in.realtime-popup .notice div.entry-content { max-width: 320px; }