diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-18 11:14:07 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-18 11:14:07 -0800 |
| commit | 566b49624a230728a3a873ee1937f4b8d30ff8f5 (patch) | |
| tree | 5576dd8b11853a8766a73651ce1eb287e2967a1d | |
| parent | 35c4351e2b5165dd9dc31ec625d7bb21821781c3 (diff) | |
| parent | e1fa9abd897339deedc265435facccadd11707a0 (diff) | |
| download | gitlab-ce-566b49624a230728a3a873ee1937f4b8d30ff8f5.tar.gz | |
Merge pull request #5867 from jhollingsworth/feature/styling-changes
Change archive icon and clone panel styling.
| -rw-r--r-- | app/assets/stylesheets/sections/projects.scss | 24 | ||||
| -rw-r--r-- | app/views/dashboard/projects.html.haml | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 45e52bb23a6..98e1a15f70c 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -71,13 +71,24 @@ border: 1px solid #E1E1E1; @include border-radius(4px); + input[type="text"], .btn { - margin-left: 3px; border: none; - background: none; + @include border-radius(0px); + border-left: 1px solid #E1E1E1; box-shadow: none; + padding: 6px 10px; + } + + .btn { + float: left; + background: none; color: #29b; - padding: 6px; + + &:first-child { + @include border-radius-left(4px); + border-left: 0px; + } &.active { color: #333; @@ -86,14 +97,9 @@ } input[type="text"] { - margin-left: 2px; - border: none; - border-radius: 0; - border-left: 1px solid #E1E1E1; + cursor: auto; @extend .monospace; - box-shadow: none; background: #FAFAFA; - padding: 6px 10px; } } diff --git a/app/views/dashboard/projects.html.haml b/app/views/dashboard/projects.html.haml index 23d78720881..96917c39b55 100644 --- a/app/views/dashboard/projects.html.haml +++ b/app/views/dashboard/projects.html.haml @@ -84,7 +84,7 @@ .pull-right - if project.archived? %span.label - %i.icon-book + %i.icon-archive Archived - project.labels.each do |label| %span.label.label-info |