aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bornand <nicolas74@gmail.com>2014-05-11 13:16:08 +0200
committerNicolas Bornand <nicolas74@gmail.com>2014-05-11 13:16:08 +0200
commit17444bc53876df25c17c62493fd1000e6d617659 (patch)
treecef7421e812bd9d62e238687b07e0d5b72fea369
parent84328523fd78a31f431adaf1b1d488a2c00f2820 (diff)
downloadplayGraph-17444bc53876df25c17c62493fd1000e6d617659.tar.gz
playGraph-17444bc53876df25c17c62493fd1000e6d617659.tar.bz2
playGraph-17444bc53876df25c17c62493fd1000e6d617659.zip
song label
-rw-r--r--app/css/app.css2
-rw-r--r--app/css/lbarman.css12
-rw-r--r--app/data.json12
-rw-r--r--app/index.html2
4 files changed, 22 insertions, 6 deletions
diff --git a/app/css/app.css b/app/css/app.css
index 6bfef93..f70614d 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -12,4 +12,4 @@
.world .line {
position: absolute;
-}
+} \ No newline at end of file
diff --git a/app/css/lbarman.css b/app/css/lbarman.css
index c49e58b..c565e40 100644
--- a/app/css/lbarman.css
+++ b/app/css/lbarman.css
@@ -53,6 +53,18 @@ body
.selected > .circle {
background-color: red;
}
+.point > .songLabel p{
+ position: relative;
+ left:25px;
+ top:-30px;
+ color:#aaaaaa;
+ display: none;
+ font-size: 22px;
+}
+.point:hover > .songLabel p{
+ display: block;
+}
+
#column-left
{
width:300px;
diff --git a/app/data.json b/app/data.json
index ea4e559..f2fd332 100644
--- a/app/data.json
+++ b/app/data.json
@@ -2,19 +2,23 @@
"points": [
{
"x": 10,
- "y": 20
+ "y": 20,
+ "label":"offspring"
},
{
"x": 30,
- "y": 30
+ "y": 30,
+ "label":"gunther"
},
{
"x": 50,
- "y": 25
+ "y": 25,
+ "label":"gunther"
},
{
"x": 60,
- "y": 200
+ "y": 200,
+ "label":"offspring"
},
{
"x": 90,
diff --git a/app/index.html b/app/index.html
index a70a4a5..d4433a3 100644
--- a/app/index.html
+++ b/app/index.html
@@ -50,7 +50,7 @@
<div data-ng-repeat="point in points" data-pg-draggable="point" class="point" style="top: {{point.y}}px; left: {{point.x}}px;" data-ng-class="{selected: point.selected==true}">
<div class="circle"></div>
- <div></div>
+ <div class="songLabel"><p>test</p></div>
</div>
</div>