Commit 99bd00158c49360cf6193118772396d19111d9a0
1 parent
88466881
Exists in
master
and in
4 other branches
fixing errors style
Showing
2 changed files
with
18 additions
and
35 deletions
Show diff stats
app/assets/stylesheets/projects.css.scss
@@ -460,14 +460,7 @@ input.ssh_project_url { | @@ -460,14 +460,7 @@ input.ssh_project_url { | ||
460 | } | 460 | } |
461 | } | 461 | } |
462 | 462 | ||
463 | -.field_with_errors { | ||
464 | - input[type="text"], | ||
465 | - input[type="password"], | ||
466 | - textarea | ||
467 | - { | ||
468 | - background: none repeat scroll 0 0 #FFBBBB | ||
469 | - } | ||
470 | -} | 463 | + |
471 | 464 | ||
472 | .tag { | 465 | .tag { |
473 | @include round-borders-all(4px); | 466 | @include round-borders-all(4px); |
app/assets/stylesheets/style.scss
@@ -304,6 +304,22 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} | @@ -304,6 +304,22 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} | ||
304 | 304 | ||
305 | /* eo Icons*/ | 305 | /* eo Icons*/ |
306 | 306 | ||
307 | +/* Errors */ | ||
308 | +#error_explanation{background: #ffe5eb; padding: 20px; margin-bottom: 20px; border-radius: 5px} | ||
309 | +#error_explanation h2{margin: 0; margin-bottom: 20px; color: red} | ||
310 | +#error_explanation ul li{margin-bottom: 10px} | ||
311 | +#error_explanation ul li:last-child{margin-bottom: 0} | ||
312 | +.field_with_errors { | ||
313 | + input[type="text"], | ||
314 | + input[type="password"], | ||
315 | + textarea | ||
316 | + { | ||
317 | + border: 1px solid #FFBBBB; | ||
318 | + background: #fff4f6; | ||
319 | + } | ||
320 | +} | ||
321 | +/* eo Errors */ | ||
322 | + | ||
307 | /* General */ | 323 | /* General */ |
308 | #container{background-color: white; overflow: hidden; } | 324 | #container{background-color: white; overflow: hidden; } |
309 | body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)} | 325 | body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)} |
@@ -380,33 +396,7 @@ header nav a span{width: 20px; height: 20px; display: inline-block; background: | @@ -380,33 +396,7 @@ header nav a span{width: 20px; height: 20px; display: inline-block; background: | ||
380 | header nav a.dashboard span{background: url('images.png') no-repeat -161px 0;} | 396 | header nav a.dashboard span{background: url('images.png') no-repeat -161px 0;} |
381 | header nav a.admin span{background: url('images.png') no-repeat -184px 0;} | 397 | header nav a.admin span{background: url('images.png') no-repeat -184px 0;} |
382 | header nav a.project span{background: url('images.png') no-repeat -209px -1px; top: 7px} | 398 | header nav a.project span{background: url('images.png') no-repeat -209px -1px; top: 7px} |
383 | -/* | ||
384 | - | ||
385 | -header nav a span{width: 20px; height: 20px; display: inline-block; background: red; position: absolute; left: 8px; top: 14px;} | ||
386 | - | ||
387 | -header nav a.dashboard.current span{ background-position: -163px -22px; } | ||
388 | -header nav a.admin.current span{ background-position: -186px -22px;} | ||
389 | -header nav a.project.current span{ background-position: -211px -23px;} | ||
390 | - | ||
391 | -header nav a.project span{background: url('images.png') no-repeat -209px -1px; top: 15px} | ||
392 | - | ||
393 | - | ||
394 | -header nav a span.current{top: 18px} | ||
395 | - | ||
396 | - | ||
397 | -header nav {margin-left: 180px; display: inline-block; float: left;} | ||
398 | -header nav a{float: left; background: #31363e; padding: 16px 20px 20px 34px; margin-right: 10px; | ||
399 | - -webkit-border-top-left-radius: 5px; | ||
400 | - -webkit-border-top-right-radius: 5px; | ||
401 | - -moz-border-radius-topleft: 5px; | ||
402 | - -moz-border-radius-topright: 5px; | ||
403 | - border-top-left-radius: 5px; | ||
404 | - border-top-right-radius: 5px; | ||
405 | - position: relative; | ||
406 | -} | ||
407 | 399 | ||
408 | -header nav a.current{background: white; color: #333; text-shadow: none;} | ||
409 | -*/ | ||
410 | 400 | ||
411 | header .login-top{float: right; width: 180px; | 401 | header .login-top{float: right; width: 180px; |
412 | background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); | 402 | background-image: -webkit-gradient(linear, 0 0, 0 62, color-stop(0.032, #464c56), to(#363c45)); |
@@ -579,7 +569,7 @@ body.project-page .project-sidebar aside a:first-child{ | @@ -579,7 +569,7 @@ body.project-page .project-sidebar aside a:first-child{ | ||
579 | body.project-page .project-sidebar aside a:hover{background-color: #eee;} | 569 | body.project-page .project-sidebar aside a:hover{background-color: #eee;} |
580 | body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px} | 570 | body.project-page .project-sidebar aside a span.number{float: right; border-radius: 5px; text-shadow: none; background: rgba(0,0,0,.12); text-align: center; padding: 5px 8px; position: absolute; top: 10px; right: 10px} |
581 | body.project-page .project-sidebar aside a.current{background-color: #79c3e0; color: white; text-shadow: none; border-color: transparent} | 571 | body.project-page .project-sidebar aside a.current{background-color: #79c3e0; color: white; text-shadow: none; border-color: transparent} |
582 | -body.project-page .project-content{ padding: 20px; display: block; margin-left: 250px } | 572 | +body.project-page .project-content{ padding: 20px; display: block; margin-left: 250px; min-height: 400px} |
583 | body.project-page .project-content h2{ margin-top: 6px} | 573 | body.project-page .project-content h2{ margin-top: 6px} |
584 | body.project-page .project-content .button.right{margin-left: 20px} | 574 | body.project-page .project-content .button.right{margin-left: 20px} |
585 | body.project-page table .commit a{color: #{$blue_link}} | 575 | body.project-page table .commit a{color: #{$blue_link}} |