[css] use h* title properties from uiprops in cubicweb.old.css (closes #1931476) stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 16 Sep 2011 12:48:02 +0200
branchstable
changeset 7799 6f84279e0718
parent 7793 8a330017ca4d
child 7804 814fb7f379a3
[css] use h* title properties from uiprops in cubicweb.old.css (closes #1931476) + minor cleanup of cubicweb.css
web/data/cubicweb.css
web/data/cubicweb.old.css
web/data/uiprops.py
--- a/web/data/cubicweb.css	Thu Sep 15 08:34:31 2011 +0200
+++ b/web/data/cubicweb.css	Fri Sep 16 12:48:02 2011 +0200
@@ -20,38 +20,30 @@
 /* got rhythm ? beat of 12*1.25 = 15 px */
 .rhythm_bg { background: url("%(baseRhythmBg)s") repeat ! important; }
 
-/* scale 3:5 stranded */
-/* h1 { font-size:2em; } */
-/* h2 { font-size:1.61538em; } */
-/* h3 { font-size:1.23077em; } */
-
-/* scale le corbusier */
-/* h1 { font-size:2.11538em; } */
-/* h2 { font-size:1.61538em; } */
-/* h3 { font-size:1.30769em; } */
-
-/* scale traditional */
-h1,
-.vtitle { font-size: %(h1FontSize)s; }
-h2 { font-size: %(h2FontSize)s; }
-h3 { font-size: %(h3FontSize)s; }
-
-/* paddings */
 h1,
 .vtitle {
+  font-size: %(h1FontSize)s;
   border-bottom: %(h1BorderBottomStyle)s;
   padding: %(h1Padding)s;
   margin: %(h1Margin)s;
   color: %(h1Color)s;
 }
 
+h2 {
+  font-size: %(h2FontSize)s;
+  padding: %(h2Padding)s;
+}
+
+h3 {
+  font-size: %(h3FontSize)s;
+  padding: %(h3Padding)s;
+}
+
 div.tabbedprimary + h1,
 h1.plain {
  border-bottom: none;
 }
 
-h2 { padding: %(h2Padding)s; }
-h3 { padding: %(h3Padding)s; }
 
 html, body {
   background: %(pageBgColor)s;
--- a/web/data/cubicweb.old.css	Thu Sep 15 08:34:31 2011 +0200
+++ b/web/data/cubicweb.old.css	Fri Sep 16 12:48:02 2011 +0200
@@ -24,7 +24,7 @@
 
 h1,
 .vtitle {
-  font-size: 188%;
+  font-size: %(h1FontSize)s;
   margin: 0.2em 0px 0.3em;
   border-bottom: 1px solid #000;
 }
@@ -35,11 +35,11 @@
 }
 
 h2 {
-  font-size: 135%;
+  font-size: %(h2FontSize)s;
 }
 
 h3 {
-  font-size: 130%;
+  font-size: %(h3FontSize)s;
 }
 
 h4 {
--- a/web/data/uiprops.py	Thu Sep 15 08:34:31 2011 +0200
+++ b/web/data/uiprops.py	Fri Sep 16 12:48:02 2011 +0200
@@ -77,6 +77,17 @@
 headerBgColor = '#ff7700'
 headerBg = lazystr('%(headerBgColor)s url("banner.png") repeat-x top left')
 
+
+# scale 3:5 stranded
+# h1 { font-size:2em; }
+# h2 { font-size:1.61538em; }
+# h3 { font-size:1.23077em; }
+#
+# scale le corbusier */
+# h1 { font-size:2.11538em; }
+# h2 { font-size:1.61538em; }
+# h3 { font-size:1.30769em; }
+
 # h
 h1FontSize = '1.5em' # 18px
 h1Padding = '0 0 0.14em 0 '