-- cgit v1.2.3 From a077e63fa58992fe04eeb7f5aa9a865985fa1039 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Thu, 10 May 2012 02:27:48 -0400 Subject: don't make -desc so obnoxious looking Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 7 ++++--- view/theme/dispy/dark/style.less | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 7582c9add..169a00398 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -48,7 +48,7 @@ h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638e .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} -[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;margin:3px 10px 7px 0;padding:6px 7px;font-weight:bold;font-size:smaller;} +[class$="-desc"],[id$="-desc"]{color:#2e2f2e;background:#eeeecc;margin:3px 10px 7px 0;padding:6px 7px;font-weight:bold;font-size:smaller;} #asidemain .field{overflow:hidden;width:200px;} #login-extra-links{overflow:auto !important;padding-top:60px !important;width:100% !important;}#login-extra-links a{margin-right:20px;} #login_standard{display:block !important;float:none !important;height:100% !important;position:relative !important;width:100% !important;}#login_standard .field label{width:200px !important;} @@ -279,11 +279,12 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .mail-conv-subject{clear:right;font-weight:bold;font-size:1.2em;} .mail-conv-body{clear:both;} .mail-conv-delete-wrapper{margin-top:5px;} -.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} +.view-contact-wrapper,.contact-entry-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:135px;padding:3px;position:relative;} .contact-direction-wrapper{position:absolute;top:20px;} .contact-edit-links{position:absolute;top:60px;} .contact-entry-photo{margin-left:20px;} -.contact-entry-name{width:120px;font-weight:bold;} +.contact-entry-name{width:120px;font-weight:bold;font-size:small;} +.contact-entry-details{font-size:x-small;} .contact-entry-photo{position:relative;} .contact-entry-edit-links .icon{border:1px solid #babdb6;-o-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius:3px;-ms-border-radius:3px;border-radius:3px;background-color:white;} #contact-entry-url,[id^="contact-entry-url"],#contact-entry-network,[id^="contact-entry-network"]{font-size:smaller;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index f48a77e27..caa45918c 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -268,8 +268,8 @@ h4, h5, h6 { [class$="-desc"], [id$="-desc"] { color: @bg_colour; background: @main_colour; - .rounded_corners; - .box_shadow(3px, 3px, 5px); + // .rounded_corners; + // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; padding: 6px 7px; font-weight: bold; @@ -1736,10 +1736,11 @@ div { /** * contacts */ -.view-contact-wrapper, .contact-entry-wrapper { +.view-contact-wrapper, +.contact-entry-wrapper { float: left; margin: 0 5px 40px 0; - .box(120px, 120px); + .box(120px, 135px); padding: 3px; position: relative; } @@ -1759,6 +1760,10 @@ div { .contact-entry-name { width: 120px; font-weight: bold; + font-size: small; +} +.contact-entry-details { + font-size: x-small; } .contact-entry-photo { position: relative; -- cgit v1.2.3 From 69b43582d07d90536030c780b8c85db2ef789ee4 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Thu, 10 May 2012 09:54:16 +0200 Subject: diabook-theme: some css/bug-fixes --- view/theme/diabook/admin_site.tpl | 3 +++ view/theme/diabook/bottom.tpl | 2 ++ view/theme/diabook/diabook-aerith/style-wide.css | 5 ++--- view/theme/diabook/diabook-aerith/style.css | 5 ++--- view/theme/diabook/diabook-blue/style-wide.css | 5 ++--- view/theme/diabook/diabook-blue/style.css | 5 ++--- view/theme/diabook/diabook-dark/style-wide.css | 5 ++--- view/theme/diabook/diabook-dark/style.css | 5 ++--- view/theme/diabook/diabook-green/style-wide.css | 5 ++--- view/theme/diabook/diabook-green/style.css | 5 ++--- view/theme/diabook/diabook-pink/style-wide.css | 5 ++--- view/theme/diabook/diabook-pink/style.css | 5 ++--- view/theme/diabook/diabook-red/style-wide.css | 6 ++---- view/theme/diabook/diabook-red/style.css | 6 ++---- view/theme/diabook/nav.tpl | 2 +- view/theme/diabook/style-wide.css | 4 +--- view/theme/diabook/style.css | 4 +--- view/theme/diabook/theme.php | 8 ++++---- 18 files changed, 36 insertions(+), 49 deletions(-) diff --git a/view/theme/diabook/admin_site.tpl b/view/theme/diabook/admin_site.tpl index dd89b81a9..346934b70 100644 --- a/view/theme/diabook/admin_site.tpl +++ b/view/theme/diabook/admin_site.tpl @@ -49,6 +49,9 @@ {{ inc field_input.tpl with $field=$proxy }}{{ endinc }} {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} + {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} + {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl index 02ad1dcd2..081199360 100644 --- a/view/theme/diabook/bottom.tpl +++ b/view/theme/diabook/bottom.tpl @@ -67,12 +67,14 @@ $(document).ready(function() { $("a#top").attr("id","down"); $("a#down").attr("onclick","scrolldown()"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png"); + $("img#scroll_top_bottom").attr("title","Scroll to bottom"); } if (scrollInfo > "900"){ $("a#down").attr("id","top"); $("a#top").attr("onclick","scrolltop()"); $("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png"); + $("img#scroll_top_bottom").attr("title","Back to top"); } }); diff --git a/view/theme/diabook/diabook-aerith/style-wide.css b/view/theme/diabook/diabook-aerith/style-wide.css index 5c263154f..43c0974b1 100644 --- a/view/theme/diabook/diabook-aerith/style-wide.css +++ b/view/theme/diabook/diabook-aerith/style-wide.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -621,9 +622,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-aerith/style.css b/view/theme/diabook/diabook-aerith/style.css index e0f38aff6..b512c8bfe 100644 --- a/view/theme/diabook/diabook-aerith/style.css +++ b/view/theme/diabook/diabook-aerith/style.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -621,9 +622,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-blue/style-wide.css b/view/theme/diabook/diabook-blue/style-wide.css index 189f4d559..103047f32 100644 --- a/view/theme/diabook/diabook-blue/style-wide.css +++ b/view/theme/diabook/diabook-blue/style-wide.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -607,9 +608,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css index 2b68afc6f..e7f3fd0bc 100644 --- a/view/theme/diabook/diabook-blue/style.css +++ b/view/theme/diabook/diabook-blue/style.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -607,9 +608,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css index 73d0e4c0f..3475408b2 100644 --- a/view/theme/diabook/diabook-dark/style-wide.css +++ b/view/theme/diabook/diabook-dark/style-wide.css @@ -553,6 +553,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -606,9 +607,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css index fdc4e6481..24d319f8a 100644 --- a/view/theme/diabook/diabook-dark/style.css +++ b/view/theme/diabook/diabook-dark/style.css @@ -565,6 +565,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #2e2f2e; @@ -615,9 +616,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-green/style-wide.css b/view/theme/diabook/diabook-green/style-wide.css index d98a6c325..0a9c5e35c 100644 --- a/view/theme/diabook/diabook-green/style-wide.css +++ b/view/theme/diabook/diabook-green/style-wide.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -609,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-green/style.css b/view/theme/diabook/diabook-green/style.css index 6a9d8f7d0..762310e4d 100644 --- a/view/theme/diabook/diabook-green/style.css +++ b/view/theme/diabook/diabook-green/style.css @@ -557,6 +557,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -611,9 +612,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /*color*/ /* messages */ diff --git a/view/theme/diabook/diabook-pink/style-wide.css b/view/theme/diabook/diabook-pink/style-wide.css index 849566aa0..e85c58850 100644 --- a/view/theme/diabook/diabook-pink/style-wide.css +++ b/view/theme/diabook/diabook-pink/style-wide.css @@ -555,6 +555,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -609,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-pink/style.css b/view/theme/diabook/diabook-pink/style.css index 798d73979..248e3ead0 100644 --- a/view/theme/diabook/diabook-pink/style.css +++ b/view/theme/diabook/diabook-pink/style.css @@ -557,6 +557,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -611,9 +612,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ /*color*/ diff --git a/view/theme/diabook/diabook-red/style-wide.css b/view/theme/diabook/diabook-red/style-wide.css index b9ea238e2..b068a2f5d 100644 --- a/view/theme/diabook/diabook-red/style-wide.css +++ b/view/theme/diabook/diabook-red/style-wide.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -619,10 +620,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; - margin-left: 3px; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/diabook-red/style.css b/view/theme/diabook/diabook-red/style.css index 05c802102..37e26b8b9 100644 --- a/view/theme/diabook/diabook-red/style.css +++ b/view/theme/diabook/diabook-red/style.css @@ -554,6 +554,7 @@ code { text-decoration: none; } /* popup notifications */ +div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ } div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -619,10 +620,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; - margin-left: 3px; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index f611de004..4165656bd 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -136,7 +136,7 @@ - +
$langselector
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css index cf54e5b58..64393bdff 100644 --- a/view/theme/diabook/style-wide.css +++ b/view/theme/diabook/style-wide.css @@ -610,9 +610,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 2834e76f2..736817c7b 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -611,9 +611,7 @@ header #banner #logo-img { margin-top: 3px; } header #banner #logo-text { - font-size: 20px; - position: absolute; - top: 10%; + font-size: 20px!important;position: relative!important;top: -4px!important; } /* messages */ #message-new { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 607414f17..15c0794fa 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -3,7 +3,7 @@ /* * Name: Diabook * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu - * Version: (Version: 1.026) + * Version: (Version: 1.027) * Author: */ @@ -13,7 +13,7 @@ $a = get_app(); function diabook_init(&$a) { //print diabook-version for debugging -$diabook_version = "Diabook (Version: 1.026)"; +$diabook_version = "Diabook (Version: 1.027)"; $a->page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages @@ -401,7 +401,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; // custom css if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('', $cssFile); - + //footer $tpl = get_markup_template('footer.tpl'); $a->page['footer'] .= replace_macros($tpl, array()); @@ -568,7 +568,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; if($close_pages != "1") { if(local_user()) { $page = ' -

'.t("Community Pages").'

+

'.t("Community Pages").'

    '; $pagelist = array(); -- cgit v1.2.3