Commit b82cb2630c2b2b3fbbda542602eb9383a520778a
1 parent
69751aac
Exists in
master
and in
4 other branches
Use class instead id for css styles
Showing
4 changed files
with
12 additions
and
23 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/lists.scss
| @@ -13,7 +13,10 @@ ul { | @@ -13,7 +13,10 @@ ul { | ||
| 13 | border-bottom: 1px solid rgba(0, 0, 0, 0.05); | 13 | border-bottom: 1px solid rgba(0, 0, 0, 0.05); |
| 14 | 14 | ||
| 15 | &.smoke { background-color:#f5f5f5; } | 15 | &.smoke { background-color:#f5f5f5; } |
| 16 | - &:hover { background:$hover; } | 16 | + &:hover { |
| 17 | + background:$hover; | ||
| 18 | + border-bottom:1px solid #ADF; | ||
| 19 | + } | ||
| 17 | &:last-child { border:none } | 20 | &:last-child { border:none } |
| 18 | .author { color: #999; } | 21 | .author { color: #999; } |
| 19 | 22 |
app/assets/stylesheets/sections/tree.scss
| 1 | -#tree-holder { | ||
| 2 | - #tree-content-holder { | 1 | +.tree-holder { |
| 2 | + .tree-content-holder { | ||
| 3 | float:left; | 3 | float:left; |
| 4 | width:100%; | 4 | width:100%; |
| 5 | } | 5 | } |
| 6 | - #tree-readme-holder { | ||
| 7 | - float:left; | ||
| 8 | - width:100%; | ||
| 9 | - .readme { | ||
| 10 | - border:1px solid #ccc; | ||
| 11 | - padding:12px; | ||
| 12 | - background: #F7F7F7; | ||
| 13 | - | ||
| 14 | - pre { | ||
| 15 | - overflow: auto; | ||
| 16 | - } | ||
| 17 | - } | ||
| 18 | - } | ||
| 19 | 6 | ||
| 20 | .tree_progress { | 7 | .tree_progress { |
| 21 | display:none; | 8 | display:none; |
| @@ -25,7 +12,7 @@ | @@ -25,7 +12,7 @@ | ||
| 25 | } | 12 | } |
| 26 | } | 13 | } |
| 27 | 14 | ||
| 28 | - #tree-slider { | 15 | + .tree-table { |
| 29 | @include border-radius(0); | 16 | @include border-radius(0); |
| 30 | .tree-item { | 17 | .tree-item { |
| 31 | &:hover { | 18 | &:hover { |
| @@ -55,8 +42,7 @@ | @@ -55,8 +42,7 @@ | ||
| 55 | } | 42 | } |
| 56 | } | 43 | } |
| 57 | 44 | ||
| 58 | - | ||
| 59 | - #tree-slider { | 45 | + .tree-table { |
| 60 | td { | 46 | td { |
| 61 | background:#fafafa; | 47 | background:#fafafa; |
| 62 | } | 48 | } |
| @@ -72,5 +58,4 @@ | @@ -72,5 +58,4 @@ | ||
| 72 | text-decoration: underline; | 58 | text-decoration: underline; |
| 73 | } | 59 | } |
| 74 | } | 60 | } |
| 75 | - | ||
| 76 | } | 61 | } |
app/views/tree/_tree.html.haml
| @@ -8,12 +8,12 @@ | @@ -8,12 +8,12 @@ | ||
| 8 | %li= link | 8 | %li= link |
| 9 | .clear | 9 | .clear |
| 10 | %div.tree_progress | 10 | %div.tree_progress |
| 11 | -#tree-content-holder | 11 | +%div#tree-content-holder.tree-content-holder |
| 12 | - if tree.is_blob? | 12 | - if tree.is_blob? |
| 13 | = render partial: "tree/tree_file", locals: { name: tree.name, content: tree.data, file: tree } | 13 | = render partial: "tree/tree_file", locals: { name: tree.name, content: tree.data, file: tree } |
| 14 | - else | 14 | - else |
| 15 | - contents = tree.contents | 15 | - contents = tree.contents |
| 16 | - %table#tree-slider{class: "table_#{@hex_path}" } | 16 | + %table#tree-slider{class: "table_#{@hex_path} tree-table" } |
| 17 | %thead | 17 | %thead |
| 18 | %th Name | 18 | %th Name |
| 19 | %th Last Update | 19 | %th Last Update |
app/views/tree/show.html.haml