}
}
-.event_label {
- @extend .label;
- background-color: #999;
-
- &.pushed {
- background-color: #4A97BD;
- }
-
- &.opened {
- background-color: #469847;
- }
-
- &.closed {
- background-color: #B94A48;
- }
-
- &.merged {
- background-color: #2A2;
- }
-
- &.joined {
- background-color: #1ca9dd;
- }
-
- &.left {
- background-color: #888;
- float:none;
- }
-}
-
form {
@extend .form-horizontal;
border:2px solid #ddd;
}
-.event_feed {
- min-height:40px;
- border-bottom:1px solid #ddd;
- .avatar {
- width:32px;
- }
- .event_icon {
- float:right;
- margin-right:2px;
- img {
- width:20px;
- }
- }
- ul {
- margin-left:50px;
- margin-bottom:5px;
- .avatar {
- width:24px;
- }
- }
-
- padding: 15px 5px;
- &:last-child { border:none }
- .wll:hover { background:none }
-
- .event_commits {
- margin-top: 5px;
-
- li.commit {
- background: transparent;
- padding:5px;
- border:none;
- }
- }
-}
.ico {
background: url("images.png") no-repeat -85px -77px;
background:#fff;
}
-/**
- * Push event widget
- *
- */
-.event_lp {
- @extend .ui-box;
- color:#777;
- margin-bottom:20px;
- padding:8px;
- @include border-radius(4px);
- min-height:22px;
-
- .avatar {
- width:24px;
- }
-}
.supp_diff_link,
.mr_show_all_commits {
/** LISTS **/
-ul {
+ul {
/**
* List li block element #1
*
.author { color: #999; }
p {
- padding-top:5px;
+ padding-top:5px;
margin:0;
color:#222;
img {
@import "sections/projects.scss";
@import "sections/merge_requests.scss";
@import "sections/graph.scss";
+@import "sections/events.scss";
/**
* This scss file redefine chozen selectbox styles for
.commit-box {
@extend .main_box;
- .commit-head {
+ .commit-head {
@extend .top_box_content;
.commit-title {
.sha-block {
text-align:right;
- &:first-child {
+ &:first-child {
padding-bottom:6px;
}
- a {
+ a {
border-bottom: 1px solid #aaa;
margin-left: 9px;
}
}
/**
- *
+ *
* COMMIT SHOw
*
*/
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
- span {
+ span {
font-size:14px;
}
}
}
}
- &.img_compared {
- img {
+ &.img_compared {
+ img {
max-width:300px;
}
}
}
.diff_file_content{
- table {
+ table {
border:none;
margin:0px;
padding:0px;
tr {
- td {
+ td {
font-size:12px;
}
}
moz-user-select: none;
-khtml-user-select: none;
user-select: none;
- a {
+ a {
float:left;
width:35px;
font-weight:normal;
color:#666;
- &:hover {
+ &:hover {
text-decoration:underline;
}
}
}
- .line_content {
- white-space:pre;
+ .line_content {
+ white-space:pre;
height:14px;
margin:0px;
padding:0px;
border:none;
- &.new {
+ &.new {
background: #CFD;
}
- &.old {
+ &.old {
background: #FDD;
}
- &.matched {
+ &.matched {
color:#ccc;
background:#fafafa;
}
/** COMMIT ROW **/
-.commit {
+.commit {
@extend .wll;
- .browse_code_link_holder {
+ .browse_code_link_holder {
@extend .span2;
float:right;
}
- .committed_ago {
+ .committed_ago {
float:right;
@extend .cgray;
}
- code {
+ code {
background:#FCEEC1;
color:$style_color;
}
- .commit_short_id {
+ .commit_short_id {
float:left;
@extend .lined;
min-width:65px;
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
}
-
- .commit-author-name {
+
+ .commit-author-name {
color: #777;
}
}
--- /dev/null
+/**
+ * Events labels
+ *
+ */
+.event_label {
+ /*@extend .label;*/
+ /*background-color: #999;*/
+
+ /*&.pushed {*/
+ /*background-color: #4A97BD;*/
+ /*}*/
+
+ /*&.opened {*/
+ /*background-color: #469847;*/
+ /*}*/
+
+ /*&.closed {*/
+ /*background-color: #B94A48;*/
+ /*}*/
+
+ /*&.merged {*/
+ /*background-color: #2A2;*/
+ /*}*/
+
+ /*&.joined {*/
+ /*background-color: #1ca9dd;*/
+ /*}*/
+
+ /*&.left {*/
+ /*background-color: #888;*/
+ /*float:none;*/
+ /*}*/
+}
+
+/**
+ * Dashboard events feed
+ *
+ */
+.event-item {
+ min-height:40px;
+ border-bottom:1px solid #eee;
+ .event-title {
+ color:#333;
+ font-weight: bold;
+ .author_name {
+ color:#777;
+ }
+ }
+ .event-body {
+ p {
+ color:#666;
+ }
+ }
+ .avatar {
+ width:32px;
+ }
+ .event_icon {
+ float: right;
+ border: 1px solid #EEE;
+ padding: 5px;
+ @include border-radius(5px);
+ background: #F9F9F9;
+ img {
+ width:20px;
+ }
+ }
+ ul {
+ margin-left:50px;
+ margin-bottom:5px;
+ .avatar {
+ width:22px;
+ }
+ }
+
+ padding: 15px 5px;
+ &:last-child { border:none }
+ .wll:hover { background:none }
+
+ .event_commits {
+ margin-top: 5px;
+
+ li.commit {
+ background: transparent;
+ padding:5px;
+ border:none;
+ }
+ }
+}
+
+/**
+ * Push event widget
+ *
+ */
+.event_lp {
+ @extend .ui-box;
+ color:#777;
+ margin-bottom:20px;
+ padding:8px;
+ @include border-radius(4px);
+ min-height:22px;
+
+ .avatar {
+ width:24px;
+ }
+}
%li.commit
%p
= link_to commit.short_id(8), project_commit_path(project, id: commit.id), class: "commit_short_id"
- %strong.cdark= commit.author_name
+ %span= commit.author_name
–
= image_tag gravatar_icon(commit.author_email), class: "avatar", width: 16
= gfm escape_once(truncate(commit.title, length: 50)) rescue "--broken encoding"
- if event.allowed?
- - if event.issue?
- .event_feed
+ %div.event-item
+ - if event.issue?
= render "events/event_issue", event: event
- - elsif event.merge_request?
- .event_feed
+ - elsif event.merge_request?
= render "events/event_merge_request", event: event
- - elsif event.push?
- .event_feed
+ - elsif event.push?
= render "events/event_push", event: event
- - elsif event.membership_changed?
- .event_feed
+ - elsif event.membership_changed?
= render "events/event_membership_changed", event: event
+ %span.cgray.right
+ = time_ago_in_words(event.created_at)
+ ago.
+ .clearfix
= image_tag gravatar_icon(event.author_email), class: "avatar"
-%strong #{event.author_name}
-%span.event_label{class: event.action_name}= event.action_name
-issue
-= link_to project_issue_path(event.project, event.issue) do
- %strong= truncate event.issue_title
-at
-%strong= link_to event.project.name, event.project
-%span.cgray
- = time_ago_in_words(event.created_at)
- ago.
+.event-title
+ %strong.author_name #{event.author_name}
+ %span.event_label{class: event.action_name}= event.action_name
+ issue
+ = link_to project_issue_path(event.project, event.issue) do
+ %strong= truncate event.issue_title
+ at
+ %strong= link_to event.project.name, event.project
= image_tag gravatar_icon(event.author_email), class: "avatar"
-%strong #{event.author_name}
-%span.event_label{class: event.action_name}= event.action_name
-project
-%strong= link_to event.project_name, event.project
-%span.cgray
- = time_ago_in_words(event.created_at)
- ago.
+.event-title
+ %strong.author_name #{event.author_name}
+ %span.event_label{class: event.action_name}= event.action_name
+ project
+ %strong= link_to event.project_name, event.project
+ %span.cgray
+ = time_ago_in_words(event.created_at)
+ ago.
- if event.action_name == "merged"
.event_icon= image_tag "event_mr_merged.png"
= image_tag gravatar_icon(event.author_email), class: "avatar"
-%strong #{event.author_name}
-%span.event_label{class: event.action_name}= event.action_name
-merge request
-= link_to project_merge_request_path(event.project, event.merge_request) do
- %strong= truncate event.merge_request_title
-at
-%strong= link_to event.project.name, event.project
-%span.cgray
- = time_ago_in_words(event.created_at)
- ago.
-%br
-%span= event.merge_request.source_branch
-→
-%span= event.merge_request.target_branch
+.event-title
+ %strong.author_name #{event.author_name}
+ %span.event_label{class: event.action_name}= event.action_name
+ merge request
+ = link_to project_merge_request_path(event.project, event.merge_request) do
+ %strong= truncate event.merge_request_title
+ at
+ %strong= link_to event.project.name, event.project
+.event-body
+ %span= event.merge_request.source_branch
+ →
+ %span= event.merge_request.target_branch
%div
.event_icon= image_tag "event_push.png"
= image_tag gravatar_icon(event.author_email), class: "avatar"
- %strong #{event.author_name}
- %span.event_label.pushed= event.push_action_name
- = event.ref_type
- = link_to project_commits_path(event.project, ref: event.ref_name) do
- %strong= event.ref_name
- at
- %strong= link_to event.project.name, event.project
- %span.cgray
- = time_ago_in_words(event.created_at)
- ago.
+
+ .event-title
+ %strong.author_name #{event.author_name}
+ %span.event_label.pushed= event.push_action_name
+ = event.ref_type
+ = link_to project_commits_path(event.project, ref: event.ref_name) do
+ %strong= event.ref_name
+ at
+ %strong= link_to event.project.name, event.project
+ - if event.push_with_commits?
+ - if event.commits_count > 1
+ = link_to compare_project_commits_path(event.project, from: event.parent_commit.id, to: event.last_commit.id) do
+ %strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]}
- if event.push_with_commits?
- - if event.commits_count > 1
- = link_to compare_project_commits_path(event.project, from: event.parent_commit.id, to: event.last_commit.id) do
- %strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]}
- project = event.project
- %ul.unstyled.event_commits
- - if event.commits_count > 3
- - event.commits[0...2].each do |commit|
- = render "events/commit", commit: commit, project: project
- %li
- %br
- \... and #{event.commits_count - 2} more commits
- - else
- - event.commits.each do |commit|
- = render "events/commit", commit: commit, project: project
-
+ .event-body
+ %ul.unstyled.event_commits
+ - if event.commits_count > 3
+ - event.commits[0...2].each do |commit|
+ = render "events/commit", commit: commit, project: project
+ %li
+ %br
+ \... and #{event.commits_count - 2} more commits
+ - else
+ - event.commits.each do |commit|
+ = render "events/commit", commit: commit, project: project
+ .clearfix