diff options
| -rw-r--r-- | mod/profile/views/default/profile/css.php | 56 | ||||
| -rw-r--r-- | views/default/css.php | 44 | ||||
| -rw-r--r-- | views/default/page_elements/owner_block.php | 13 |
3 files changed, 53 insertions, 60 deletions
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php index 3820ca7fd..de7c8b027 100644 --- a/mod/profile/views/default/profile/css.php +++ b/mod/profile/views/default/profile/css.php @@ -65,6 +65,11 @@ padding:15px; min-height:270px; } +#elgg_sidebar #owner_block { + background-color: white; + padding:5px; + margin-bottom:10px; +} #owner_block .owner_block_icon { float:left; padding:0; @@ -79,8 +84,14 @@ #owner_block .owner_block_contents { margin-left: 50px; } +#elgg_sidebar #owner_block .owner_block_contents { + margin-left: 34px; +} #owner_block .owner_block_contents h3 { margin-top:-4px; + border-bottom:none; + margin-bottom:0; + padding-bottom:0; } #owner_block .owner_block_contents p.profile_info { margin:0; @@ -409,48 +420,3 @@ div.usericon a.icon img { color:white !important; background:red !important; } -/* /////////////////////////////////////////////////////////////// >>>END verified */ - - - -/* -#profile_status_wrapper { - background-color:#eeeeee; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - padding:2px 4px 2px 4px; - margin:0 0 7px 0; - line-height:1.2em; - min-height:16px; - - position: relative; -} -#profile_status_wrapper.inline { - margin-top:10px; -} -.profile_status span { - display:block; - font-size:90%; - color:#666666; -} -a.status_update { - float:right; -} -div.profile_status { - z-index: 2; - position: relative; -} -#profile_status_tail { - position: absolute; - width:17px; - height:12px; - left:-11px; - bottom:-5px; - - background-image: url(<?php echo $vars['url']; ?>mod/thewire/graphics/speech_tail.png); - background-position: 0 0; - background-repeat: no-repeat; - background-color:transparent; - z-index: 1; -} -*/
\ No newline at end of file diff --git a/views/default/css.php b/views/default/css.php index 2cf91fe2f..8b5c7cab7 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -942,14 +942,14 @@ select.styled .select_option { margin:0; line-height:1.2em; } -.entity_listing_info p.entity_title { +p.entity_title { font-weight: bold; font-size: 1.1em; } -.entity_listing_info p.entity_title a { +p.entity_title a { color:#0054A7; } -.entity_listing_info p.entity_subtext { +p.entity_subtext { margin:0; padding:0; color:#666666; @@ -985,7 +985,6 @@ select.styled .select_option { } - /* *************************************** USER SETTINGS & ADMIN AREA *************************************** */ @@ -1205,6 +1204,7 @@ input[type="submit"]:hover { text-decoration:none; color:white; } +input.action_button, a.action_button { -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -1221,29 +1221,37 @@ a.action_button { text-decoration:none; text-shadow:0 1px 0 white; cursor:pointer; + -webkit-box-shadow: none; + -moz-box-shadow: none; } +input.action_button:hover, a.action_button:hover, +input.action_button:focus, a.action_button:focus { background-position:0 -15px; + background-image: url(<?php echo $vars['url']; ?>_graphics/button_background.gif); + background-repeat: repeat-x; color:#111111; text-decoration: none; + background-color:#cccccc; + border:1px solid #999999; } -a.action_button:active { +.action_button:active { background-image:none; } -a.action_button.disabled { +.action_button.disabled { color:#999999; padding:2px 7px 2px 7px; } -a.action_button.disabled:hover { +.action_button.disabled:hover { background-position:0 -15px; color:#111111; border:1px solid #999999; } -a.action_button.disabled:active { +.action_button.disabled:active { background-image:none; } -a.action_button.download { +.action_button.download { color: white; background-color:#4690d6; background-image: url(<?php echo $vars['url']; ?>_graphics/button_graduation.png); @@ -1255,11 +1263,27 @@ a.action_button.download { padding: 3px 6px 3px 6px; margin:0 0 10px 0; } -a.action_button.download:hover { +.action_button.download:hover { background: #0054a7; border-color: #0054a7; color:white; } +.action_button.small { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + width: auto; + height:8px; + padding: 4px; + font-size: 0.9em; + line-height: 0.6em; +} +.action_button.small:hover { + background-color: #4690d6; + background-image: none; + border-color: #4690d6; + color:white; + text-shadow:0 -1px 0 #999999; +} /* small round delete button */ .delete_button { width:14px; diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php index eb18a733e..04b70663a 100644 --- a/views/default/page_elements/owner_block.php +++ b/views/default/page_elements/owner_block.php @@ -15,20 +15,23 @@ $contents = ""; if(is_plugin_enabled('profile')) { // Is there a page owner? $owner = page_owner_entity(); + $location = elgg_view("output/tags",array('value' => $owner->location)); if ($owner instanceof ElggEntity) { $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny')); if ($owner instanceof ElggUser || $owner instanceof ElggGroup) { - $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>'; + $info = '<h3><a href="' . $owner->getURL() . '">' . $owner->name . '</a></h3>'; } - $display = "<div id='owner_block_icon'>" . $icon . "</div>"; - $display .= "<div id='owner_block_content'>" . $info . "</div><div class='clearfloat ownerblockline'></div>"; + $display = "<div class='owner_block_icon'>" . $icon . "</div>"; + $display .= "<div class='owner_block_contents clearfloat'>" . $info; if ($owner->briefdescription) { $desc = $owner->briefdescription; - $display .= "<div id='owner_block_desc'>" . $desc . "</div>"; + $display .= "<p class='profile_info briefdescription'>" . $desc . "</p>"; } + $display .= "<p class='profile_info location'>{$location}</p>"; + $display .= "</div>"; // close owner_block_contents - $contents .= "<div id='owner_block'>".$display."</div><div id='owner_block_bottom'></div>"; + $contents .= "<div id='owner_block' class='radius8'>".$display."</div>"; } } // Are there feeds to display? |