diff --git a/css/app.css b/css/app.css index 4b8956b4f..7188a3979 100644 --- a/css/app.css +++ b/css/app.css @@ -2109,9 +2109,12 @@ div.typeahead a:first-child { border-width: 0 5px 5px; } + +/* Exceptions for tooltips that are up against the edge of the screen */ .add-point .tooltip { left: -20px !important; } +.curtain-tooltip.intro-points-add .tooltip-arrow, .add-point .tooltip .tooltip-arrow { left: 60px; } @@ -2332,3 +2335,23 @@ div.typeahead a:first-child { padding: 0; margin: 0; } + +/* Tooltip illustrations */ + +.intro-points-add .tooltip-inner::before, +.intro-areas-add .tooltip-inner::before, +.intro-lines-add .tooltip-inner::before { + display: block; + content: ""; + height: 80px; + width: 200px; + background:transparent url(../img/sprite.png) no-repeat 0px -320px; +} + +.intro-areas-add .tooltip-inner::before { + background-position: 0px -400px; +} + +.intro-lines-add .tooltip-inner::before { + background-position: 0px -480px; +} diff --git a/img/source/sprite.svg b/img/source/sprite.svg index 674f560c8..04c98e1f4 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -10,7 +10,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="600" - height="320" + height="560" id="svg12393" version="1.1" inkscape:version="0.48.2 r9819" @@ -39,15 +39,15 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="30.966568" - inkscape:cy="129.65104" + inkscape:cx="123.01675" + inkscape:cy="143.33432" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="false" inkscape:window-width="1483" inkscape:window-height="804" - inkscape:window-x="131" - inkscape:window-y="17" + inkscape:window-x="287" + inkscape:window-y="65" inkscape:window-maximized="0" fit-margin-top="0" fit-margin-left="0" @@ -69,136 +69,148 @@ snapvisiblegridlinesonly="true" /> + + + @@ -436,7 +448,7 @@ id="rect7320-0" style="color:#000000;fill:#e2e9ff;fill-opacity:1;fill-rule:nonzero;stroke:#e2e9ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#bbcaff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + style="fill:#c1c1c1;fill-opacity:1;display:inline" + id="g5401-6" + transform="matrix(2,0,0,2,-816,-123.72437)"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -1481,7 +1473,7 @@ transform="translate(10.000004,-1.9999957)"> @@ -1515,11 +1507,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)" /> @@ -1571,11 +1563,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)" /> @@ -1655,11 +1647,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)" /> @@ -1705,7 +1697,7 @@ transform="translate(10.000004,-1.9999957)"> @@ -1739,11 +1731,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)" /> @@ -1795,11 +1787,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,15.371188)" /> @@ -1894,11 +1886,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-410.98649,14.371188)" /> @@ -1944,7 +1936,7 @@ transform="translate(10.000004,-1.9999957)"> @@ -1978,11 +1970,11 @@ sodipodi:cy="-129.34375" sodipodi:rx="3.46875" sodipodi:ry="3.46875" - d="m 106.03125,-129.34375 c 0,1.91574 -1.55301,3.46875 -3.46875,3.46875 -1.91574,0 -3.46875,-1.55301 -3.46875,-3.46875 0,-1.91574 1.55301,-3.46875 3.46875,-3.46875 1.91574,0 3.46875,1.55301 3.46875,3.46875 z" + d="m 106.03125,-129.34375 a 3.46875,3.46875 0 1 1 -6.9375,0 3.46875,3.46875 0 1 1 6.9375,0 z" transform="matrix(1.009009,0,0,1.009009,-411.98649,15.371188)" /> - + inkscape:connector-curvature="0" /> - + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> - - - + id="g7659" /> - - - + transform="translate(-28,28)" /> - - - + transform="translate(1.625,1.3749969)" /> - - - + id="g7694" /> - - - + id="g7700" /> - - - + transform="translate(-25.375,-25.625003)" /> + id="path4227" + inkscape:connector-curvature="0" /> + + id="path8377" + d="M 195.00001,351 C 186.7158,351 180,357.71573 180,366.00001 180,374.28428 195.00001,387 195.00001,387 195.00001,387 210,374.28428 210,366.00001 210,357.71573 203.2842,351 195.00001,351 z" + style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/sprite.png b/img/sprite.png index fb6b7434c..3bc86e5fc 100644 Binary files a/img/sprite.png and b/img/sprite.png differ diff --git a/img/sprite2x.png b/img/sprite2x.png index 4a9fe39c4..30d7716f4 100644 Binary files a/img/sprite2x.png and b/img/sprite2x.png differ