aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Bornand <nicolas74@gmail.com>2014-05-11 13:02:31 +0200
committerNicolas Bornand <nicolas74@gmail.com>2014-05-11 13:02:31 +0200
commit84328523fd78a31f431adaf1b1d488a2c00f2820 (patch)
treea2e20aa6a3a7105d67e471ed46bd4e6701ef521f
parent6298b331e612381bcc8f9e0f5a9fd4042b360a30 (diff)
downloadplayGraph-84328523fd78a31f431adaf1b1d488a2c00f2820.tar.gz
playGraph-84328523fd78a31f431adaf1b1d488a2c00f2820.tar.bz2
playGraph-84328523fd78a31f431adaf1b1d488a2c00f2820.zip
merge css
-rw-r--r--app/css/app.css25
-rw-r--r--app/css/lbarman.css8
-rw-r--r--app/index.html5
3 files changed, 9 insertions, 29 deletions
diff --git a/app/css/app.css b/app/css/app.css
index 1b32625..6bfef93 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -13,28 +13,3 @@
.world .line {
position: absolute;
}
-
-.point {
- position: absolute;
-}
-
-.point > div {
- position: relative;
- border-radius: 50%;
- margin-left: -10px;
- margin-top: -10px;
- width: 20px;
- height: 20px;
- border: solid #aaaaaa 2px;
-}
-
-.point > div:hover {
- margin-left: -15px;
- margin-top: -15px;
- width: 30px;
- height: 30px;
-}
-
-.selected > div {
- background-color: red;
-} \ No newline at end of file
diff --git a/app/css/lbarman.css b/app/css/lbarman.css
index 059ce51..c49e58b 100644
--- a/app/css/lbarman.css
+++ b/app/css/lbarman.css
@@ -30,7 +30,7 @@ body
position: absolute;
}
-.point > div {
+.point > .circle {
position: relative;
border-radius: 50%;
margin-left: -10px;
@@ -41,14 +41,16 @@ body
-webkit-transition: all .2s ease-in-out;
}
-.point > div:hover {
+.point > .circle:hover {
margin-left: -15px;
margin-top: -15px;
+ width: 30px;
+ height: 30px;
-webkit-transform: scale(1.5);
}
-.selected > div {
+.selected > .circle {
background-color: red;
}
#column-left
diff --git a/app/index.html b/app/index.html
index e7a7ea8..a70a4a5 100644
--- a/app/index.html
+++ b/app/index.html
@@ -48,7 +48,10 @@
<div class="world" style="width: 100%; height: 500px;">
<div data-pg-line="line" class="line" resize></div>
- <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></div></div>
+ <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>
</div>
<ul>