Commit fd76f497866b6945a2fc9ce560154ab9f283e1dd
1 parent
f1e1e5bf
Exists in
spb-stable
and in
3 other branches
Fix commit description expand
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
7 additions
and
20 deletions
Show diff stats
app/assets/stylesheets/sections/commits.scss
| @@ -170,20 +170,13 @@ li.commit { | @@ -170,20 +170,13 @@ li.commit { | ||
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | .text-expander { | 172 | .text-expander { |
| 173 | - background: #ddd; | 173 | + background: #eee; |
| 174 | color: #555; | 174 | color: #555; |
| 175 | padding: 0 5px; | 175 | padding: 0 5px; |
| 176 | - line-height: 6px; | ||
| 177 | - height: 12px; | ||
| 178 | - font-size: 12px; | ||
| 179 | - font-weight: bold; | ||
| 180 | - vertical-align: middle; | ||
| 181 | - display: inline-block; | ||
| 182 | - border-radius: 1px; | ||
| 183 | - text-decoration: none; | ||
| 184 | cursor: pointer; | 176 | cursor: pointer; |
| 177 | + margin-left: 4px; | ||
| 185 | &:hover { | 178 | &:hover { |
| 186 | - background-color: #ccc; | 179 | + background-color: #ddd; |
| 187 | } | 180 | } |
| 188 | } | 181 | } |
| 189 | } | 182 | } |
| @@ -218,10 +211,4 @@ li.commit { | @@ -218,10 +211,4 @@ li.commit { | ||
| 218 | @extend .cgray; | 211 | @extend .cgray; |
| 219 | } | 212 | } |
| 220 | } | 213 | } |
| 221 | - | ||
| 222 | - &.open { | ||
| 223 | - .commit-row-description { | ||
| 224 | - display: block; | ||
| 225 | - } | ||
| 226 | - } | ||
| 227 | } | 214 | } |
app/views/projects/commits/_commit.html.haml
| 1 | -%li.commit | ||
| 2 | - .commit-row-title{"data-toggle" => "dropdown"} | 1 | +%li.commit.js-toggle-container |
| 2 | + .commit-row-title | ||
| 3 | = link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id" | 3 | = link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id" |
| 4 | | 4 | |
| 5 | %span.str-truncated | 5 | %span.str-truncated |
| 6 | = link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message" | 6 | = link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message" |
| 7 | - if commit.description? | 7 | - if commit.description? |
| 8 | - %span.label-default.text-expander.js-details-target ... | 8 | + %a.label-default.text-expander.js-toggle-button ... |
| 9 | 9 | ||
| 10 | = link_to "Browse Code »", project_tree_path(project, commit), class: "pull-right" | 10 | = link_to "Browse Code »", project_tree_path(project, commit), class: "pull-right" |
| 11 | .notes_count | 11 | .notes_count |
| @@ -16,7 +16,7 @@ | @@ -16,7 +16,7 @@ | ||
| 16 | = notes.count | 16 | = notes.count |
| 17 | 17 | ||
| 18 | - if commit.description? | 18 | - if commit.description? |
| 19 | - .commit-row-description | 19 | + .commit-row-description.js-toggle-content |
| 20 | = simple_format(commit.description) | 20 | = simple_format(commit.description) |
| 21 | 21 | ||
| 22 | .commit-row-info | 22 | .commit-row-info |