changeset 2810:1839da8e279e

move transclusion overlay css to common.css; enhance mouseover effect fix minor issue caused by css reset
author RogerHaase <haaserd@gmail.com>
date Tue, 07 Oct 2014 09:25:05 -0700
parents 870ac800e15a
children c579c19548a7
files MoinMoin/static/css/common.css MoinMoin/static/js/common.js MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less MoinMoin/themes/modernized/static/css/stylus/theme.styl MoinMoin/themes/modernized/static/css/theme.css
diffstat 6 files changed, 68 insertions(+), 137 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/css/common.css	Mon Oct 06 08:49:25 2014 -0700
+++ b/MoinMoin/static/css/common.css	Tue Oct 07 09:25:05 2014 -0700
@@ -5,6 +5,70 @@
     add a definition here and make suitable minor adjustments in the
     individual css definitions of each theme.
 */
+
+/* transclusion wrapper overlays */
+.moin-transclusion {
+    max-width: 100%;
+}
+.moin-item-wrapper {
+    position: relative;
+    display: inline-block;
+}
+div.moin-item-wrapper {
+    /* force bottom border of transcluded headings to extend across entire page */
+    width: 100%;
+}
+div.moin-item-wrapper,
+div.moin-item-wrapper > div,
+div.moin-item-wrapper > div > p:first-child,
+div.moin-item-wrapper > div > p:last-child {
+    margin: 0;
+}
+div.moin-item-wrapper > div > p:first-child ~ p:last-child {
+    margin-top: 1em;
+}
+a.moin-item-overlay-ul:link,
+a.moin-item-overlay-ul:visited,
+a.moin-item-overlay-ul:active,
+a.moin-item-overlay-lr:link,
+a.moin-item-overlay-lr:visited,
+a.moin-item-overlay-lr:active {
+    color: transparent;
+}
+.moin-item-overlay-ul,
+.moin-item-overlay-lr {
+    display: none;
+    position: absolute;
+    color: transparent;
+    background-color: transparent;
+    font-size: 1.2em;
+    font-weight: bold;
+    margin: 0;
+    opacity: .5;
+    padding: 1px;
+    border-color: #428bca;
+    border-style: double;
+}
+.moin-item-overlay-ul {
+    top: -4px;
+    left: -4px;
+    border-width: 3px 0 0 3px;
+}
+.moin-item-overlay-lr {
+    bottom: -4px;
+    right: -4px;
+    border-width: 0 3px 3px 0;
+}
+a.moin-item-overlay-ul:hover,
+a.moin-item-overlay-ul:hover ~ a.moin-item-overlay-lr,
+a.moin-item-overlay-lr:hover {
+    opacity: .8;
+    background-color: #e1edf7;
+    color: #428bca;
+    text-decoration: none;
+}
+/* end transclusion wrapper overlays */
+
 .moin-suggestions {
     color: #FF9900;
     display: inline;
--- a/MoinMoin/static/js/common.js	Mon Oct 06 08:49:25 2014 -0700
+++ b/MoinMoin/static/js/common.js	Tue Oct 07 09:25:05 2014 -0700
@@ -96,7 +96,8 @@
 MoinMoin.prototype.initTransclusionOverlays = function () {
     "use strict";
     var elem, overlayUL, overlayLR, wrapper, wrappers, transclusions, classes,
-        rightArrow = '\u2192',
+        rightArrow = '\u2198',
+        leftArrow = '\u2196',
         mediaTags = ['OBJECT', 'IMG', 'AUDIO', 'VIDEO' ];
     // get list of elements to be wrapped; must work in reverse order in case there are nested transclusions
     transclusions = $($('.moin-transclusion').get().reverse());
@@ -111,8 +112,9 @@
             }
             overlayUL = $('<a class="moin-item-overlay-ul"></a>');
             $(overlayUL).attr('href', elem.getAttribute('data-href'));
+            overlayLR = $(overlayUL).clone(true);
             $(overlayUL).append(rightArrow);
-            overlayLR = $(overlayUL).clone(true);
+            $(overlayLR).append(leftArrow);
             $(overlayLR).attr('class', 'moin-item-overlay-lr');
             // if the parent of this element is an A, then wrap parent (avoid A's within A's)
             if ($(elem).parent()[0].tagName === 'A') {
--- a/MoinMoin/themes/basic/static/css/theme.css	Mon Oct 06 08:49:25 2014 -0700
+++ b/MoinMoin/themes/basic/static/css/theme.css	Tue Oct 07 09:25:05 2014 -0700
@@ -6787,45 +6787,6 @@
 .moin-quicklink-delete:focus {
   text-decoration: none;
 }
-.moin-transclusion {
-  max-width: 100%;
-}
-.moin-item-wrapper {
-  position: relative;
-  display: inline-block;
-}
-div.moin-item-wrapper {
-  width: 100%;
-}
-.moin-item-overlay-ul,
-.moin-item-overlay-lr {
-  display: none;
-  position: absolute;
-  font-size: 1.2em;
-  font-weight: bold;
-  margin: 0;
-  opacity: .5;
-  padding: 1px;
-  border-color: #428bca;
-  border-style: double;
-}
-.moin-item-overlay-ul {
-  top: -4px;
-  left: -4px;
-  border-width: 3px 0 0 3px;
-}
-.moin-item-overlay-lr {
-  bottom: -4px;
-  right: -4px;
-  border-width: 0 3px 3px 0;
-}
-.moin-item-overlay-ul:hover,
-.moin-item-overlay-lr:hover {
-  opacity: .8;
-  background-color: #e1edf7;
-  color: #428bca;
-  text-decoration: none;
-}
 .comment {
   color: #333333;
   background-color: #e1edf7;
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Mon Oct 06 08:49:25 2014 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Tue Oct 07 09:25:05 2014 -0700
@@ -244,52 +244,9 @@
   }
 }
 
-// transclusion
-.moin-transclusion {
-    max-width: 100%;
-}
-
-.moin-item-wrapper {
-    position: relative;
-    display: inline-block;
-}
-
-div.moin-item-wrapper {
-    width: 100%; // force bottom border of transcluded headings to extend across entire page
-}
 
-.moin-item-overlay-ul,
-.moin-item-overlay-lr {
-    display: none;
-    position: absolute;
-    font-size: 1.2em;
-    font-weight: bold;
-    margin: 0;
-    opacity: .5;
-    padding: 1px;
-    border-color: @link-color;
-    border-style: double;
-}
 
-.moin-item-overlay-ul {
-    top: -4px;
-    left: -4px;
-    border-width: 3px 0 0 3px;
-}
 
-.moin-item-overlay-lr {
-    bottom: -4px;
-    right: -4px;
-    border-width: 0 3px 3px 0;
-}
-
-.moin-item-overlay-ul:hover,
-.moin-item-overlay-lr:hover {
-    opacity: .8;
-    background-color: lighten(@link-color, 40%);
-    color: @link-color;
-    text-decoration: none;
-}
 
 .comment {
   color: @text-color;
--- a/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Mon Oct 06 08:49:25 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Tue Oct 07 09:25:05 2014 -0700
@@ -1394,52 +1394,7 @@
     zoom: 1; // IE7 hack ... rather than a column
     margin 10px 0 10px 10px
 
-.moin-item-wrapper
-    position relative
-    display inline-block
-
-div.moin-item-wrapper
-    width 100% // force bottom border of transcluded headings to extend across entire page
-
-a.moin-item-overlay-ul,
-a.moin-item-overlay-lr
-    display none
-    position absolute
-    color transparent
-    background-color transparent
-    font-size 120%
-    font-weight bold
-    margin 0
-    opacity .5
-    padding 1px
-    border-color blue
-    border-style double
 
-.moin-item-overlay-ul
-    top -4px
-    left -4px
-    border-width 3px 0 0 3px
-
-.moin-item-overlay-lr
-    bottom -4px
-    right -4px
-    border-width 0 3px 3px 0
-
-.moin-item-overlay-ul:hover,
-.moin-item-overlay-lr:hover
-    opacity .8
-    background-color table_bg_color
-    color hover_color
-    text-decoration none
-
-div.moin-item-wrapper,
-div.moin-item-wrapper > div,
-div.moin-item-wrapper > div > p:first-child,
-div.moin-item-wrapper > div > p:last-child
-    margin 0px
-
-div.moin-item-wrapper > div > p:first-child ~ p:last-child
-    margin-top 1em
 
 // headings with mouseover permalinks
 a.moin-permalink
--- a/MoinMoin/themes/modernized/static/css/theme.css	Mon Oct 06 08:49:25 2014 -0700
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Tue Oct 07 09:25:05 2014 -0700
@@ -634,14 +634,6 @@
 #moin-credits span{display:inline-block;margin:0 5px}
 #moin-creditlogos{float:right;list-style:none;margin:5px 10px}
 #moin-creditlogos li{display:inline-block;*display:inline;zoom:1;margin:10px 0 10px 10px}
-.moin-item-wrapper{position:relative;display:inline-block}
-div.moin-item-wrapper{width:100%}
-a.moin-item-overlay-ul,a.moin-item-overlay-lr{display:none;position:absolute;color:transparent;background-color:transparent;font-size:120%;font-weight:bold;margin:0;opacity:.5;padding:1px;border-color:#00f;border-style:double}
-.moin-item-overlay-ul{top:-4px;left:-4px;border-width:3px 0 0 3px}
-.moin-item-overlay-lr{bottom:-4px;right:-4px;border-width:0 3px 3px 0}
-.moin-item-overlay-ul:hover,.moin-item-overlay-lr:hover{opacity:.8;background-color:#eef1f6;color:#1f9ae0;text-decoration:none}
-div.moin-item-wrapper,div.moin-item-wrapper > div,div.moin-item-wrapper > div > p:first-child,div.moin-item-wrapper > div > p:last-child{margin:0}
-div.moin-item-wrapper > div > p:first-child ~ p:last-child{margin-top:1em}
 a.moin-permalink{display:none;cursor:pointer;margin-left:.1em;color:#939393;}
 a.moin-permalink:hover.moin-permalink{color:#1f62ad}
 h1:hover .moin-permalink,h2:hover .moin-permalink,h3:hover .moin-permalink,h4:hover .moin-permalink,h5:hover .moin-permalink,h6:hover .moin-permalink{display:inline;text-decoration:none}