Commit a8fbda945eec91c597a26100eff000bb3eb9b6af
1 parent
e228dae8
Exists in
master
and in
4 other branches
bit reordering and cleanup unused styles
Showing
6 changed files
with
81 additions
and
124 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -13,20 +13,12 @@ body { | @@ -13,20 +13,12 @@ body { | ||
| 13 | margin: 0 0; | 13 | margin: 0 0; |
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | -.container .sidebar { | ||
| 17 | - width: 200px; | ||
| 18 | - height: 100%; | ||
| 19 | - min-height: 450px; | ||
| 20 | - float: right; | ||
| 21 | -} | ||
| 22 | - | ||
| 23 | - | ||
| 24 | .visible_link, | 16 | .visible_link, |
| 25 | .author_link { | 17 | .author_link { |
| 26 | color: $link_color; | 18 | color: $link_color; |
| 27 | } | 19 | } |
| 28 | 20 | ||
| 29 | -.help li { color:#111 } | 21 | +.help li { color:$style_color; } |
| 30 | 22 | ||
| 31 | .back_link { | 23 | .back_link { |
| 32 | text-decoration: underline; | 24 | text-decoration: underline; |
| @@ -96,28 +88,17 @@ table a code { | @@ -96,28 +88,17 @@ table a code { | ||
| 96 | margin-right:50px | 88 | margin-right:50px |
| 97 | } | 89 | } |
| 98 | 90 | ||
| 99 | -.handle:hover { | ||
| 100 | - cursor: move; | ||
| 101 | -} | ||
| 102 | - | ||
| 103 | span.update-author { | 91 | span.update-author { |
| 104 | display: block; | 92 | display: block; |
| 105 | -} | ||
| 106 | -span.update-author { | ||
| 107 | color: #999; | 93 | color: #999; |
| 108 | font-weight: normal; | 94 | font-weight: normal; |
| 109 | font-style: italic; | 95 | font-style: italic; |
| 110 | -} | ||
| 111 | -span.update-author strong { | ||
| 112 | - font-weight: bold; | ||
| 113 | - font-style: normal; | 96 | + strong { |
| 97 | + font-weight: bold; | ||
| 98 | + font-style: normal; | ||
| 99 | + } | ||
| 114 | } | 100 | } |
| 115 | 101 | ||
| 116 | -/** UPDATE ITEM **/ | ||
| 117 | -span.update-author { | ||
| 118 | - display: block; | ||
| 119 | -} | ||
| 120 | -/** END UPDATE ITEM **/ | ||
| 121 | .dashboard-loader { | 102 | .dashboard-loader { |
| 122 | float: left; | 103 | float: left; |
| 123 | margin: 10px; | 104 | margin: 10px; |
| @@ -264,21 +245,6 @@ input.git_clone_url { | @@ -264,21 +245,6 @@ input.git_clone_url { | ||
| 264 | } | 245 | } |
| 265 | 246 | ||
| 266 | 247 | ||
| 267 | -/** bordered list **/ | ||
| 268 | -ul.bordered-list { | ||
| 269 | - margin: 5px 0px; | ||
| 270 | - padding: 0px; | ||
| 271 | - li { | ||
| 272 | - padding: 5px 0; | ||
| 273 | - border-bottom: 1px solid #EEE; | ||
| 274 | - overflow: hidden; | ||
| 275 | - display: block; | ||
| 276 | - margin: 0px; | ||
| 277 | - } | ||
| 278 | -} | ||
| 279 | - | ||
| 280 | -ul.bordered-list li:last-child { border:none } | ||
| 281 | - | ||
| 282 | .line_holder { | 248 | .line_holder { |
| 283 | &:hover { | 249 | &:hover { |
| 284 | td { | 250 | td { |
| @@ -315,28 +281,6 @@ p.time { | @@ -315,28 +281,6 @@ p.time { | ||
| 315 | border: 2px solid #ddd; | 281 | border: 2px solid #ddd; |
| 316 | } | 282 | } |
| 317 | 283 | ||
| 318 | - | ||
| 319 | -.ico { | ||
| 320 | - background: url("images.png") no-repeat -85px -77px; | ||
| 321 | - width: 19px; | ||
| 322 | - height: 16px; | ||
| 323 | - float: left; | ||
| 324 | - position: relative; | ||
| 325 | - margin-right: 10px; | ||
| 326 | - top: 8px; | ||
| 327 | - | ||
| 328 | - &.project { | ||
| 329 | - background-position: -37px -77px; | ||
| 330 | - } | ||
| 331 | - | ||
| 332 | - &.activities { | ||
| 333 | - background-position:-162px -22px; | ||
| 334 | - } | ||
| 335 | - &.projects { | ||
| 336 | - background-position:-209px -21px; | ||
| 337 | - } | ||
| 338 | -} | ||
| 339 | - | ||
| 340 | .leftbar { | 284 | .leftbar { |
| 341 | h5, .title { | 285 | h5, .title { |
| 342 | padding: 5px 10px; | 286 | padding: 5px 10px; |
| @@ -365,49 +309,6 @@ p.time { | @@ -365,49 +309,6 @@ p.time { | ||
| 365 | } | 309 | } |
| 366 | } | 310 | } |
| 367 | 311 | ||
| 368 | -.votes { | ||
| 369 | - font-size: 13px; | ||
| 370 | - line-height: 15px; | ||
| 371 | - .progress { | ||
| 372 | - height: 4px; | ||
| 373 | - margin: 0; | ||
| 374 | - .bar { | ||
| 375 | - float: left; | ||
| 376 | - height: 100%; | ||
| 377 | - } | ||
| 378 | - .bar-success { | ||
| 379 | - @include linear-gradient(#62C462, #51A351); | ||
| 380 | - background-color: #468847; | ||
| 381 | - } | ||
| 382 | - .bar-danger { | ||
| 383 | - @include linear-gradient(#EE5F5B, #BD362F); | ||
| 384 | - background-color: #B94A48; | ||
| 385 | - } | ||
| 386 | - } | ||
| 387 | - .upvotes { | ||
| 388 | - display: inline-block; | ||
| 389 | - color: #468847; | ||
| 390 | - } | ||
| 391 | - .downvotes { | ||
| 392 | - display: inline-block; | ||
| 393 | - color: #B94A48; | ||
| 394 | - } | ||
| 395 | -} | ||
| 396 | -.votes-block { | ||
| 397 | - margin: 14px 6px 6px 0; | ||
| 398 | - .downvotes { | ||
| 399 | - float: right; | ||
| 400 | - } | ||
| 401 | -} | ||
| 402 | -.votes-inline { | ||
| 403 | - display: inline-block; | ||
| 404 | - margin: 0 8px; | ||
| 405 | - .progress { | ||
| 406 | - display: inline-block; | ||
| 407 | - padding: 0 0 2px; | ||
| 408 | - width: 45px; | ||
| 409 | - } | ||
| 410 | -} | ||
| 411 | 312 | ||
| 412 | /* Fix for readme code (stopped it from being yellow) */ | 313 | /* Fix for readme code (stopped it from being yellow) */ |
| 413 | .readme { | 314 | .readme { |
| @@ -426,21 +327,18 @@ p.time { | @@ -426,21 +327,18 @@ p.time { | ||
| 426 | } | 327 | } |
| 427 | 328 | ||
| 428 | .status_info { | 329 | .status_info { |
| 429 | - font-size: 18px; | 330 | + font-size: 14px; |
| 430 | padding: 5px 15px; | 331 | padding: 5px 15px; |
| 431 | - line-height: 48px; | 332 | + line-height: 26px; |
| 432 | text-align: center; | 333 | text-align: center; |
| 433 | float: right; | 334 | float: right; |
| 434 | position: relative; | 335 | position: relative; |
| 435 | - top: -15px; | ||
| 436 | - left: 15px; | ||
| 437 | - background: #F5F5F5; | 336 | + top: -5px; |
| 337 | + @include border-radius(4px); | ||
| 438 | 338 | ||
| 439 | - &.success { | ||
| 440 | - } | ||
| 441 | &.error { | 339 | &.error { |
| 442 | - color: #C32; | ||
| 443 | - border-bottom: 5px solid #C32; | 340 | + background: #DA4E49; |
| 341 | + color: #FFF; | ||
| 444 | } | 342 | } |
| 445 | } | 343 | } |
| 446 | 344 | ||
| @@ -459,16 +357,6 @@ p.time { | @@ -459,16 +357,6 @@ p.time { | ||
| 459 | height: 150px; | 357 | height: 150px; |
| 460 | } | 358 | } |
| 461 | 359 | ||
| 462 | -.gitlab_pagination { | ||
| 463 | - span a { color: $link_color; } | ||
| 464 | - .prev, .next, .current, .page a { | ||
| 465 | - padding: 10px; | ||
| 466 | - } | ||
| 467 | - .current { | ||
| 468 | - border-bottom: 2px solid $style_color; | ||
| 469 | - } | ||
| 470 | -} | ||
| 471 | - | ||
| 472 | // Fixes alignment on notes. | 360 | // Fixes alignment on notes. |
| 473 | .new_note { | 361 | .new_note { |
| 474 | label { | 362 | label { |
app/assets/stylesheets/gitlab_bootstrap/common.scss
| @@ -101,3 +101,14 @@ input[type='search'].search-text-input { | @@ -101,3 +101,14 @@ input[type='search'].search-text-input { | ||
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | fieldset legend { font-size: 17px; } | 103 | fieldset legend { font-size: 17px; } |
| 104 | + | ||
| 105 | +/** PAGINATION **/ | ||
| 106 | +.gitlab_pagination { | ||
| 107 | + span a { color: $link_color; } | ||
| 108 | + .prev, .next, .current, .page a { | ||
| 109 | + padding: 10px; | ||
| 110 | + } | ||
| 111 | + .current { | ||
| 112 | + border-bottom: 2px solid $style_color; | ||
| 113 | + } | ||
| 114 | +} |
app/assets/stylesheets/gitlab_bootstrap/lists.scss
| @@ -39,3 +39,17 @@ ol, ul { | @@ -39,3 +39,17 @@ ol, ul { | ||
| 39 | } | 39 | } |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | + | ||
| 43 | +/** light list with border-bottom between li **/ | ||
| 44 | +ul.bordered-list { | ||
| 45 | + margin: 5px 0px; | ||
| 46 | + padding: 0px; | ||
| 47 | + li { | ||
| 48 | + padding: 5px 0; | ||
| 49 | + border-bottom: 1px solid #EEE; | ||
| 50 | + overflow: hidden; | ||
| 51 | + display: block; | ||
| 52 | + margin: 0px; | ||
| 53 | + &:last-child { border:none } | ||
| 54 | + } | ||
| 55 | +} |
app/assets/stylesheets/main.scss
| @@ -90,6 +90,7 @@ $baseLineHeight: 18px !default; | @@ -90,6 +90,7 @@ $baseLineHeight: 18px !default; | ||
| 90 | @import "sections/issues.scss"; | 90 | @import "sections/issues.scss"; |
| 91 | @import "sections/projects.scss"; | 91 | @import "sections/projects.scss"; |
| 92 | @import "sections/snippets.scss"; | 92 | @import "sections/snippets.scss"; |
| 93 | +@import "sections/votes.scss"; | ||
| 93 | @import "sections/merge_requests.scss"; | 94 | @import "sections/merge_requests.scss"; |
| 94 | @import "sections/graph.scss"; | 95 | @import "sections/graph.scss"; |
| 95 | @import "sections/events.scss"; | 96 | @import "sections/events.scss"; |
| @@ -0,0 +1,43 @@ | @@ -0,0 +1,43 @@ | ||
| 1 | +.votes { | ||
| 2 | + font-size: 13px; | ||
| 3 | + line-height: 15px; | ||
| 4 | + .progress { | ||
| 5 | + height: 4px; | ||
| 6 | + margin: 0; | ||
| 7 | + .bar { | ||
| 8 | + float: left; | ||
| 9 | + height: 100%; | ||
| 10 | + } | ||
| 11 | + .bar-success { | ||
| 12 | + @include linear-gradient(#62C462, #51A351); | ||
| 13 | + background-color: #468847; | ||
| 14 | + } | ||
| 15 | + .bar-danger { | ||
| 16 | + @include linear-gradient(#EE5F5B, #BD362F); | ||
| 17 | + background-color: #B94A48; | ||
| 18 | + } | ||
| 19 | + } | ||
| 20 | + .upvotes { | ||
| 21 | + display: inline-block; | ||
| 22 | + color: #468847; | ||
| 23 | + } | ||
| 24 | + .downvotes { | ||
| 25 | + display: inline-block; | ||
| 26 | + color: #B94A48; | ||
| 27 | + } | ||
| 28 | +} | ||
| 29 | +.votes-block { | ||
| 30 | + margin: 14px 6px 6px 0; | ||
| 31 | + .downvotes { | ||
| 32 | + float: right; | ||
| 33 | + } | ||
| 34 | +} | ||
| 35 | +.votes-inline { | ||
| 36 | + display: inline-block; | ||
| 37 | + margin: 0 8px; | ||
| 38 | + .progress { | ||
| 39 | + display: inline-block; | ||
| 40 | + padding: 0 0 2px; | ||
| 41 | + width: 45px; | ||
| 42 | + } | ||
| 43 | +} |
app/views/team_members/show.html.haml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn danger" | 6 | = link_to 'Remove from team', project_team_member_path(project_id: @project, id: @team_member.id), confirm: 'Are you sure?', method: :delete, class: "right btn danger" |
| 7 | .profile_avatar_holder | 7 | .profile_avatar_holder |
| 8 | = image_tag gravatar_icon(user.email, 60), class: "borders" | 8 | = image_tag gravatar_icon(user.email, 60), class: "borders" |
| 9 | - %h3 | 9 | + %h3.page_title |
| 10 | = user.name | 10 | = user.name |
| 11 | %small | 11 | %small |
| 12 | = user.email | 12 | = user.email |