changeset 1560:6b832dfff839

Modernized theme admonitions moved out of main.styl
author Jaiditya Mathur <jaiditya.mathur@gmail.com>
date Tue, 24 Jul 2012 04:43:40 +0530
parents f02a9e83371c
children d20cb2be4ef6
files MoinMoin/themes/modernized/static/css/common.css MoinMoin/themes/modernized/static/css/stylus/admonitions.styl MoinMoin/themes/modernized/static/css/stylus/main.styl
diffstat 3 files changed, 37 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/modernized/static/css/common.css	Tue Jul 24 04:41:56 2012 +0530
+++ b/MoinMoin/themes/modernized/static/css/common.css	Tue Jul 24 04:43:40 2012 +0530
@@ -74,6 +74,13 @@
 .moin-thumbs-up:before { content: url('../img/smileys/thumbs-up.png'); }
 .moin-tired:before { content: url('../img/smileys/tired.png'); }
 .moin-tongue:before { content: url('../img/smileys/tongue.png'); }
+#moin-content div.caution{background-image:url("../img/admonitions/caution.png")}
+#moin-content div.important{background-image:url("../img/admonitions/important.png")}
+#moin-content div.note{background-image:url("../img/admonitions/note.png")}
+#moin-content div.tip{background-image:url("../img/admonitions/tip.png")}
+#moin-content div.warning{background-image:url("../img/admonitions/warning.png")}
+#moin-content div.caution,#moin-content div.important,#moin-content div.note,#moin-content div.tip,#moin-content div.warning{color:#000;background-color:#f9f9ff;background-repeat:no-repeat;background-position:8px 8px;border:1px solid #e5e5e5;margin:10px 30px 10px 30px;min-height:64px;padding-left:64px;clear:both;}
+#moin-content div.caution p,#moin-content div.important p,#moin-content div.note p,#moin-content div.tip p,#moin-content div.warning p{margin-top:8px}
 html{color:#000;font-family:sans-serif}
 div,p{margin:1em 0}
 sub{vertical-align:sub}
@@ -306,13 +313,6 @@
 .center{text-align:center}
 .right{text-align:right}
 .justify{text-align:justify}
-#moin-content div.caution,#moin-content div.important,#moin-content div.note,#moin-content div.tip,#moin-content div.warning{border:1px solid #e5e5e5;background-color:#f9f9ff;background-repeat:no-repeat;background-position:8px 8px;color:#000;margin:10px 30px 10px 30px;min-height:64px;padding-left:64px;clear:both}
-#moin-content div.caution p,#moin-content div.important p,#moin-content div.note p,#moin-content div.tip p,#moin-content div.warning p{margin-top:8px}
-#moin-content div.caution{background-image:url("../img/admonitions/caution.png")}
-#moin-content div.important{background-image:url("../img/admonitions/important.png")}
-#moin-content div.note{background-image:url("../img/admonitions/note.png")}
-#moin-content div.tip{background-image:url("../img/admonitions/tip.png")}
-#moin-content div.warning{background-image:url("../img/admonitions/warning.png")}
 a.moin-www:before,a.moin-http:before,a.moin-https:before{content:url("../img/moin-www.png");margin:0 .2em}
 a.moin-file:before,a.moin-ftp:before{content:url("../img/moin-ftp.png");margin:0 .2em}
 a.moin-nntp:before,a.moin-news:before{content:url("../img/moin-news.png");margin:0 .2em}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/themes/modernized/static/css/stylus/admonitions.styl	Tue Jul 24 04:43:40 2012 +0530
@@ -0,0 +1,27 @@
+// admonitions  - no moin- prefix added  here, these classes are used within pages: {{{#!wiki caution
+
+#moin-content
+    div.caution
+        background-image url("../img/admonitions/caution.png")
+    div.important
+        background-image url("../img/admonitions/important.png")
+    div.note
+        background-image url("../img/admonitions/note.png")
+    div.tip
+        background-image url("../img/admonitions/tip.png")
+    div.warning
+        background-image url("../img/admonitions/warning.png")
+
+    div.caution, div.important, div.note, div.tip, div.warning
+        color black
+        background-color #F9F9FF
+        background-repeat no-repeat
+        background-position 8px 8px
+        border 1px solid #E5E5E5
+        margin 10px 30px 10px 30px
+        min-height 64px
+        padding-left 64px
+        clear both
+        p
+            margin-top 8px  // to align text with big graphic
+
--- a/MoinMoin/themes/modernized/static/css/stylus/main.styl	Tue Jul 24 04:41:56 2012 +0530
+++ b/MoinMoin/themes/modernized/static/css/stylus/main.styl	Tue Jul 24 04:43:40 2012 +0530
@@ -9,6 +9,9 @@
 // smileys used by moin wiki parser (and maybe others)
 @import "smileys.css"
 
+// admonitions used by moin wiki parser (and maybe others)
+@import "admonitions"
+
 html
   color: black
   font-family: sans-serif
@@ -1018,43 +1021,6 @@
 .justify
   text-align: justify
 
-#moin-content div.caution,
-#moin-content div.important,
-#moin-content div.note,
-#moin-content div.tip,
-#moin-content div.warning
-  border: 1px solid #E5E5E5
-  background-color: #F9F9FF
-  background-repeat: no-repeat
-  background-position: 8px 8px
-  color: black
-  margin: 10px 30px 10px 30px
-  min-height: 64px
-  padding-left: 64px
-  clear: both
-
-#moin-content div.caution p,
-#moin-content div.important p,
-#moin-content div.note p,
-#moin-content div.tip p,
-#moin-content div.warning p
-  margin-top: 8px
-
-#moin-content div.caution
-  background-image: url("../img/admonitions/caution.png")
-
-#moin-content div.important
-  background-image: url("../img/admonitions/important.png")
-
-#moin-content div.note
-  background-image: url("../img/admonitions/note.png")
-
-#moin-content div.tip
-  background-image: url("../img/admonitions/tip.png")
-
-#moin-content div.warning
-  background-image: url("../img/admonitions/warning.png")
-
 a.moin-www:before,
 a.moin-http:before,
 a.moin-https:before