diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 40dcd5a94..d4eca890b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -845,9 +845,9 @@ zh: label_user_commits: "代码提交" label_user_watchered: "关注" # huang添加的 label_user_newfeedback: "留言" ## huang添加的 - label_user_login: "最后登录:" - label_user_mail: "邮件地址:" - label_user_joinin: "加入时间:" + label_user_login: "最后登录" + label_user_mail: "邮件地址" + label_user_joinin: "加入时间" label_user_activities: 您没有关注该用户,请尝试重新输入! label_user_activities_other: 该用户暂无任何动态! label_project_overview: "概述" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 066986e36..176430c5a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -9,24 +9,121 @@ h4, .wiki h3 {font-size: 13px;} h4 {border-bottom: 1px dotted #bbb;} /*huang*/ /*current position*/ +.top-content{ + background-color: #f7f7f7; + height: 56px; + width: 940px; + line-height: 1.2em; + padding-top: 6px; + margin-bottom: 10px; +} + div.position-f{ + padding-left: 8px; float: left; - width: width: 238px; - line-height: 1em; + width: 238px; + line-height: 0.5em; + vertical-align: middle; + alignment-adjust: middle; + alignment-adjust: middle; +} + +div.position-f p.font{ + font-family: 微软雅黑; + font-weight: bold; + font-size: 16px; + color: #15bccf; } div.position-s{ float: left; - width: width: 430px; - line-height: 1em; + width: 430px; + line-height: 0.5em; +} + +div.position-s p.font{ + color: #15bccf; + font-weight: bold; } div.position-t{ + padding-top: 13px; float: left; width: width: 238px; - line-height: 1em; + line-height: 0.5em; } + /*end current position*/ +/*new sidebar*/ +div.sidebar-user{ + float: left; + padding-left: 8px; + border-bottom: 1px solid #15bccf; +} + +.inf-user-image{ + padding-left:8px; + margin:0px; + background-color:#fff; + height: auto; + padding-bottom: 8px; + float: left; +} +.inf-user-image img.avatar2{ + background: rgb(245, 245, 245); + padding: 4px; + border: 1px solid #e5dfc7; + float: left; + display: block; + height:80px; + width: 80px; + +} + +.sidebar-f{ + width: 238px; + float: left; + margin:0px; + background-color:#fff; + height: auto; + padding-bottom: 8px; +} + +div.sidebar-f div.name{ + float: left; + padding-left: 8px; + font-family:微软雅黑; + font-weight:bold; + font-size:16px; + color:#4d4d4d; + word-wrap: break-word; + word-break: break-all; +} + +div.sidebar-f p.watch{ + padding-left: 3px; +} + +div.sidebar-s{ + line-height: 1em; +} + +div.sidebar-s p.mail{ + width: 220px; + white-space: nowrap; + white-space: nowrap; + overflow: hidden; +} + +div.sidebar-s p.location{ + word-wrap: break-word; + word-break: break-all; +} + +div.sidebar-t{ + +} +/**/ /*forums-index*/ div.forums-index{ padding-left: 10px; @@ -243,15 +340,6 @@ span.forums-avatar-right{ width: 180px; color: #15bccf; } - -.top-content{ - background-color: #f7f7f7; - height: 52px; - width: 940px; - line-height: 1.2em; - padding-top: 6px; - margin-bottom: 10px; -} .top-content-list{ width: 430px; @@ -508,6 +596,24 @@ ul.tool li{list-style-type:none; text-justify: inter-ideograph; } +.inf_user_image{ + padding-left:8px; + margin:0px; + background-color:#fff; + height: auto; + padding-bottom: 8px; +} +.inf_user_image img.avatar2{ + background: rgb(245, 245, 245); + padding: 4px; + border: 1px solid #e5dfc7; + float: left; + display: block; + height:80px; + width: 80px; + +} + .font_welcome_tdescription2{ font-family: Arial, Helvetica, sans-serif; font-size: 20px; @@ -639,23 +745,7 @@ ul.tool li{list-style-type:none; height: 220px; background-color:#bababa; }*/ -.inf_user_image{ - padding-left:8px; - margin:0px; - background-color:#fff; - height: auto; - padding-bottom: 8px; -} -.inf_user_image img.avatar2{ - background: rgb(245, 245, 245); - padding: 4px; - border: 1px solid #e5dfc7; - float: left; - display: block; - height:80px; - width: 80px; - -} + .user_fans{ padding-left:0px; margin:0px; @@ -1935,7 +2025,7 @@ button.tab-right { #content .tabs_new {height: 2.6em; margin-bottom:1.2em; margin-top: 0.8em; position:relative; overflow:hidden;} #content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left: 0.5em; width: 2000px; border-bottom: 1px solid #15BCCF;font-size:14px;} #content .tabs_new ul li { - width:85px; /*modified by linchun*/ + width:80px; /*modified by linchun*/ float:left; list-style-type:none; white-space:nowrap; diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 9b74d1248..eac4b1436 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1399,6 +1399,7 @@ img.avatar { left: 16px; margin-bottom: -15px; display:block; + padding-left: 50px; } div.nomargin { @@ -1869,9 +1870,9 @@ input[type='text'].noline { font-size: 12px; color: #818283; # modified by bai padding: 9px 5px; - width: 98%; + width: 85%; cursor: text; - border-radius: 4px; # added by bai (边框变圆润) + border-radius: 4px; /*# added by bai (边框变圆润)*/ } a.reference { font-size: 22px;