Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: btaylor/berserk
base: 7abdbb81cd
...
head fork: btaylor/berserk
compare: 783f7f8f74
Checking mergeability… Don't worry, you can still create the pull request.
  • 4 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
View
10 site_media/berserk/css/screen.css
@@ -392,10 +392,14 @@ img a {
color: #000000;
}
-#timeline-sidebar-detail {
+#timeline-sidebar-spacebox {
background: #FFFFFF url('../images/timeline-detail-arrow.png') top left no-repeat;
+ height: 20px;
+}
+
+#timeline-sidebar-detail {
+ background: #FFFFFF;
margin: 0;
- padding: 10px;
overflow: auto;
}
@@ -453,7 +457,7 @@ img a {
/* iOS-style scrollbar using jquery.scroll */
.scrollbar-pane {
- padding: 10px 18px 10px 10px;
+ padding: 0 18px 10px 10px;
}
.scrollbar-handle {
View
13 site_media/berserk/js/jquery.scroll.js
@@ -265,6 +265,12 @@
// if handle has a border (always be aware of the css box-model), we need to correct the handle height.
this.handle.height(2 * this.handle.height() - this.handle.outerHeight(true));
+ // if this is not the first update, save the handle position as a
+ // percentage of the previous max and min
+ var ratio = 0;
+ if (this.handle.top && this.props.handleTop)
+ ratio = (this.handle.top - this.props.handleTop.min) / this.props.handleTop.max;
+
// min- and max-range for handle
this.props.handleTop = {
min: 0,
@@ -274,8 +280,13 @@
// ratio of handle-container-height to content-container-height (to calculate position of content related to position of handle)
this.props.handleContentRatio = (this.props.contentHeight - this.props.containerHeight) / (this.props.handleContainerHeight - this.props.handleHeight);
- // initial position of handle at top
+ // position of handle at top, reset it if it was set before
this.handle.top = 0;
+ if (ratio > 0)
+ this.handle.top = (ratio * this.props.handleTop.max) + this.props.handleTop.min;
+
+ this.setHandlePosition();
+ this.setContentPosition();
},
View
6 site_media/berserk/js/sidebar.js
@@ -69,15 +69,15 @@ Sidebar.prototype = {
},
_updateSidebarHeight : function () {
- var min = $('#timeline-content-container').offset().top;
+ var min = $('#timeline-event-container').offset().top;
var top = $(window).scrollTop();
- var mod = 45; // TODO: find out why 45 exactly? margins/padding?
+ var mod = 26; // TODO: find out why 26? margins/padding?
if (top < min)
mod += min - top;
$('#timeline-sidebar-detail').css(
- 'height', $(window).height() - $('#timeline-sidebar-event').height() - mod
+ 'height', $(window).height() - $('#timeline-sidebar-event').height() - $('#timeline-sidebar-spacebox').height() - mod
);
// let the scrollbar know that we've resized its container
View
2  timeline/templates/timeline/fogbugz_event_detail.html
@@ -23,7 +23,7 @@
{% for event in events %}
<div class="fogbugz-detail-event">
<div class="fogbugz-detail-description">{{ event.description }} <small>{{ event.date }}</small></div>
- <div class="fogbugz-detail-change">{{ event.changes }}</div>
+ <div class="fogbugz-detail-change">{{ event.changes|linebreaks }}</div>
<div class="fogbugz-detail-html">
{{ event.html|safe }}
</div>
View
1  timeline/templates/timeline/index.html
@@ -46,6 +46,7 @@
<td valign="top">
<div id="timeline-sidebar">
<div id="timeline-sidebar-event"></div>
+ <div id="timeline-sidebar-spacebox"></div>
<div id="timeline-sidebar-detail"></div>
</div>
</td>

No commit comments for this range

Something went wrong with that request. Please try again.