diff --git a/main/css/base.css b/main/css/base.css index 398ada2ddb..67d0bfa4c1 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -46,10 +46,6 @@ legend { padding:40px 0px 0px 0px; } -#header2 .nav{ - margin-bottom:0px; -} - /* menu dropdown fixes */ .subnav .nav .open > .dropdown-toggle, .subnav .nav .active > .dropdown-toggle, .subnav .nav .open.active > .dropdown-toggle { background-color: transparent; @@ -1809,11 +1805,6 @@ div.image-social-content center.friend { margin-bottom:10px; } -.social_user_information { - width:300px; - float:left; -} - .social-friend-container { width:100%; overflow:hidden; @@ -1839,40 +1830,6 @@ div.image-social-content center.friend { width:76px; } - -/* styles from the my.profile.php file */ -#social_widget { - margin: 0 20px; -} - -#social_widget_image { - float:left; - margin-bottom:10px; - padding:2px; -} - -/* SOCIAL BOX */ - -.social-box-main1 { - width:100%; - height:auto; - overflow:hidden; -} -.social-box-left { - width:340px; - float:left; - height:auto; - margin:0px; -} - -.social-box-right { - width:280px; - float:left; - height:auto; - margin-left:18px; - overflow:hidden; -} - .box_shared_profile_group_title { border-bottom:1pt dotted #000; padding:5px; diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index ab6a27edbf..f505c67d06 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -303,16 +303,6 @@ input.link_alike:hover { height:16px; padding-right:4%; } -/******************************************************** - * HEADER 2: Users online, help, student/teacher view * - ********************************************************/ - -#header2 a { -} -#header2 a:hover { - text-decoration: underline; -} - #current { color:#FFFFFF; cursor:pointer; @@ -2191,6 +2181,11 @@ span.form_required { /* end default subnav background colors */ } +/* fixing gray border next the logout button */ +.subnav .nav-tabs .open .dropdown-toggle, .subnav .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover { + border-color: transparent; +} + .subnav .nav { margin-bottom: 0; } diff --git a/main/css/chamilo/frames.css b/main/css/chamilo/frames.css old mode 100755 new mode 100644 index 1d1cd674eb..46d0f7044e --- a/main/css/chamilo/frames.css +++ b/main/css/chamilo/frames.css @@ -55,38 +55,6 @@ img { float: right; font-weight: bold; } -/* Header 2: Containing My Courses, My Profile,... */ -#header2 { - font-size: 12px; - padding: 4px; - background-color: #4271B5; - color: #fff; - border-bottom: 1px solid white; -} -#header2 .banner_links { - margin: 0; -} -#header2 a { - text-decoration: none; - color: #fff; - background: transparent; - font-weight:normal; - font-size: 12px; -} -#header2 input.logout { - /* makes an input appear like a link in this header */ - margin: 0; - padding: 0; - background-color: transparent; - border: none; - color: #fff; - font-size: 12px; - font-weight:normal; - font-family: verdana, arial, helvetica, sans-serif; -} -#header2 a:hover, #header2 input.logout:hover { - border-bottom: 1px solid #fff; -} #logout { float: right; width:20%; diff --git a/main/css/chamilo_green/frames.css b/main/css/chamilo_green/frames.css old mode 100755 new mode 100644 index 1d1cd674eb..bfbf3dbef6 --- a/main/css/chamilo_green/frames.css +++ b/main/css/chamilo_green/frames.css @@ -55,38 +55,7 @@ img { float: right; font-weight: bold; } -/* Header 2: Containing My Courses, My Profile,... */ -#header2 { - font-size: 12px; - padding: 4px; - background-color: #4271B5; - color: #fff; - border-bottom: 1px solid white; -} -#header2 .banner_links { - margin: 0; -} -#header2 a { - text-decoration: none; - color: #fff; - background: transparent; - font-weight:normal; - font-size: 12px; -} -#header2 input.logout { - /* makes an input appear like a link in this header */ - margin: 0; - padding: 0; - background-color: transparent; - border: none; - color: #fff; - font-size: 12px; - font-weight:normal; - font-family: verdana, arial, helvetica, sans-serif; -} -#header2 a:hover, #header2 input.logout:hover { - border-bottom: 1px solid #fff; -} + #logout { float: right; width:20%; diff --git a/main/css/responsive.css b/main/css/responsive.css index 441f188728..60bbd8ad8f 100644 --- a/main/css/responsive.css +++ b/main/css/responsive.css @@ -27,11 +27,7 @@ .notification-panel { display:none; - } - - #header2 .nav-pills { - display:none; - } + } } @media (max-width: 767px) { diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css index bf4e3610de..747173f5cf 100644 --- a/main/css/tasty_olive/default.css +++ b/main/css/tasty_olive/default.css @@ -356,20 +356,7 @@ a:active { #my_courses { float: right; } -/******************************************************** - * HEADER 2: Users online, help, student/teacher view * - ********************************************************/ -#header2 { - color: #636363;/*border: 1px solid red;*/ -} -#header2 a { - color: #636363; - text-decoration: none; - font-weight:normal; -} -#header2 a:hover { - text-decoration: underline; -} + /***************************************************** * HEADER 3: TABS OF THE HEADER * *****************************************************/ diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index 1aeff598cb..7fb8248127 100644 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -183,8 +183,7 @@ if (is_int($global_error_code) && $global_error_code > 0) { Chamilo -
-
+
'; $html = self::show_right_block(get_lang('Profile'), $profile_content); return $html; } diff --git a/main/social/home.php b/main/social/home.php index 0785525905..2ecd04f391 100644 --- a/main/social/home.php +++ b/main/social/home.php @@ -68,7 +68,7 @@ if (api_get_setting('profile', 'picture') == 'true') { $user_info = UserManager :: get_user_info_by_id(api_get_user_id()); $social_left_content = SocialManager::show_social_menu('home'); -$social_right_content .= '
'; +$social_right_content .= '
'; $social_right_content .= ''; // information current user