Commit ff337964 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Update commit page styles

parent 30d4cce0
...@@ -36,13 +36,17 @@ ...@@ -36,13 +36,17 @@
padding: 10px 0; padding: 10px 0;
margin-bottom: 0; margin-bottom: 0;
.commitable-meta { @media (min-width: $screen-sm-min) {
display: inline-block; display: flex;
line-height: 18px; align-items: center;
.commit-meta {
flex: 1;
}
} }
.commit-hash-full { .commit-hash-full {
@media (max-width: $screen-md-min) { @media (max-width: $screen-sm-max) {
width: 80px; width: 80px;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
...@@ -52,31 +56,24 @@ ...@@ -52,31 +56,24 @@
} }
} }
.commitable-actions { .commit-action-buttons {
@media (min-width: $screen-sm) { i {
float: right; color: $gl-icon-color;
padding-top: 0; font-size: 13px;
margin-right: 3px;
} }
@media (max-width: $screen-xs-max) {
.dropdown { .dropdown {
@media (max-width: $screen-sm) {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
} }
}
.dropdown-toggle { .dropdown-toggle {
@media (max-width: $screen-sm) {
width: 100%; width: 100%;
} }
} }
} }
.commit-options-dropdown-caret {
@media (max-width: $screen-sm) {
margin-left: 0;
}
}
} }
.avatar { .avatar {
...@@ -224,17 +221,6 @@ ...@@ -224,17 +221,6 @@
} }
} }
.commit-action-buttons {
position: relative;
top: -1px;
i {
color: $gl-icon-color;
font-size: 13px;
margin-right: 3px;
}
}
/* /*
* Commit message textarea for web editor and * Commit message textarea for web editor and
* custom merge request message * custom merge request message
......
.commit-info-row.commit-info-row-header .commit-info-row.commit-info-row-header
.commitable-meta .commit-meta
%strong Commit %strong Commit
%strong.monospace.js-details-short= @commit.short_id %strong.monospace.js-details-short= @commit.short_id
= link_to("#", class: "js-details-expand hidden-xs hidden-sm") do = link_to("#", class: "js-details-expand hidden-xs hidden-sm") do
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
%strong %strong
= commit_committer_link(@commit, avatar: true, size: 24) = commit_committer_link(@commit, avatar: true, size: 24)
#{time_ago_with_tooltip(@commit.committed_date)} #{time_ago_with_tooltip(@commit.committed_date)}
.commitable-actions
.commit-action-buttons .commit-action-buttons
- if defined?(@notes_count) && @notes_count > 0 - if defined?(@notes_count) && @notes_count > 0
%span.btn.disabled.btn-grouped.hidden-xs.append-right-10 %span.btn.disabled.btn-grouped.hidden-xs.append-right-10
...@@ -30,7 +29,7 @@ ...@@ -30,7 +29,7 @@
.dropdown.inline .dropdown.inline
%a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } } %a.btn.btn-default.dropdown-toggle{ data: { toggle: "dropdown" } }
%span Options %span Options
= icon('caret-down', class: ".commit-options-dropdown-caret") = icon('caret-down')
%ul.dropdown-menu.dropdown-menu-align-right %ul.dropdown-menu.dropdown-menu-align-right
%li.visible-xs-block.visible-sm-block %li.visible-xs-block.visible-sm-block
= link_to namespace_project_tree_path(@project.namespace, @project, @commit) do = link_to namespace_project_tree_path(@project.namespace, @project, @commit) do
......
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