Commit af5a57c23949b627b3ba71a94edd0bf1c72557f9
1 parent
82937d60
Moving style from diazo rules to gitlab theme template
Showing
2 changed files
with
14 additions
and
21 deletions
Show diff stats
src/proxy/diazo/gitlab.xml
| @@ -10,25 +10,4 @@ | @@ -10,25 +10,4 @@ | ||
| 10 | 10 | ||
| 11 | <drop css:content="#top-panel" /> | 11 | <drop css:content="#top-panel" /> |
| 12 | <drop css:content=".navbar-gitlab" /> | 12 | <drop css:content=".navbar-gitlab" /> |
| 13 | - <after theme-children="/html/head"> | ||
| 14 | - <script>jQuery.noConflict();</script> | ||
| 15 | - <style> | ||
| 16 | - div#main-content{ | ||
| 17 | - margin-top: 50px; | ||
| 18 | - } | ||
| 19 | - div#main-content div.container { | ||
| 20 | - width: 1110px; | ||
| 21 | - } | ||
| 22 | - div#main-content div.flash-container{ | ||
| 23 | - width: 85%; | ||
| 24 | - } | ||
| 25 | - #breadcrumbs { | ||
| 26 | - border: 0 !important; | ||
| 27 | - } | ||
| 28 | - | ||
| 29 | - #right-top-nav { | ||
| 30 | - margin-right: 5em !important; | ||
| 31 | - } | ||
| 32 | - </style> | ||
| 33 | - </after> | ||
| 34 | </rules> | 13 | </rules> |
src/proxy/templates/proxy/gitlab.html
| @@ -10,6 +10,19 @@ | @@ -10,6 +10,19 @@ | ||
| 10 | div#main-content .main-nav { | 10 | div#main-content .main-nav { |
| 11 | margin-top: -15px; | 11 | margin-top: -15px; |
| 12 | } | 12 | } |
| 13 | + div#main-content div.container { | ||
| 14 | + width: 1110px; | ||
| 15 | + } | ||
| 16 | + div#main-content div.flash-container{ | ||
| 17 | + width: 85%; | ||
| 18 | + } | ||
| 19 | + #breadcrumbs { | ||
| 20 | + border: 0 !important; | ||
| 21 | + } | ||
| 22 | + | ||
| 23 | + #right-top-nav { | ||
| 24 | + margin-right: 5em !important; | ||
| 25 | + } | ||
| 13 | </style> | 26 | </style> |
| 14 | {% endblock %} | 27 | {% endblock %} |
| 15 | 28 | ||
| @@ -21,4 +34,5 @@ | @@ -21,4 +34,5 @@ | ||
| 21 | </script> | 34 | </script> |
| 22 | <script type="text/javascript" src="{% static 'third-party/bootstrap/js/bootstrap.min.js' %}"></script> | 35 | <script type="text/javascript" src="{% static 'third-party/bootstrap/js/bootstrap.min.js' %}"></script> |
| 23 | <script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script> | 36 | <script type="text/javascript" src="{% static 'third-party/jquery.cookie.js' %}"></script> |
| 37 | +<script>jQuery.noConflict();</script> | ||
| 24 | {% endblock %} | 38 | {% endblock %} |