Skip to content

Commit

Permalink
bump & build
Browse files Browse the repository at this point in the history
  • Loading branch information
michelson committed Jun 17, 2016
1 parent 4aef054 commit 6afec5e
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
dante-editor (0.1.4)
dante-editor (0.1.5)

GEM
remote: http://rubygems.org/
Expand Down Expand Up @@ -140,4 +140,4 @@ DEPENDENCIES
wdm (~> 0.1.0)

BUNDLED WITH
1.10.6
1.11.2
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name" : "dante",
"description": "Just another Medium editor clone.",
"homepage": "michelson.github.io/Dante/",
"version" : "0.1.4",
"version" : "0.1.5",
"keywords": [
"css",
"sass",
Expand Down
35 changes: 30 additions & 5 deletions dist/css/dante-editor.css
Original file line number Diff line number Diff line change
Expand Up @@ -435,16 +435,16 @@
pointer-events: auto; }
.inlineTooltip.is-scaled {
-webkit-transition-delay: 0;
transition-delay: 0; }
transition-delay: 0;
width: auto; }

.inlineTooltip-menu {
width: 178px; }
.inlineTooltip-menu button {
margin-right: 9px; }
display: inline-block;
margin-left: 54px; }

.inlineTooltip-button {
float: left;
margin-right: 22px;
margin-right: 9px;
display: inline-block;
position: relative;
outline: 0;
Expand Down Expand Up @@ -490,6 +490,27 @@
transform: scale(1);
-webkit-transition: -webkit-transform 250ms, 100ms border-color, 100ms color;
transition: transform 250ms, 100ms border-color, 100ms color; }
.inlineTooltip-button.scale:nth-child(11) {
-webkit-transition-delay: 300ms;
transition-delay: 300ms; }
.inlineTooltip-button.scale:nth-child(10) {
-webkit-transition-delay: 270ms;
transition-delay: 270ms; }
.inlineTooltip-button.scale:nth-child(9) {
-webkit-transition-delay: 240ms;
transition-delay: 240ms; }
.inlineTooltip-button.scale:nth-child(8) {
-webkit-transition-delay: 210ms;
transition-delay: 210ms; }
.inlineTooltip-button.scale:nth-child(7) {
-webkit-transition-delay: 180ms;
transition-delay: 180ms; }
.inlineTooltip-button.scale:nth-child(6) {
-webkit-transition-delay: 150ms;
transition-delay: 150ms; }
.inlineTooltip-button.scale:nth-child(5) {
-webkit-transition-delay: 120ms;
transition-delay: 120ms; }
.inlineTooltip-button.scale:nth-child(4) {
-webkit-transition-delay: 90ms;
transition-delay: 90ms; }
Expand All @@ -499,6 +520,10 @@
.inlineTooltip-button.scale:nth-child(2) {
-webkit-transition-delay: 30ms;
transition-delay: 30ms; }
.inlineTooltip-button.control {
display: block;
position: absolute;
margin-right: 22px; }
.inlineTooltip-button.control {
-webkit-transition: -webkit-transform 100ms, 100ms border-color, 100ms color;
transition: transform 100ms, 100ms border-color, 100ms color;
Expand Down
25 changes: 17 additions & 8 deletions dist/js/dante-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
defaults: {
image_placeholder: '../images/dante/media-loading-placeholder.png'
},
version: "0.1.4"
version: "0.1.5"
};

}).call(this);
Expand Down Expand Up @@ -2992,8 +2992,17 @@
};

Tooltip.prototype.render = function() {
$(this.el).html(this.template());
$(this.el).addClass("is-active");
var tooltip, tooltip_button_size, tooltip_button_spacing, tooltip_button_width, tooltip_buttons, tooltip_menu, tooltip_menu_size;
tooltip = $(this.el);
tooltip.html(this.template());
tooltip.addClass("is-active");
tooltip_menu = tooltip.find(".inlineTooltip-menu");
tooltip_buttons = tooltip_menu.find(".inlineTooltip-button");
tooltip_button_width = $(tooltip_buttons[0]).css("width");
tooltip_button_spacing = $(tooltip_buttons[0]).css("margin-right");
tooltip_button_size = parseInt(tooltip_button_width.replace(/px/, "")) + parseInt(tooltip_button_spacing.replace(/px/, ""));
tooltip_menu_size = tooltip_button_size * tooltip_buttons.length;
tooltip_menu.css("width", "" + (tooltip_menu_size + 1) + "px");
return this;
};

Expand Down Expand Up @@ -3214,15 +3223,16 @@
};

PopOverTypeAhead.prototype.positionAt = function(target) {
var left_value, popover_width, target_height, target_offset, target_positions, target_width, top_value;
var left_value, popover_width, target_height, target_offset, target_positions, target_width, top_value, wrapperOffset;
target = $(target);
wrapperOffset = target.closest('article.postArticle').offset();
target_positions = this.resolveTargetPosition(target);
target_offset = target.offset();
target_width = target.outerWidth();
target_height = target.outerHeight();
popover_width = this.findElement().outerWidth();
top_value = target_positions.top + target_height;
left_value = target_offset.left + (target_width / 2) - (popover_width / 2);
left_value = target_offset.left + (target_width / 2) - (popover_width / 2) - wrapperOffset.left;
this.findElement().css("top", top_value).css("left", left_value).show();
return this.handleDirection(target);
};
Expand Down Expand Up @@ -3447,16 +3457,15 @@
};

ImageTooltip.prototype.positionPopOver = function(target) {
var left_value, pad_top, popover_width, target_height, target_offset, target_position, target_width, top_value, wrapperOffset;
wrapperOffset = target.closest('article.postArticle').offset();
var left_value, pad_top, popover_width, target_height, target_offset, target_position, target_width, top_value;
target_offset = target.offset();
target_position = target.parent().position();
target_width = target.outerWidth();
target_height = target.outerHeight();
popover_width = this.findElement().outerWidth();
pad_top = this.findSelectedImage().hasClass("graf--layoutOutsetLeft") ? 72 : 74;
top_value = target_position.top - pad_top;
left_value = target_offset.left + (target_width / 2) - (popover_width / 2) - wrapperOffset.left;
left_value = target_offset.left + (target_width / 2) - (popover_width / 2);
this.findElement().css("top", top_value).css("left", left_value).show().addClass("is-active");
return this.handleActiveClass();
};
Expand Down
2 changes: 1 addition & 1 deletion lib/dante-editor/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require "dante-editor/version"

module DanteEditor
VERSION = "0.1.4"
VERSION = "0.1.5"
end

0 comments on commit 6afec5e

Please sign in to comment.