Commit 387c97669427ee090ee46eec2aceca93b67ad4df
1 parent
b450c9af
Exists in
master
and in
7 other branches
Avoid conflicts between colab style and gitlab style
Signed-off-by: Carlos Coelho <carlos@pencillabs.com> Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Showing
1 changed file
with
40 additions
and
0 deletions
Show diff stats
src/colab-spb-theme-plugin/colab_spb_theme/static/css/screen.css
| @@ -650,3 +650,43 @@ a.btn { | @@ -650,3 +650,43 @@ a.btn { | ||
| 650 | .btn-colab-mailinglist-members { | 650 | .btn-colab-mailinglist-members { |
| 651 | margin-bottom: 40px; | 651 | margin-bottom: 40px; |
| 652 | } | 652 | } |
| 653 | + | ||
| 654 | +#colab_profile-content label.control-label { | ||
| 655 | + width: auto; | ||
| 656 | + padding-left: 0; | ||
| 657 | + font-size: 16px; | ||
| 658 | +} | ||
| 659 | + | ||
| 660 | +#colab_profile-content input.form-control { | ||
| 661 | + font-size: 14px; | ||
| 662 | +} | ||
| 663 | + | ||
| 664 | +#colab_profile-content h3.panel-title { | ||
| 665 | + font-size: 16px; | ||
| 666 | +} | ||
| 667 | + | ||
| 668 | +#colab_profile-content .panel .emails, | ||
| 669 | +#colab_profile-content .btn, | ||
| 670 | +#colab_profile-content .panel label { | ||
| 671 | + font-size: 14px; | ||
| 672 | +} | ||
| 673 | + | ||
| 674 | +#colab_profile-content .links-group .btn.btn-lg { | ||
| 675 | + padding: 10px 16px; | ||
| 676 | + font-size: 18px; | ||
| 677 | + line-height: 1.33; | ||
| 678 | + border-radius: 6px; | ||
| 679 | +} | ||
| 680 | + | ||
| 681 | +#colab_profile-content .btn.btn-primary { | ||
| 682 | + color: #fff; | ||
| 683 | + background-color: #428bca; | ||
| 684 | + border-color: #357ebd; | ||
| 685 | +} | ||
| 686 | + | ||
| 687 | +#colab_profile-content .panel .label { | ||
| 688 | + padding: .2em .6em .3em; | ||
| 689 | + font-size: 75%; | ||
| 690 | + font-weight: bold; | ||
| 691 | + display: inline; | ||
| 692 | +} |