Commit 79b375e1 authored by Phil Hughes's avatar Phil Hughes

Updated some commit UI colors

Fixed issue with tree view styles
parent 8827eea8
...@@ -41,13 +41,17 @@ ...@@ -41,13 +41,17 @@
} }
.text-expander { .text-expander {
background: #eee; background: $gray-light;
color: #555; color: $gl-gray-dark;
padding: 0 5px; padding: 0 5px;
cursor: pointer; cursor: pointer;
margin-left: 4px; border: 1px solid $border-gray-dark;
border-radius: $border-radius-default;
margin-left: 5px;
&:hover { &:hover {
background-color: #ddd; background-color: darken($gray-light, 10%);
text-decoration: none;
} }
} }
} }
...@@ -55,6 +59,7 @@ ...@@ -55,6 +59,7 @@
.commit-actions { .commit-actions {
@media (min-width: $screen-md-min) { @media (min-width: $screen-md-min) {
float: right; float: right;
margin-left: $gl-padding;
} }
} }
...@@ -70,17 +75,11 @@ ...@@ -70,17 +75,11 @@
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
a { a,
button {
color: $gl-dark-link-color; color: $gl-dark-link-color;
} }
.commit-link {
&:hover {
color: $gl-link-color;
text-decoration: none;
}
}
.avatar { .avatar {
margin-left: -55px; margin-left: -55px;
} }
...@@ -94,7 +93,7 @@ ...@@ -94,7 +93,7 @@
font-size: 14px; font-size: 14px;
border-left: 1px solid #eee; border-left: 1px solid #eee;
padding: 10px 15px; padding: 10px 15px;
margin: 10px 0 10px 0; margin: 10px 0;
background: #f9f9f9; background: #f9f9f9;
display: none; display: none;
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
margin: 0; margin: 0;
.commit { .commit {
padding: 0; padding: 0 0 0 55px;
.commit-row-title { .commit-row-title {
.commit-row-message { .commit-row-message {
......
...@@ -14,10 +14,10 @@ module ButtonHelper ...@@ -14,10 +14,10 @@ module ButtonHelper
# # => "<button class='...' data-clipboard-target='div#foo'>...</button>" # # => "<button class='...' data-clipboard-target='div#foo'>...</button>"
# #
# See http://clipboardjs.com/#usage # See http://clipboardjs.com/#usage
def clipboard_button(data = {}) def clipboard_button(data = {}, css_class: 'btn-clipboard')
content_tag :button, content_tag :button,
icon('clipboard'), icon('clipboard'),
class: 'btn btn-clipboard', class: "btn #{css_class}",
data: data, data: data,
type: :button type: :button
end end
......
...@@ -12,15 +12,15 @@ ...@@ -12,15 +12,15 @@
= commit_author_avatar(commit) = commit_author_avatar(commit)
.commit-row-title .commit-row-title
%span.item-title %span.item-title
= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message commit-link" = link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"
- if commit.description? - if commit.description?
%a.text-expander.js-toggle-button ... %a.text-expander.js-toggle-button ...
.commit-actions .commit-actions
- if commit.status - if commit.status
= render_commit_status(commit, cssclass: 'btn btn-transparent') = render_commit_status(commit, cssclass: 'btn btn-transparent')
= clipboard_button(clipboard_text: commit.id) = clipboard_button({ clipboard_text: commit.id }, css_class: 'btn-transparent')
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent commit-link" = link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-short-id btn btn-transparent"
= link_to_browse_code(project, commit) = link_to_browse_code(project, commit)
- if commit.description? - if commit.description?
...@@ -30,4 +30,4 @@ ...@@ -30,4 +30,4 @@
.commit-row-info .commit-row-info
= commit_author_link(commit, avatar: true, size: 24) = commit_author_link(commit, avatar: true, size: 24)
authored authored
#{time_ago_with_tooltip(commit.committed_date)} &nbsp; #{time_ago_with_tooltip(commit.committed_date)}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment