Moving style from diazo rules to gitlab theme template

Conflicts: src/proxy/gitlab/diazo.xml

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