Skip to content
Browse files

good start to luna

  • Loading branch information...
1 parent 4643467 commit 9734499cf8f9b79c51c71b3709af8d9e7eb5c694 @timeglider committed Jun 16, 2012
View
11 js/timeglider/TG_TimelineView.js
@@ -209,7 +209,7 @@ tg.TG_TimelinePlayer = function (widget, mediator) {
- this.timelineModal = tg.TG_Timeline.extend({
+ this.timelineModal = Backbone.View.extend({
tagName: "div",
@@ -2462,7 +2462,8 @@ tg.TG_TimelinePlayer.prototype = {
var alti = me.imageLaneHeight,
$div = $(this),
- $tb = $div.parent().parent(); // closest(".titleBar");
+ $tb = $div.closest(".tg-timeline-envelope");
+ // debug.log("$tb:", $tb.attr("class"))
$img = $(this).find("img"),
yoff = 12,
@@ -2483,9 +2484,9 @@ tg.TG_TimelinePlayer.prototype = {
$div.css({"display":"block"})
.position({
my: "top",
- at: "top",
- of: $(CONTAINER),
- offset: "0, " + yoff
+ at: "bottom",
+ of: $tb,
+ offset: "0, 28"
})
.css({left:0});
View
42 js/timeglider/Timeglider.css
@@ -102,6 +102,27 @@
z-index:10;
}
+
+.timeline-title-span {
+ float:left;
+ display:block;
+
+}
+
+
+
+.tg-timeline-env-buttons {
+ float:left;
+ color:pink;
+ cursor:pointer;
+ font-size:10px;
+ margin-left:16px;
+ font-weight:normal;
+ text-shadow:none;
+}
+
+
+
/* Correction of aristo ui css */
.ui-slider-vertical .ui-slider-handle {
left:0;margin-left: -.6em; margin-bottom: -.6em;
@@ -415,27 +436,6 @@
position:absolute;
}
-.tg-timeline-env-buttons {
- color:#FFF;
- cursor:pointer;
- font-size:10px;
- margin-top:4px;
- background-color:#555;
- font-weight:normal;
- padding:2px 0 2px 6px;
-
- -webkit-border-bottom-right-radius: 4px;
- -webkit-border-bottom-left-radius: 4px;
- -moz-border-radius-bottomright: 4px;
- -moz-border-radius-bottomleft: 4px;
- border-bottom-right-radius: 4px;
- border-bottom-left-radius: 4px;
-
- width:112px;
- text-shadow:none;
-
-}
-
.tg-timeline-env-buttons .expand-collapse, .tg-timeline-env-buttons .timeline-info {
margin-right:12px;
View
2 js/timeglider/timeglider.timeline.widget.js
@@ -60,7 +60,7 @@
display_zoom_level:true,
constrain_to_data:false,
boost:0,
- tick_top:'',
+ tick_top:0,
event_modal:{href:'', type:'default'},
event_overflow:"plus" // plus | scroll
},
View
1 json_tests/idaho.json
@@ -5,6 +5,7 @@
"focus_date": "1981-07-01 12:00",
"initial_zoom": "45",
"color": "#82530d",
+ "description":"yes",
"size_importance": "true",
"events":
[
View
5 large.html
@@ -23,10 +23,7 @@
margin:16px 32px;
font-size:18px;
}
-
- .tg-timeline-env-buttons {
- display:none;
- }
+
.intro {
margin-left:32px;

0 comments on commit 9734499

Please sign in to comment.
Something went wrong with that request. Please try again.