Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-14 17:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up CSS styles in activity timeline.

Browse Source
This commit is contained in:
takezoe
2013-08-08 03:01:09 +09:00
parent 6b49bd557f
commit 5952648fae
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/twirl/helper/activities.scala.html
View File

@@ -48,8 +48,8 @@
} }
@detailActivity(activity: model.Activity, image: String) = { @detailActivity(activity: model.Activity, image: String) = {
<div style="position: absolute; padding-top: 8px;"><img src="@assets/common/images/@image"/></div> <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
<div style="margin-left: 40px;"> <div class="activity-content">
<div class="muted small">@datetime(activity.activityDate)</div> <div class="muted small">@datetime(activity.activityDate)</div>
<div class="strong"> <div class="strong">
@avatar(activity.activityUserName, 16) @avatar(activity.activityUserName, 16)
@@ -62,8 +62,8 @@
} }
@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = { @customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
<div style="position: absolute; padding-top: 8px;"><img src="@assets/common/images/@image"/></div> <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
<div style="margin-left: 40px;"> <div class="activity-content">
<div class="muted small">@datetime(activity.activityDate)</div> <div class="muted small">@datetime(activity.activityDate)</div>
<div class="strong"> <div class="strong">
@avatar(activity.activityUserName, 16) @avatar(activity.activityUserName, 16)
@@ -74,8 +74,8 @@
} }
@simpleActivity(activity: model.Activity, image: String) = { @simpleActivity(activity: model.Activity, image: String) = {
<div style="position: absolute; padding-left: 8px;"><img src="@assets/common/images/@image"/></div> <div class="activity-icon-small"><img src="@assets/common/images/@image"/></div>
<div style="margin-left: 40px;"> <div class="activity-content">
<div> <div>
@avatar(activity.activityUserName, 16) @avatar(activity.activityUserName, 16)
@activityMessage(activity.message) @activityMessage(activity.message)

17
src/main/webapp/assets/common/css/gitbucket.css
View File

@@ -362,6 +362,23 @@ ul.nav-stacked.side-menu li.active a:hover {
-moz-border-radius-bottomleft: 0px; -moz-border-radius-bottomleft: 0px;
} }
/****************************************************************************/
/* Activity */
/****************************************************************************/
div.activity-icon-large {
position: absolute;
padding-top: 8px;
}
div.activity-icon-small {
position: absolute;
padding-left: 8px;
}
div.activity-content {
margin-left: 40px;
}
/****************************************************************************/ /****************************************************************************/
/* Repository Viewer */ /* Repository Viewer */
/****************************************************************************/ /****************************************************************************/