Commit b66d9c4f28168be13616696a20e252c7adae3e49
1 parent
a2b3eb13
Exists in
spb-stable
and in
2 other branches
Remove ui-box css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
4 changed files
with
19 additions
and
175 deletions
Show diff stats
app/assets/stylesheets/generic/ui_box.scss
| @@ -1,164 +0,0 @@ | @@ -1,164 +0,0 @@ | ||
| 1 | -/** | ||
| 2 | - * UI box: | ||
| 3 | - * Block element for separating information on page. | ||
| 4 | - * Used for storing issues lists, grouped data. | ||
| 5 | - * You can have multiple ui boxes on one page | ||
| 6 | - * | ||
| 7 | - * Classes: | ||
| 8 | - * .ui-box - for any block & widgets | ||
| 9 | - * .ui-box.ui-box-small - same but with smaller title | ||
| 10 | - * .ui-box.ui-box-danger - with red title | ||
| 11 | - * | ||
| 12 | - * Ex. 1: List | ||
| 13 | - * .ui-box | ||
| 14 | - * .title | ||
| 15 | - * # title here | ||
| 16 | - * %ul | ||
| 17 | - * # content here | ||
| 18 | - * | ||
| 19 | - * Ex. 2: Block data | ||
| 20 | - * .ui-box | ||
| 21 | - * .title | ||
| 22 | - * # title here | ||
| 23 | - * .body | ||
| 24 | - * # content here | ||
| 25 | - * | ||
| 26 | - */ | ||
| 27 | - | ||
| 28 | -.ui-box { | ||
| 29 | - background: #FFF; | ||
| 30 | - margin-bottom: 20px; | ||
| 31 | - border: 1px solid #DDD; | ||
| 32 | - word-wrap: break-word; | ||
| 33 | - | ||
| 34 | - img { | ||
| 35 | - max-width: 100%; | ||
| 36 | - } | ||
| 37 | - | ||
| 38 | - pre { | ||
| 39 | - code { | ||
| 40 | - background: none !important; | ||
| 41 | - } | ||
| 42 | - } | ||
| 43 | - | ||
| 44 | - ul { | ||
| 45 | - margin: 0; | ||
| 46 | - padding: 0; | ||
| 47 | - } | ||
| 48 | - | ||
| 49 | - .title { | ||
| 50 | - background-color: #EEE; | ||
| 51 | - border-bottom: 1px solid #DDD; | ||
| 52 | - color: #666; | ||
| 53 | - font-size: 16px; | ||
| 54 | - text-shadow: 0 1px 1px #fff; | ||
| 55 | - padding: 0 10px; | ||
| 56 | - font-size: 14px; | ||
| 57 | - line-height: 40px; | ||
| 58 | - font-weight: normal; | ||
| 59 | - margin: 0; | ||
| 60 | - | ||
| 61 | - > a { | ||
| 62 | - text-shadow: 0 1px 1px #fff; | ||
| 63 | - } | ||
| 64 | - | ||
| 65 | - form { | ||
| 66 | - margin-bottom: 0; | ||
| 67 | - margin-top: 0; | ||
| 68 | - } | ||
| 69 | - | ||
| 70 | - .btn { | ||
| 71 | - vertical-align: middle; | ||
| 72 | - padding: 4px 12px; | ||
| 73 | - @include box-shadow(0 0px 1px 1px #f2f2f2); | ||
| 74 | - } | ||
| 75 | - | ||
| 76 | - .nav-pills { | ||
| 77 | - > li { | ||
| 78 | - > a { | ||
| 79 | - padding: 13px; | ||
| 80 | - margin: 0; | ||
| 81 | - font-size: 13px; | ||
| 82 | - } | ||
| 83 | - &.active { | ||
| 84 | - > a { | ||
| 85 | - background: #D5D5D5; | ||
| 86 | - color: $style_color; | ||
| 87 | - @include border-radius(0); | ||
| 88 | - border-radius: 0; | ||
| 89 | - border-left: 1px solid #CCC; | ||
| 90 | - border-right: 1px solid #CCC; | ||
| 91 | - } | ||
| 92 | - } | ||
| 93 | - } | ||
| 94 | - } | ||
| 95 | - } | ||
| 96 | - | ||
| 97 | - .body { | ||
| 98 | - padding: 10px; | ||
| 99 | - } | ||
| 100 | - | ||
| 101 | - &.padded { | ||
| 102 | - h5, .title { | ||
| 103 | - margin: -20px; | ||
| 104 | - margin-bottom: 0; | ||
| 105 | - padding: 5px 20px; | ||
| 106 | - } | ||
| 107 | - } | ||
| 108 | - | ||
| 109 | - .form-holder { | ||
| 110 | - padding-top: 20px; | ||
| 111 | - form { | ||
| 112 | - margin-bottom: 0; | ||
| 113 | - legend { | ||
| 114 | - text-indent: 10px; | ||
| 115 | - } | ||
| 116 | - .form-actions { | ||
| 117 | - margin-bottom: 0; | ||
| 118 | - } | ||
| 119 | - } | ||
| 120 | - } | ||
| 121 | -} | ||
| 122 | - | ||
| 123 | -/* | ||
| 124 | - * Small box | ||
| 125 | - */ | ||
| 126 | -.ui-box.ui-box-small { | ||
| 127 | - margin-bottom: 10px; | ||
| 128 | - | ||
| 129 | - .title { | ||
| 130 | - font-size: 13px; | ||
| 131 | - line-height: 30px; | ||
| 132 | - | ||
| 133 | - a { | ||
| 134 | - color: #666; | ||
| 135 | - &:hover { | ||
| 136 | - text-decoration: underline; | ||
| 137 | - } | ||
| 138 | - } | ||
| 139 | - } | ||
| 140 | -} | ||
| 141 | - | ||
| 142 | -/* | ||
| 143 | - * Danger box | ||
| 144 | - */ | ||
| 145 | -.ui-box.ui-box-danger { | ||
| 146 | - background: #f7f7f7; | ||
| 147 | - border: none; | ||
| 148 | - | ||
| 149 | - .title { | ||
| 150 | - background: #D65; | ||
| 151 | - color: #fff; | ||
| 152 | - text-shadow: none; | ||
| 153 | - font-weight: 500; | ||
| 154 | - } | ||
| 155 | -} | ||
| 156 | - | ||
| 157 | -/* | ||
| 158 | - * Block under tw-bootstrap tabs | ||
| 159 | - */ | ||
| 160 | -.tab-pane { | ||
| 161 | - .ui-box { | ||
| 162 | - margin: 3px 3px 25px 3px; | ||
| 163 | - } | ||
| 164 | -} |
app/assets/stylesheets/gl_bootstrap.scss
| @@ -227,5 +227,14 @@ ul.breadcrumb { | @@ -227,5 +227,14 @@ ul.breadcrumb { | ||
| 227 | * | 227 | * |
| 228 | */ | 228 | */ |
| 229 | .panel { | 229 | .panel { |
| 230 | - | 230 | + .panel-heading { |
| 231 | + font-size: 14px; | ||
| 232 | + line-height: 18px; | ||
| 233 | + | ||
| 234 | + .panel-head-actions { | ||
| 235 | + position: relative; | ||
| 236 | + top: -7px; | ||
| 237 | + float: right; | ||
| 238 | + } | ||
| 239 | + } | ||
| 231 | } | 240 | } |
app/assets/stylesheets/sections/dashboard.scss
| 1 | .dashboard { | 1 | .dashboard { |
| 2 | .side { | 2 | .side { |
| 3 | - .ui-box { | ||
| 4 | - margin: 0px; | ||
| 5 | - box-shadow: none; | ||
| 6 | - | ||
| 7 | - .nav-projects-tabs li { padding: 0; } | 3 | + .panel { |
| 4 | + .panel-heading { | ||
| 5 | + background: #EEE; | ||
| 6 | + border-top-left-radius: 0; | ||
| 7 | + } | ||
| 8 | + border-top-left-radius: 0; | ||
| 8 | } | 9 | } |
| 9 | } | 10 | } |
| 10 | } | 11 | } |
| @@ -24,9 +25,7 @@ | @@ -24,9 +25,7 @@ | ||
| 24 | 25 | ||
| 25 | .dashboard { | 26 | .dashboard { |
| 26 | .dash-filter { | 27 | .dash-filter { |
| 27 | - margin: 7px 0; | ||
| 28 | - padding: 4px 6px; | ||
| 29 | - width: 220px; | 28 | + width: 205px; |
| 30 | float: left; | 29 | float: left; |
| 31 | height: inherit; | 30 | height: inherit; |
| 32 | } | 31 | } |
| @@ -34,7 +33,7 @@ | @@ -34,7 +33,7 @@ | ||
| 34 | 33 | ||
| 35 | @media (max-width: 1200px) { | 34 | @media (max-width: 1200px) { |
| 36 | .dashboard .dash-filter { | 35 | .dashboard .dash-filter { |
| 37 | - width: 150px; | 36 | + width: 140px; |
| 38 | } | 37 | } |
| 39 | } | 38 | } |
| 40 | 39 |
app/views/groups/_projects.html.haml
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | .panel-heading | 2 | .panel-heading |
| 3 | Projects (#{projects.count}) | 3 | Projects (#{projects.count}) |
| 4 | - if can? current_user, :create_projects, @group | 4 | - if can? current_user, :create_projects, @group |
| 5 | - %span.pull-right | 5 | + .panel-head-actions |
| 6 | = link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do | 6 | = link_to new_project_path(namespace_id: @group.id), class: "btn btn-new" do |
| 7 | %i.icon-plus | 7 | %i.icon-plus |
| 8 | New project | 8 | New project |