- | <%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar') %> |
+ <%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %> |
diff --git a/app/views/users/watch_bids.html.erb b/app/views/users/watch_bids.html.erb
index d142411ac..b12c03c10 100644
--- a/app/views/users/watch_bids.html.erb
+++ b/app/views/users/watch_bids.html.erb
@@ -23,12 +23,16 @@
<%= l(:label_bids_reward_method) %><%= bid.budget%>
<% else %>
<%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %> <%= bid.budget%> <%= l(:label_bids_credit_number) %>
- <% end %>
+ <% end %>
- | (<%= bid.biding_projects.count%>)<%= l(:label_biding_project) %> |
- (<%= bid.commit %>)<%= l(:label_responses) %> |
- (<%= bid.watcher_users.count%>)<%= l(:label_followers) %> |
+
+
+ |
+ <%= l(:label_biding_project) %>(<%=link_to bid.biding_projects.count, project_for_bid_path(bid) %>)
+ <%= l(:label_responses) %>(<%=link_to bid.commit, respond_path(bid) %>)
+ <%= l(:label_followers) %>(<%=link_to bid.watcher_users.count, respond_path(bid) %>)
+ |
|
<%= format_time bid.created_on %> |
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 394a0c5c9..4e94fb2a9 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -166,7 +166,7 @@ ul.tool li{list-style-type:none;
.font_welcome_trustie{
font-family:Impact;
font-weight: regular;
- font-size: 25px; /* modified by bai */
+ font-size: 29px;
color:#15bccf;
}
@@ -176,14 +176,11 @@ ul.tool li{list-style-type:none;
color: #5c5c5c;
}
-/*modified by bai*/
.font_welcome_tdescription{
- font-family: 宋体;
- font-weight: bold;
- font-size: 18px; /* modified by bai */
- color: #777;
+ font-family: 微软雅黑;
+ font-size: 20px;
+ color: #5c5c5c;
}
-/* end */
.font_welcome_Edescription{
font-family: Default;
@@ -191,16 +188,13 @@ ul.tool li{list-style-type:none;
color: #9a9a9a;
}
-/* modified by bai */
.font_welcome_feature{
- font-family:宋体;
+ font-family:微软雅黑;
font-weight: bold;
- font-size: 20px;
+ font-size: 16px;
color:#09b2c8;
padding-top: 50px;
}
-/* end */
-
.info_font{
padding-left: 8px;
font-family:微软雅黑;
@@ -635,9 +629,7 @@ ul.newprojects2 li{
padding: 0px 0px 0px 0px;
white-space:nowrap;
}
-
-/* modified by bai*/
-#top-menu a {color: #fff; margin-right: 20px; font-weight: bold;}
+#top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
#top-menu #loggedas
{
float: right;
@@ -1030,12 +1022,7 @@ blockquote {
margin-left: 1.4em;
margin-right: 0.4em;
font-family: 微软雅黑;
- background: url(/images/requirements/reference.jpg);
-
- /*added by bai*/
- border-radius: 5px; /*引用回复框变圆角*/
- /*end*/
-
+ background: url(/images/requirements/reference.jpg)
}
blockquote blockquote { margin-left: 0;}
@@ -1439,44 +1426,76 @@ p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
#roadmap table.progress td { height: 1.2em; }
/***** Tabs *****/
+/**
+ #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;}
+#content .tabs_new ul li {
+ width:75px;
+ float:left;
+ list-style-type:none;
+ white-space:nowrap;
+ margin-right:4px;
+ background:#fff;
+ position:relative;
+ margin-bottom:-1px;
+}
+#content .tabs_new ul li a{
+ display:block;
+ font-size: 14px;
+ text-decoration:none;
+ line-height:1.2em;
+ padding-top: 6px;
+ padding-bottom: 2px;
+ text-align: center;
+
+ border: 1px solid #15BCCF;
+ border-bottom: 0px solid #15BCCF;
+ background-color: #fff;
+ color:#999;
+ font-weight:bold;
+ border-top-left-radius:4px;
+ border-top-right-radius:4px;
+}
+ **/
#content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
-#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em;}
+#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width:2000px; border-bottom: 1px solid #15BCCF;}
#content .tabs ul li {
+
float:left;
list-style-type:none;
white-space:nowrap;
margin-right:0px;
background:#fff;
position:relative;
- margin-bottom:5px;
+ margin-bottom:-1px;
}
#content .tabs ul li a{
+
+ display:block;
font-size: 0.9em;
- text-decoration:none;
+ text-decoration: none;
line-height:1.3em;
- padding:2px 6px 2px 6px;
- border: 1px solid #ccc;
- border-bottom: 1px solid #bbbbbb;
- background-color:#DEEBF0;
- color:#999;
+ padding:2px 6px 2px 6px;
+ background-color:#fff;
+ color:#606060;
font-weight:bold;
border-top-left-radius:3px;
border-top-right-radius:3px;
}
#content .tabs ul li a:hover {
- background-color: #cacbcb;
+ background-color: #fff;
text-decoration:none;
}
#content .tabs ul li a.selected {
background-color: #fff;
- border: 1px solid #bbbbbb;
- border-bottom: 1px solid #BBBBBB;
+ border: 1px solid #15BCCF;
+
color:#111;
}
-#content .tabs ul li a.selected:hover {background-color: #E5DFC7;}
+#content .tabs ul li a.selected:hover {background-color: #E2F4FF;}
div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
@@ -1505,9 +1524,10 @@ button.tab-right {
}
/*added by young*/
/***** Settings Tabs *****/
-#content .tabs_new {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
-#content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
+#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;}
#content .tabs_new ul li {
+ width:75px;
float:left;
list-style-type:none;
white-space:nowrap;
@@ -1518,27 +1538,30 @@ button.tab-right {
}
#content .tabs_new ul li a{
display:block;
- font-size: 0.9em;
+ font-size: 14px;
text-decoration:none;
- line-height:1.3em;
- padding:4px 6px 4px 6px;
- border: 1px solid #ccc;
- border-bottom: 1px solid #bbbbbb;
- background-color: #f6f6f6;
- color:#999;
+ line-height:1.2em;
+ padding-top: 6px;
+ padding-bottom: 2px;
+ text-align: center;
+
+ border: 1px solid #15BCCF;
+ /*border-bottom: 0px solid #15BCCF;*/
+ background-color: #fff;
+ color:#606060;
font-weight:bold;
- border-top-left-radius:3px;
- border-top-right-radius:3px;
+ border-top-left-radius:4px;
+ border-top-right-radius:4px;
}
#content .tabs_new ul li a:hover {
- background-color: #cacbcb;
+ background-color: #E2F4FF;
text-decoration:none;
}
#content .tabs_new ul li a.selected {
background-color: #fff;
- border: 1px solid #bbbbbb;
+ border: 1px solid #15BCCF;
border-bottom: 1px solid #fff;
color:#111;
}
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index e8b8cf01d..a718012a7 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -367,13 +367,13 @@ ul.projects li.root
{
background-color:#fff; /*顶层导航颜色*/
color: #fff;
- font-size:13px; /* modified by bai*/
- font-family: 宋体;
+ font-size:15px;
+ font-family: 微软雅黑;
position:relative;
padding:0;
height:1px;
padding-top:0;
- /* modified by bai*/
+ /*by bai*/
border-radius: 5px;/*导航栏边角变圆*/
/*end*/
}
@@ -431,7 +431,7 @@ ul.projects li.root
{
width:680px;
float:right;
- background-color: #FFFFFF
+ background-color: #FFFFFF;
}
#content .wiki img
@@ -1001,7 +1001,7 @@ input[type="submit"]
font-family:Arial,Helvetica,sans-serif;
font-size:13px;
color:#050505;
- padding:2px 7px;/*modified by ming*/
+ padding:5px 10px;
background:-moz-linear-gradient(top,#fff 0%,#ebebeb 50%,#dbdbdb 50%,#b5b5b5);
background:-webkit-gradient(linear,left top,left bottom,from(#fff),color-stop(0.50,#ebebeb),color-stop(0.50,#dbdbdb),to(#b5b5b5));
-moz-border-radius:4px;
@@ -1013,7 +1013,6 @@ input[type="submit"]
box-shadow:0 1px 3px rgba(000,000,000,0.2),inset 0 0 2px rgba(255,255,255,1);
text-shadow:0 -1px 0 rgba(000,000,000,0.2),0 1px 0 rgba(255,255,255,1);
cursor:pointer
-
}
html > body #content
@@ -1339,7 +1338,7 @@ div.pagination {
margin: 25px 0px;
height: 36px;
text-align: left;
- font-size: 11px; /* bai */
+ font-size: 13px;
}
div.pagination ul {
@@ -1740,7 +1739,6 @@ input[type='text'].noline {
padding: 9px 5px;
width: 98%;
cursor: text;
- border-radius: 4px; /* added by bai */
}
.grayline{
border: #d5dee9 1px solid;