Commit 566b49624a230728a3a873ee1937f4b8d30ff8f5

Authored by Dmitriy Zaporozhets
2 parents 35c4351e e1fa9abd

Merge pull request #5867 from jhollingsworth/feature/styling-changes

Change archive icon and clone panel styling.
app/assets/stylesheets/sections/projects.scss
... ... @@ -71,13 +71,24 @@
71 71 border: 1px solid #E1E1E1;
72 72 @include border-radius(4px);
73 73  
  74 + input[type="text"],
74 75 .btn {
75   - margin-left: 3px;
76 76 border: none;
77   - background: none;
  77 + @include border-radius(0px);
  78 + border-left: 1px solid #E1E1E1;
78 79 box-shadow: none;
  80 + padding: 6px 10px;
  81 + }
  82 +
  83 + .btn {
  84 + float: left;
  85 + background: none;
79 86 color: #29b;
80   - padding: 6px;
  87 +
  88 + &:first-child {
  89 + @include border-radius-left(4px);
  90 + border-left: 0px;
  91 + }
81 92  
82 93 &.active {
83 94 color: #333;
... ... @@ -86,14 +97,9 @@
86 97 }
87 98  
88 99 input[type="text"] {
89   - margin-left: 2px;
90   - border: none;
91   - border-radius: 0;
92   - border-left: 1px solid #E1E1E1;
  100 + cursor: auto;
93 101 @extend .monospace;
94   - box-shadow: none;
95 102 background: #FAFAFA;
96   - padding: 6px 10px;
97 103 }
98 104 }
99 105  
... ...
app/views/dashboard/projects.html.haml
... ... @@ -84,7 +84,7 @@
84 84 .pull-right
85 85 - if project.archived?
86 86 %span.label
87   - %i.icon-book
  87 + %i.icon-archive
88 88 Archived
89 89 - project.labels.each do |label|
90 90 %span.label.label-info
... ...