From e3ecf46f78df19c34382f0873f7574fbbab5cd10 Mon Sep 17 00:00:00 2001 From: pete Date: Fri, 27 Feb 2009 17:20:25 +0000 Subject: default theme changed git-svn-id: https://code.elgg.org/elgg/trunk@2988 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css.php | 1023 ++++++++++++++++++++++------------ views/default/js/friendsPickerv1.php | 2 +- views/default/js/initialise_elgg.php | 6 +- 3 files changed, 668 insertions(+), 363 deletions(-) (limited to 'views') diff --git a/views/default/css.php b/views/default/css.php index fe6103a55..9747c51af 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -1,10 +1,10 @@ _graphics/page_back_linen.gif) repeat left 1px; } a { color: #4690d6; @@ -165,8 +165,13 @@ blockquote { padding:3px 15px; margin:0px 0 15px 0; line-height:1.3em; - background:#fdffc3; + background:#bbdaf7; border:none !important; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +blockquote p { + margin:0 0 5px 0; } /* *************************************** @@ -175,112 +180,140 @@ blockquote { #page_container { margin:0; padding:0; - background: url(_graphics/page_back_linen_shadow.gif) repeat-y center top; } #page_wrapper { - width:998px; + width:990px; margin:0 auto; padding:0; min-height: 300px; - background: #f4f4f4; - border-right: 1px solid #333333; - border-bottom: 1px solid #333333; + } #layout_header { text-align:left; width:100%; height:67px; - border-bottom:1px solid #4690d6; - background:white; + background:#dedede; } #wrapper_header { margin:0; - padding:10px 20px 20px 20px; + padding:10px 20px 20px 0px; } #wrapper_header h1 { margin:10px 0 0 0; letter-spacing: -0.03em; } #layout_canvas { - margin:0; - padding:0; + margin:0 0 20px 0; + padding:20px; min-height: 360px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background: white; + border-bottom:1px solid #cccccc; + border-right:1px solid #cccccc; } /* canvas layout: 1 column, no sidebar */ #one_column { - width:918px; - margin:20px; +/* width:928px; */ + margin:0; min-height: 360px; - background: white; - padding:20px; - border-right: 1px solid #cccccc; - border-bottom: 1px solid #cccccc; + background: #dedede; + padding:0; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } -/* canvas layout: 2 column left sidebar with boxes */ -#two_column_left_sidebar_boxes { +/* canvas layout: 2 column left sidebar */ +#two_column_left_sidebar { width:210px; - margin:20px 0 20px 20px; + margin:0 20px 0 0; min-height:360px; float:left; - background: white; + background: #e9e9e9; padding:0px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; border-bottom:1px solid #cccccc; border-right:1px solid #cccccc; } -#two_column_left_sidebar_maincontent_boxes { - width:685px; - margin:20px; +#two_column_left_sidebar_maincontent { + width:718px; + margin:0; min-height: 360px; float:left; - background: white; - padding:20px; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; + background: #dedede; + padding:0 0 5px 0; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } -/* canvas layout: 2 column left sidebar */ -#two_column_left_sidebar { + + +#two_column_left_sidebar_maincontent_boxes { + margin:0 0px 20px 20px; + padding:0 0 5px 0; + width:718px; + background: #dedede; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + float:left; +} +#two_column_left_sidebar_boxes { width:210px; - margin:20px 0 20px 20px; + margin:0px 0 20px 0px; min-height:360px; float:left; - background: white; - padding:0px; + padding:0; +} +#two_column_left_sidebar_boxes .sidebarBox { + margin:0px 0 22px 0; + background: #dedede; + padding:4px 10px 10px 10px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; border-bottom:1px solid #cccccc; border-right:1px solid #cccccc; } +#two_column_left_sidebar_boxes .sidebarBox h3 { + padding:0 0 5px 0; + font-size:1.25em; + line-height:1.2em; + color:#0054A7; +} -#two_column_left_sidebar_maincontent { - width:685px; - margin:20px; - min-height: 360px; - float:left; - background: white; - padding:20px; - border-bottom:1px solid #cccccc; - border-right:1px solid #cccccc; +.contentWrapper { + background:white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding:10px; + margin:0 10px 10px 10px; +} +span.contentIntro p { + margin:0 0 0 0; +} +.notitle { + margin-top:10px; } /* canvas layout: widgets (profile and dashboard) */ #widgets_left { - width:306px; - margin:20px; + width:303px; + margin:0 20px 20px 0; min-height:360px; padding:0; } #widgets_middle { - width:306px; - margin:20px 0 20px 0; + width:303px; + margin:0 0 20px 0; padding:0; } #widgets_right { - width:306px; - margin:20px 20px 20px 20px; + width:303px; + margin:0px 0 20px 20px; float:left; padding:0; } @@ -291,67 +324,34 @@ blockquote { text-align: left; vertical-align: top; } - -/* IE 6 fixes */ -* html #widgets_left { - height:360px; -} -* html #widgets_middle { - height:360px; -} -* html #widgets_right { - height:360px; - float:none; -} - -/* IE6 layout fixes */ +/* IE6 fixes */ +* html #widgets_right { float:none; } * html #profile_info_column_left { margin:0 10px 0 0; width:200px; } +* html #dashboard_info { width:585px; } /* IE7 */ -*:first-child+html #profile_info_column_left { - width:200px; -} -* html #two_column_left_sidebar { - width:210px; - margin:20px 10px 20px 10px; -} -* html #two_column_left_sidebar_maincontent { - width:685px; - margin:20px 10px 20px 10px; -} -* html a.toggle_customise_edit_panel { - float:none; - clear:none; - color: #4690d6; - background: white; - border:1px solid #cccccc; - padding: 5px 10px 5px 10px; - margin:20px 20px 0px 20px; - width:284px; - display:block; - text-align: left; -} -* html #dashboard_info { - width:585px; -} +*:first-child+html #profile_info_column_left { width:200px; } + + +/* *************************************** + SPOTLIGHT +*************************************** */ #layout_spotlight { + margin:20px 0 20px 0; padding:0; - margin:0; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background: white; + border-bottom:1px solid #cccccc; + border-right:1px solid #cccccc; } #wrapper_spotlight { margin:0; padding:0; height:auto; } -/* *************************************** - SPOTLIGHT -*************************************** */ -/* IE7 */ -*:first-child+html #wrapper_spotlight .collapsable_box_content { - width:958px; -} #wrapper_spotlight #spotlight_table h2 { color:#4690d6; font-size:1.25em; @@ -365,30 +365,48 @@ blockquote { } #wrapper_spotlight .collapsable_box_content { margin:0; - padding:20px 20px 10px 20px; - background: #ffffff url(_graphics/spotlight_back.gif) repeat-x left top; + padding:10px 10px 5px 10px; + background:none; min-height:60px; border:none; + border-top:1px solid #cccccc; +} +#spotlight_table { + margin:0 0 2px 0; +} +#spotlight_table .spotlightRHS { + float:right; + width:270px; + margin:0 0 0 50px; +} +/* IE7 */ +*:first-child+html #wrapper_spotlight .collapsable_box_content { + width:958px; } #layout_spotlight .collapsable_box_content p { padding:0; } #wrapper_spotlight .collapsable_box_header { - border-left: none; - border-right: none; + border: none; + background: none; } + + /* *************************************** FOOTER *************************************** */ #layout_footer { - background: url(_graphics/footer_back.gif) repeat-x left top; + background: #b6b6b6; height:80px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + margin:0 0 20px 0; } #layout_footer table { margin:0 0 0 20px; } #layout_footer a, #layout_footer p { - color:white; + color:#333333; margin:0; } #layout_footer .footer_toolbar_links { @@ -502,7 +520,7 @@ blockquote { color:#eeeeee; } #elgg_topbar_container_left img { - margin:2px 0 0 5px; + margin:0 0 0 5px; } #elgg_topbar_container_left .user_mini_avatar { border:1px solid #eeeeee; @@ -564,7 +582,7 @@ blockquote { } #searchform input.search_submit_button:hover { color:#ffffff; - background: #0054a7; + background: #4690d6; } @@ -578,7 +596,7 @@ ul.topbardropdownmenu, ul.topbardropdownmenu ul { display:inline; float:left; list-style-type: none; - z-index: 5000; + z-index: 9000; position: relative; } ul.topbardropdownmenu { @@ -616,6 +634,8 @@ ul.topbardropdownmenu ul li { /* elgg toolbar menu style */ ul.topbardropdownmenu ul { width: 150px; + top: 24px; + border-top:1px solid black; } ul.topbardropdownmenu *:hover { background-color: none; @@ -634,14 +654,11 @@ ul.topbardropdownmenu ul li.drop a { } /* IE7 fixes */ *:first-child+html #elgg_topbar_container_left a.pagelinks { - padding-bottom:6px; + } *:first-child+html ul.topbardropdownmenu li.drop a.menuitemtools { padding-bottom:6px; } -ul.topbardropdownmenu ul { - top: 25px; -} ul.topbardropdownmenu ul li a { background-color: #999999;/* menu off state color */ font-weight: bold; @@ -667,7 +684,7 @@ ul.topbardropdownmenu ul a { background:#ccffcc; color:#000000; padding:3px 10px 3px 10px; - z-index: 9999; + z-index: 8000; margin:0; position:fixed; top:30px; @@ -682,7 +699,7 @@ ul.topbardropdownmenu ul a { background:#F7DAD8; color:#000000; padding:3px 10px 3px 10px; - z-index: 9999; + z-index: 8000; margin:0; position:fixed; top:30px; @@ -712,6 +729,7 @@ ul.topbardropdownmenu ul a { .collapsable_box { margin: 0 0 20px 0; height:auto; + } /* IE6 fix */ * html .collapsable_box { @@ -719,13 +737,16 @@ ul.topbardropdownmenu ul a { } .collapsable_box_header { color: #4690d6; - background: #f5f5f5; - border-top:2px solid #4690d6; padding: 5px 10px 5px 10px; margin:0; - border-left: 1px solid #cccccc; + border-left: 1px solid white; border-right: 1px solid #cccccc; border-bottom: 1px solid #cccccc; + -moz-border-radius-topleft:8px; + -moz-border-radius-topright:8px; + -webkit-border-top-right-radius:8px; + -webkit-border-top-left-radius:8px; + background:#dedede; } .collapsable_box_header h1 { color: #0054a7; @@ -733,18 +754,27 @@ ul.topbardropdownmenu ul a { line-height: 1.2em; } .collapsable_box_content { - padding: 10px; + padding: 10px 0 10px 0; margin:0; height:auto; - background: white; - border-left: 1px solid #cccccc; + background:#dedede; + -moz-border-radius-bottomleft:8px; + -moz-border-radius-bottomright:8px; + -webkit-border-bottom-right-radius:8px; + -webkit-border-bottom-left-radius:8px; + border-left: 1px solid white; border-right: 1px solid #cccccc; border-bottom: 1px solid #cccccc; } .collapsable_box_editpanel { display: none; - background: #dedede; - padding:5px 10px 5px 10px; + background: #a8a8a8; + padding:10px 10px 5px 10px; + border-left: 1px solid white; + border-bottom: 1px solid white; +} +.collapsable_box_editpanel p { + margin:0 0 5px 0; } .collapsable_box_header a.toggle_box_contents { color: #4690d6; @@ -788,19 +818,23 @@ ul.topbardropdownmenu ul a { label { font-weight: bold; color:#333333; - font-size: 140%; + font-size: 120%; } input { font: 120% Arial, Helvetica, sans-serif; padding: 5px; border: 1px solid #cccccc; color:#666666; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; } textarea { font: 120% Arial, Helvetica, sans-serif; border: solid 1px #cccccc; padding: 5px; color:#666666; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; } textarea:focus, input[type="text"]:focus { border: solid 1px #4690d6; @@ -823,6 +857,7 @@ textarea:focus, input[type="text"]:focus { } .submit_button:hover, input[type="submit"]:hover { background: #0054a7; + border-color: #0054a7; } input[type="submit"] { @@ -873,13 +908,31 @@ input[type="submit"] { LOGIN / REGISTER *************************************** */ #login-box { - margin: 10px; + margin:0 0 10px 0; + padding:0 0 10px 0; + background: #dedede; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + width:240px; text-align:left; - padding:10px; - background: #ffffff; +} +#login-box form { + margin:0 10px 0 10px; + padding:0 10px 4px 10px; + background: white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + width:200px; +} +#login-box h2 { + color:#0054A7; + font-size:1.35em; + line-height:1.2em; + margin:0 0 0 8px; + padding:5px 5px 0 5px; } #login-box .login-textarea { - width:155px; + width:178px; } #login-box label, #register-box label { @@ -887,7 +940,7 @@ input[type="submit"] { color:gray; } #login-box p.loginbox { - margin:10px 0 0 0; + margin:0; } #login-box input[type="text"], #login-box input[type="password"], @@ -895,46 +948,63 @@ input[type="submit"] { #register-box input[type="password"] { margin:0 0 10px 0; } -#login-box-openid { - margin: 10px; - text-align:left; - padding:10px; - background: #ffffff; +#register-box input[type="text"], +#register-box input[type="password"] { + width:380px; } #login-box h2, #login-box-openid h2, #register-box h2, -#add-box h2 { - background:#F5F5F5; - border-top:2px solid #4690D6; +#add-box h2, +#forgotten_box h2 { color:#0054A7; font-size:1.35em; line-height:1.2em; margin:0pt 0pt 5px; - padding:5px; } #register-box { text-align:left; - border:1px solid #ddd; width:400px; - padding:20px; - background: #ffffff; - margin:20px; + padding:10px; + background: #dedede; + margin:0; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } #persistent_login label { font-size:1.0em; font-weight: normal; } +/* login and openID boxes when not running custom_index mod */ +#two_column_left_sidebar #login-box { + width:auto; + background: none; +} +#two_column_left_sidebar #login-box form { + width:auto; + margin:10px 10px 0 10px; + padding:5px 0 5px 10px; +} +#two_column_left_sidebar #login-box h2 { + margin:0 0 0 5px; + padding:5px 5px 0 5px; +} +#two_column_left_sidebar #login-box .login-textarea { + width:158px; +} + /* *************************************** PROFILE *************************************** */ #profile_info { - margin:20px 0px 0 20px; + margin:0 0 20px 0; padding:20px; border-bottom:1px solid #cccccc; border-right:1px solid #cccccc; - background: white; + background: #e9e9e9; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } #profile_info_column_left { float:left; @@ -943,20 +1013,25 @@ input[type="submit"] { } #profile_info_column_middle { float:left; - width:368px; + width:365px; padding: 0; } #profile_info_column_right { - width:590px; + width:578px; margin:0 0 0 0; - padding: 0; + background:#dedede; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + padding:4px; } #dashboard_info { - margin:20px 0px 0 20px; + margin:0px 0px 0 0px; padding:20px; border-bottom:1px solid #cccccc; border-right:1px solid #cccccc; - background: white; + background: #bbdaf7; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } #profile_menu_wrapper { margin:10px 0 10px 0; @@ -995,8 +1070,30 @@ p.user_menu_friends_of { padding:0 0 14px 0; margin:0; } +#profile_info_column_middle .profile_status { + background:#bbdaf7; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + padding:2px 4px 2px 4px; + line-height:1.2em; +} +#profile_info_column_middle .profile_status span { + display:block; + font-size:90%; + color:#666666; +} +#profile_info_column_middle a.status_update { + float:right; +} #profile_info_column_middle .odd { - background:#f5f5f5; + background:#dedede; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; +} +#profile_info_column_middle .even { + background:#dedede; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } #profile_info_column_right p { margin:0 0 7px 0; @@ -1011,28 +1108,36 @@ p.user_menu_friends_of { float:right; margin:0 !important; padding:0 !important; - font-size: 90%; +} +.profile_info_edit_buttons a { + font: 12px/100% Arial, Helvetica, sans-serif; + font-weight: bold; + color: #ffffff; + background:#4690d6; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + width: auto; + padding: 2px 6px 2px 6px; + margin:0; + cursor: pointer; +} +.profile_info_edit_buttons a:hover { + background: #0054a7; + text-decoration: none; + color:white; } + /* *************************************** RIVER *************************************** */ -.activity_item p { - margin:0; - padding:2px 0 0 0; - line-height:1.1em; - min-height:17px; -} -.activity_item .activity_item_time { - font-size:90%; - color:#666666; -} -#river { +#river, +.river_item_list { border-top:1px solid #dddddd; } .river_item p { margin:0; - padding:2px 0 0 20px; + padding:0 0 0 21px; line-height:1.1em; min-height:17px; } @@ -1055,60 +1160,105 @@ p.user_menu_friends_of { .river_user_update { background: url(_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; } -.river_user_profileupdate { +.river_object_user_profileupdate { background: url(_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; } -.river_user_profileiconupdate { +.river_object_user_profileiconupdate { background: url(_graphics/river_icons/river_icon_profile.gif) no-repeat left -1px; } -.river_annotate { +.river_object_annotate { background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; } -.river_bookmarks_create { +.river_object_bookmarks_create { background: url(_graphics/river_icons/river_icon_bookmarks.gif) no-repeat left -1px; } -.river_status_create { +.river_object_bookmarks_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_object_status_create { background: url(_graphics/river_icons/river_icon_status.gif) no-repeat left -1px; } -.river_file_create { +.river_object_file_create { + background: url(_graphics/river_icons/river_icon_files.gif) no-repeat left -1px; +} +.river_object_file_update { background: url(_graphics/river_icons/river_icon_files.gif) no-repeat left -1px; } -.river_widget_create { +.river_object_file_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_object_widget_create { background: url(_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px; } -.river_forums_create { +.river_object_forums_create { background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; } -.river_forums_update { +.river_object_forums_update { background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; } -.river_widget_update { +.river_object_widget_update { background: url(_graphics/river_icons/river_icon_plugin.gif) no-repeat left -1px; } -.river_blog_create { +.river_object_blog_create { background: url(_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; } -.river_blog_update { +.river_object_blog_update { background: url(_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; } -.river_forumtopic_create { +.river_object_blog_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_object_forumtopic_create { background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; } -.river_relationship_friend_create { +.river_user_friend { background: url(_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px; } -.river_relationship_member_create { +.river_object_relationship_friend_create { + background: url(_graphics/river_icons/river_icon_friends.gif) no-repeat left -1px; +} +.river_object_relationship_member_create { background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; } +.river_object_thewire_create { + background: url(_graphics/river_icons/river_icon_thewire.gif) no-repeat left -1px; +} +.river_group_join { + background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +} +.river_object_groupforumtopic_annotate { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_object_groupforumtopic_create { + background: url(_graphics/river_icons/river_icon_forum.gif) no-repeat left -1px; +} +.river_object_sitemessage_create { + background: url(_graphics/river_icons/river_icon_blog.gif) no-repeat left -1px; +} +.river_user_messageboard { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} +.river_object_page_create { + background: url(_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +} +.river_object_page_top_create { + background: url(_graphics/river_icons/river_icon_pages.gif) no-repeat left -1px; +} +.river_object_page_top_comment { + background: url(_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px; +} + /* *************************************** SEARCH LISTINGS *************************************** */ .search_listing { display: block; - background-color: #eee; - padding: 5px; - margin-bottom: 10px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background:white; + margin:0 10px 5px 10px; + padding:5px; } .search_listing_icon { float:left; @@ -1138,19 +1288,21 @@ p.user_menu_friends_of { font-size: 90%; } table.search_gallery { - border-spacing: 5px; - margin:0 0 20px 0; - background: #f5f5f5; + border-spacing: 10px; + margin:0 0 0 0; } .search_gallery td { padding: 5px; } .search_gallery_item { - border:1px dotted silver; - background-color: white; + background: white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + width:170px; } .search_gallery_item:hover { - border:1px dotted black; + background: black; + color:white; } .search_gallery_item .search_listing { background: none; @@ -1193,7 +1345,12 @@ table.search_gallery { /* friends widget */ #widget_friends_list { display:table; - width:100%; + width:275px; + margin:0 10px 0 10px; + padding:8px 0 4px 8px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background:white; } .widget_friends_singlefriend { float:left; @@ -1205,8 +1362,10 @@ table.search_gallery { ADMIN AREA - PLUGIN SETTINGS *************************************** */ .plugin_details { - margin:0 0 10px 0; - padding:5px 10px 5px 10px; + margin:0 10px 5px 10px; + padding:0 7px 4px 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; } .admin_plugin_reorder { float:right; @@ -1215,35 +1374,52 @@ table.search_gallery { } .admin_plugin_reorder a { padding-left:10px; + font-size:80%; + color:#999999; +} +.plugin_details a.pluginsettings_link { + cursor:pointer; + font-size:80%; } .active { - border:1px solid #00cc00; - background:#ccffcc; + border:1px solid #999999; + background:white; } .not-active { - border:1px solid #D3322A; - background:#F7DAD8; + border:1px solid #999999; + background:#dedede; } .plugin_details p { margin:0; - padding:4px 0 0 0; + padding:0; } .plugin_details a.manifest_details { cursor:pointer; font-size:80%; } -.manifest_file { +.manifest_file { + background:#dedede; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding:5px 10px 5px 10px; + margin:4px 0 4px 0; display:none; } -.plugin_details a.pluginsettings_link { - cursor:pointer; - font-size:80%; +.admin_plugin_enable_disable { + width:150px; + margin:10px 0 0 0; + float:right; + text-align: right; } -.pluginsettings { - display:none; +.contentIntro .enableallplugins, +.contentIntro .disableallplugins { + float:right; } +.contentIntro .enableallplugins { + margin-left:10px; +} +.contentIntro .enableallplugins, .not-active .admin_plugin_enable_disable a { - float:right; font: 12px/100% Arial, Helvetica, sans-serif; font-weight: bold; color: #ffffff; @@ -1253,14 +1429,16 @@ table.search_gallery { -moz-border-radius: 4px; width: auto; padding: 4px; - margin:5px 0 0 0; cursor: pointer; } +.contentIntro .enableallplugins:hover, .not-active .admin_plugin_enable_disable a:hover { background: #0054a7; + border: 1px solid #0054a7; + text-decoration: none; } +.contentIntro .disableallplugins, .active .admin_plugin_enable_disable a { - float:right; font: 12px/100% Arial, Helvetica, sans-serif; font-weight: bold; color: #ffffff; @@ -1270,14 +1448,21 @@ table.search_gallery { -moz-border-radius: 4px; width: auto; padding: 4px; - margin:5px 0 0 0; cursor: pointer; } +.contentIntro .disableallplugins:hover, .active .admin_plugin_enable_disable a:hover { background: #333333; + border: 1px solid #333333; + text-decoration: none; } .pluginsettings { - margin:20px 0 0 0; + margin:15px 0 5px 0; + background:#bbdaf7; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding:10px; + display:none; } .pluginsettings h3 { padding:0 0 5px 0; @@ -1301,30 +1486,36 @@ table.search_gallery { color:#666666; } .generic_comment { - margin-bottom: 10px; - padding-bottom: 10px; + background:white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding:10px; + margin:0 10px 10px 10px; } .generic_comment_icon { float:left; } .generic_comment_details { margin-left: 60px; - border-bottom: 1px solid #aaaaaa; +} +.generic_comment_details p { + margin: 0 0 5px 0; } .generic_comment_owner { color:#666666; margin: 0px; font-size:90%; + border-top: 1px solid #aaaaaa; } +/* IE6 */ +* html #generic_comment_tbl { width:676px !important;} /* *************************************** PAGE-OWNER BLOCK *************************************** */ #owner_block { - background: url(_graphics/owner_block_back.jpg) no-repeat left top; padding:10px; - border-bottom:1px dashed #cccccc; } #owner_block_icon { float:left; @@ -1382,6 +1573,9 @@ table.search_gallery { min-height:35px; font-weight: bold; } +#owner_block_content a { + line-height: 1em; +} .ownerblockline { padding:0; margin:0; @@ -1399,23 +1593,27 @@ table.search_gallery { margin: 0; } #owner_block_submenu ul li.selected a { - background: url(_graphics/owner_block_menu_arrow.gif) no-repeat left 6px; - padding-left:10px; + background: #4690d6; + color:white; +} +#owner_block_submenu ul li.selected a:hover { + background: #4690d6; + color:white; } #owner_block_submenu ul li a { text-decoration: none; display: block; - padding: 0; - margin: 0; + margin: 2px 0 0 0; color:#4690d6; padding:4px 6px 4px 10px; - border-top: 1px solid #cccccc; font-weight: bold; line-height: 1.1em; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; } #owner_block_submenu ul li a:hover { color:white; - background: #4690d6; + background: #0054a7; } /* IE 6 + 7 menu arrow position fix */ @@ -1428,29 +1626,21 @@ table.search_gallery { #owner_block_submenu .submenu_group { border-bottom: 1px solid #cccccc; - margin:22px 0 0 0; + margin:10px 0 0 0; + padding-bottom: 10px; } -/* filetypes filter menu */ +#owner_block_submenu .submenu_group .submenu_group_filter ul li a, #owner_block_submenu .submenu_group .submenu_group_filetypes ul li a { color:#666666; } +#owner_block_submenu .submenu_group .submenu_group_filter ul li.selected a, #owner_block_submenu .submenu_group .submenu_group_filetypes ul li.selected a { - background: url(_graphics/owner_block_menu_dot.gif) no-repeat left 7px; -} -#owner_block_submenu .submenu_group .submenu_group_filetypes ul li a:hover { + background:#999999; color:white; - background: #999999; -} - -/* pages actions menu */ -#owner_block_submenu .submenu_group .submenu_group_pagesactions ul li a { - color:#666666; -} -#owner_block_submenu .submenu_group .submenu_group_pagesactions ul li.selected a { - background: url(_graphics/owner_block_menu_dot.gif) no-repeat left 7px; } -#owner_block_submenu .submenu_group .submenu_group_pagesactions ul li a:hover { +#owner_block_submenu .submenu_group .submenu_group_filter ul li a:hover, +#owner_block_submenu .submenu_group .submenu_group_filetypes ul li a:hover { color:white; background: #999999; } @@ -1460,7 +1650,11 @@ table.search_gallery { PAGINATION *************************************** */ .pagination { - margin:10px 0 20px 0; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background:white; + margin:5px 10px 5px 10px; + padding:5px; } .pagination .pagination_number { display:block; @@ -1474,6 +1668,8 @@ table.search_gallery { margin:0 6px 0 0; padding:0px 4px; cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } .pagination .pagination_number:hover { background:#4690d6; @@ -1491,6 +1687,8 @@ table.search_gallery { font-weight: normal; margin:0 6px 0 0; padding:0px 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } .pagination .pagination_previous, .pagination .pagination_next { @@ -1504,6 +1702,8 @@ table.search_gallery { margin:0 6px 0 0; padding:0px 4px; cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } .pagination .pagination_previous:hover, .pagination .pagination_next:hover { @@ -1523,6 +1723,8 @@ table.search_gallery { margin:0 6px 0 0; padding:0px 4px; cursor: pointer; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } @@ -1532,7 +1734,6 @@ table.search_gallery { ul#friends_collections_accordian { margin: 0 0 0 0; padding: 0; - border-bottom:1px solid #cccccc; } #friends_collections_accordian li { margin: 0 0 0 0; @@ -1541,16 +1742,17 @@ ul#friends_collections_accordian { color: #666666; } #friends_collections_accordian li h2 { - background:#efefef; - color: #999999; + background:#4690d6; + color: white; padding:4px 2px 4px 6px; - margin:0; - border-top:1px solid #cccccc; + margin:10px 0 10px 0; font-size:1.2em; cursor:pointer; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } #friends_collections_accordian li h2:hover { - background:#4690D6; + background:#333333; color:white; } #friends_collections_accordian .friends_picker { @@ -1566,24 +1768,19 @@ ul#friends_collections_accordian { color:#999999; font-weight:normal; } -div.expandall { - margin: 20px 0 0 0; - padding:0; -} -div.expandall p { - cursor:pointer; - color:#999999; - text-align:right; - margin: 0; - padding:0; -} /* *************************************** FRIENDS PICKER SLIDER *************************************** */ -.friendsPicker_container h3 { font-size:3em; text-align: left; margin:0 0 20px 0; color:#999999; } - +.friendsPicker_container h3 { + font-size:4em !important; + text-align: left; + margin:0 0 10px 0 !important; + color:#999999 !important; + background: none !important; + padding:0 !important; +} .friendsPicker .friendsPicker_container .panel ul { text-align: left; margin: 0; @@ -1600,13 +1797,18 @@ div.expandall p { overflow: hidden; margin: 0; padding:0; - width: 685px; + width: 678px; height: auto; - background: #efefef; + background: #dedede; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } .friendspicker_savebuttons { background: white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + margin:0 10px 10px 10px; } .friendsPicker .friendsPicker_container { /* long container used to house end-to-end panels. Width is calculated in JS */ position: relative; @@ -1619,14 +1821,13 @@ div.expandall p { float:left; height: 100%; position: relative; - width: 685px; + width: 678px; margin: 0; padding:0; } .friendsPicker .friendsPicker_container .panel .wrapper { margin: 0; - padding: 10px; - background: #efefef; + padding:4px 10px 10px 10px; min-height: 230px; } .friendsPickerNavigation { @@ -1651,6 +1852,8 @@ div.expandall p { display: block; padding: 0; width:20px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } .tabHasContent { background: white; color:#333333 !important; @@ -1693,11 +1896,11 @@ div.expandall p { width: 43px; } .friendsPickerNavigationL { - right: 58px; + right: 48px; z-index:1; } .friendsPickerNavigationR { - right: 10px; + right: 0; z-index:1; } .friendsPickerNavigationL { @@ -1717,52 +1920,24 @@ div.expandall p { cursor: pointer; width:14px; height:14px; - margin:0 3px 0 0; + margin:2px 3px 0 0; background: url("_graphics/icon_customise_remove.png") no-repeat 0 0; } .friends_collections_controls a.delete_collection:hover { background-position: 0 -16px; } - -/* picker tabbed navigation */ -#friendsPickerNavigationTabs { - margin:10px 0 10px 0; - padding: 0; - border-bottom: 1px solid #cccccc; - display:table; - width:100%; +.friendspicker_savebuttons .submit_button, +.friendspicker_savebuttons .cancel_button { + margin:5px 20px 5px 5px; } -#friendsPickerNavigationTabs ul { - list-style: none; - padding: 0; - margin: 0; -} -#friendsPickerNavigationTabs li { - float: left; - border: 1px solid #ffffff; - border-bottom-width: 0; - margin: 0; -} -#friendsPickerNavigationTabs a { - text-decoration: none; - display: block; - padding: 0.22em 1em; - color: #666666; - text-align: center; -} -#friendsPickerNavigationTabs a:hover { - color: #4690d6; -} -#friendsPickerNavigationTabs .selected { - border-color: #cccccc; -} -#friendsPickerNavigationTabs .selected a { - position: relative; - top: 1px; - background: white; - color: #4690d6; + +#collectionMembersTable { + background: #dedede; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + margin:10px 0 0 0; + padding:10px 10px 0 10px; } - /* *************************************** @@ -1776,20 +1951,25 @@ a.toggle_customise_edit_panel { background: white; border:1px solid #cccccc; padding: 5px 10px 5px 10px; - margin:20px 20px 0px 20px; - width:284px; + margin:0 0 20px 0; + width:280px; text-align: left; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } a.toggle_customise_edit_panel:hover { color: #ffffff; background: #0054a7; + border:1px solid #0054a7; text-decoration:none; } #customise_editpanel { display:none; - margin: 0; - padding:20px; + margin: 0 0 20px 0; + padding:10px; background: #dedede; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } /* Top area - instructions */ @@ -1833,6 +2013,8 @@ a.toggle_customise_edit_panel:hover { padding:10px; margin:0 0 10px 0; background:white; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } #customise_page_view h2 { border-top:1px solid #cccccc; @@ -1842,7 +2024,7 @@ a.toggle_customise_edit_panel:hover { padding:5px; width:200px; color: #0054a7; - background: #f5f5f5; + background: #dedede; font-size:1.25em; line-height: 1.2em; } @@ -1852,7 +2034,7 @@ a.toggle_customise_edit_panel:hover { padding:5px 5px 0px 5px; min-height: 50px; border:1px solid #cccccc; - background: #f5f5f5; + background: #dedede; } #customise_page_view h2.profile_box { width:422px; @@ -1950,7 +2132,7 @@ a.toggle_customise_edit_panel:hover { } /* droppable area hover class */ .droppable-hover { - background:#fdffc3; + background:#bbdaf7; } /* target drop area class */ .placeholder { @@ -1995,9 +2177,9 @@ a.toggle_customise_edit_panel:hover { *************************************** */ #pages_breadcrumbs { font-size: 80%; - color:#999999; + color:#bababa; padding:0; - margin:0 0 10px 0; + margin:2px 0 0 10px; } #pages_breadcrumbs a { color:#999999; @@ -2014,36 +2196,24 @@ a.toggle_customise_edit_panel:hover { *************************************** */ /* general page titles in main content area */ #content_area_user_title h2 { - background:#F5F5F5; - border-top:2px solid #4690D6; - margin:0 0 5px 0; + margin:0 0 0 8px; padding:5px; color:#0054A7; font-size:1.35em; line-height:1.2em; } +/* reusable generic collapsible box */ .collapsible_box { - background:#F5F5F5; + background:#dedede; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; padding:5px 10px 5px 10px; margin:4px 0 4px 0; display:none; } a.collapsibleboxlink { cursor:pointer; - font-size:80%; } -#sidebar_page_tree { - margin:10px; -} -#sidebar_page_tree h3 { - background:#F5F5F5; - border-top:2px solid #4690D6; - margin:0 0 5px 0; - padding:5px; - color:#0054A7; - font-size:1.25em; - line-height:1.2em; -} /* tag icon */ .object_tag_string { @@ -2087,82 +2257,142 @@ a.collapsibleboxlink { /* *************************************** SETTINGS & ADMIN *************************************** */ -.settings_form h3, +.admin_statistics, +.admin_users_online, +.usersettings_statistics, +.admin_adduser_link, +#add-box, +#search-box, +#logbrowser_search_area { + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + background:white; + margin:0 10px 10px 10px; + padding:10px; +} + .usersettings_statistics h3, .admin_statistics h3, -.admin_users_online h3 { +.admin_users_online h3, +.user_settings h3, +.notification_methods h3 { background:#e4e4e4; - border-bottom:1px solid #d0d0d0; - color:#666666; + color:#333333; font-size:1.1em; line-height:1em; - margin:30px 0 10px 0; - padding:5px; + margin:0 0 10px 0; + padding:5px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; } -.settings_form label, +h3.settings { + background:#e4e4e4; + color:#333333; + font-size:1.1em; + line-height:1em; + margin:10px 0 4px 0; + padding:5px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; +} +.admin_users_online .profile_status { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + background:#bbdaf7; + line-height:1.2em; + padding:2px 4px; +} +.admin_users_online .profile_status span { + font-size:90%; + color:#666666; +} +.admin_users_online p.owner_timestamp { + padding-left:3px; +} + + .admin_debug label, .admin_usage label { color:#333333; font-size:100%; font-weight:normal; } -.settings_form { - border-bottom:1px solid #cccccc; - padding:0 0 20px 0; -} + .admin_usage { border-bottom:1px solid #cccccc; padding:0 0 20px 0; } - .usersettings_statistics .odd, .admin_statistics .odd { - background:#f5f5f5; + } .usersettings_statistics .even, .admin_statistics .even { - background:#ffffff; + } .usersettings_statistics td, .admin_statistics td { padding:2px 4px 2px 4px; + border-bottom:1px solid #cccccc; } .usersettings_statistics td.column_one, .admin_statistics td.column_one { width:200px; } - -/* add user pane on user admin */ -#add_user_showhide #add-box { - padding:20px; - background: #dedede; +.usersettings_statistics table, +.admin_statistics table { + width:100%; } -.admin_adduser_link { - margin:0 0 20px 0; +.usersettings_statistics table, +.admin_statistics table { + border-top:1px solid #cccccc; } -#search-box { - margin:0 0 20px 0; +.usersettings_statistics table tr:hover, +.admin_statistics table tr:hover { + background: #E4E4E4; } +.admin_users_online .search_listing { + margin:0 0 5px 0; + padding:5px; + border:2px solid #cccccc; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} + + /* force tinyMCE editor initial width for safari */ .mceLayout { width:683px; } +/* add/remove longtext tinyMCE editor */ +a.toggle_editor { + display:block; + float:right; + text-align:right; + color:#666666; + font-size:1em; + font-weight:normal; +} div.ajax_loader { - background: url(_graphics/ajax_loader.gif) no-repeat top center; - width:100%; - height:33px; + background: white url(_graphics/ajax_loader.gif) no-repeat center 30px; + width:auto; + height:100px; + margin:0 10px 0 10px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; } + /* reusable elgg horizontal tabbed navigation - (used on friends collections, and external pages mod) + (used on friends collections, external pages, & riverdashboard mods) */ #elgg_horizontal_tabbed_nav { - margin:10px 0 10px 0; + margin:0 0 5px 0; padding: 0; - border-bottom: 1px solid #cccccc; + border-bottom: 2px solid #cccccc; display:table; width:100%; } @@ -2173,29 +2403,104 @@ div.ajax_loader { } #elgg_horizontal_tabbed_nav li { float: left; - border: 1px solid #ffffff; + border: 2px solid #cccccc; border-bottom-width: 0; - margin: 0; + margin: 0 0 0 10px; + -moz-border-radius-topleft:5px; + -moz-border-radius-topright:5px; + -webkit-border-top-left-radius:5px; + -webkit-border-top-right-radius:5px; } #elgg_horizontal_tabbed_nav a { text-decoration: none; display: block; - padding: 0.22em 1em; - color: #666666; + padding:3px 10px 0 10px; + color: #999999; text-align: center; + height:21px; } +/* IE6 fix */ +* html #elgg_horizontal_tabbed_nav a { display: inline; } + #elgg_horizontal_tabbed_nav a:hover { color: #4690d6; + background: #E9E9E9; } #elgg_horizontal_tabbed_nav .selected { border-color: #cccccc; } #elgg_horizontal_tabbed_nav .selected a { position: relative; - top: 1px; + top: 2px; background: white; color: #4690d6; } +/* IE6 fix */ +* html #elgg_horizontal_tabbed_nav .selected a { top: 3px; } + + +/* *************************************** + ADMIN AREA - REPORTED CONTENT +*************************************** */ +.reportedcontent_content { + margin:0 0 5px 0; + padding:0 7px 4px 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +.reportedcontent_content p.reportedcontent_detail, +.reportedcontent_content p { + margin:0; +} +.active_report { + border:1px solid #D3322A; + background:#F7DAD8; +} +.archived_report { + border:1px solid #666666; + background:#dedede; +} +a.archive_report_button { + float:right; + font: 12px/100% Arial, Helvetica, sans-serif; + font-weight: bold; + color: #ffffff; + background:#4690d6; + border: 1px solid #4690d6; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + width: auto; + padding: 4px; + margin:15px 0 0 20px; + cursor: pointer; +} +a.archive_report_button:hover { + background: #0054a7; + border: 1px solid #0054a7; + text-decoration: none; +} +a.delete_report_button { + float:right; + font: 12px/100% Arial, Helvetica, sans-serif; + font-weight: bold; + color: #ffffff; + background:#999999; + border: 1px solid #999999; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + width: auto; + padding: 4px; + margin:15px 0 0 20px; + cursor: pointer; +} +a.delete_report_button:hover { + background: #333333; + border: 1px solid #333333; + text-decoration:none; +} +.reportedcontent_content .collapsible_box { + background: white; +} diff --git a/views/default/js/friendsPickerv1.php b/views/default/js/friendsPickerv1.php index 14b8da65d..d399b35da 100644 --- a/views/default/js/friendsPickerv1.php +++ b/views/default/js/friendsPickerv1.php @@ -14,7 +14,7 @@ jQuery.fn.friendsPicker = function(iterator) { var container = $(this); container.addClass("friendsPicker"); // set panelwidth manually as it's hidden initially - adjust this value for different themes/pagewidths - var panelWidth = 685; + var panelWidth = 678; // count the panels in the container var panelCount = container.find("div.panel").size(); diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php index c5a2864f4..78cf9388d 100644 --- a/views/default/js/initialise_elgg.php +++ b/views/default/js/initialise_elgg.php @@ -16,7 +16,7 @@ $(document).ready(function () { return false; }); - // toggle plugin's settings and more info on admin tools admin + // toggle plugin's settings nad more info on admin tools admin $('a.pluginsettings_link').click(function () { $(this.parentNode.parentNode).children("[class=pluginsettings]").slideToggle("fast"); return false; @@ -252,9 +252,9 @@ $.fn.elgg_topbardropdownmenu = function(options) { $.data(subnav, 'cancelHide', false); setTimeout(function() { if (!$.data(subnav, 'cancelHide')) { - $(subnav).slideUp(options.speed); + $(subnav).slideUp(100); } - }, 200); + }, 250); } function show() { -- cgit v1.2.3