From 858afa997dfa859fcfa9953197460612eb55a6e2 Mon Sep 17 00:00:00 2001 From: benweet Date: Tue, 6 May 2014 22:57:44 +0100 Subject: [PATCH] Remove animation on extension buttons --- public/res/helpers/teamserverHelper.js | 2 +- public/res/html/buttonHtmlCode.html | 2 +- public/res/html/buttonMarkdownSyntax.html | 22 +++++++------- public/res/html/buttonStat.html | 2 +- public/res/html/buttonToc.html | 2 +- public/res/layout.js | 35 ----------------------- public/res/styles/base.less | 1 + public/res/styles/main.less | 18 ++++++------ 8 files changed, 25 insertions(+), 59 deletions(-) diff --git a/public/res/helpers/teamserverHelper.js b/public/res/helpers/teamserverHelper.js index e205829e..8eb6a0ac 100644 --- a/public/res/helpers/teamserverHelper.js +++ b/public/res/helpers/teamserverHelper.js @@ -104,7 +104,7 @@ define([ connect(task); authenticate(task); task.onRun(function() { - var url = settings.teamserverURL + '/repo/' + repo + '/changes'; + var url = settings.teamserverURL + '/repo/' + repo + '/changes/'; var type = 'GET'; if(lastChangeId) { url += lastChangeId; diff --git a/public/res/html/buttonHtmlCode.html b/public/res/html/buttonHtmlCode.html index 7e453e3d..9afc636a 100644 --- a/public/res/html/buttonHtmlCode.html +++ b/public/res/html/buttonHtmlCode.html @@ -2,6 +2,6 @@
-

HTML code

+

HTML code

diff --git a/public/res/html/buttonMarkdownSyntax.html b/public/res/html/buttonMarkdownSyntax.html index 555580ba..c1b6c9b4 100644 --- a/public/res/html/buttonMarkdownSyntax.html +++ b/public/res/html/buttonMarkdownSyntax.html @@ -2,16 +2,16 @@
-

Markdown syntax

+

Markdown syntax

-

Phrase Emphasis

+

Phrase Emphasis

*italic*   **bold**
 _italic_   __bold__
-

Links

+

Links

Inline:

@@ -26,7 +26,7 @@ else in the doc, define the link: [id]: http://example.com/ "Title" -

Images

+

Images

Inline (titles are optional):

@@ -40,7 +40,7 @@ else in the doc, define the link: [id]: /url/to/img.jpg "Title" -

Headers

+

Headers

Setext-style:

@@ -60,7 +60,7 @@ Header 2 ###### Header 6 -

Lists

+

Lists

Ordered, without paragraphs:

@@ -89,7 +89,7 @@ Header 2 * Cunning -

Blockquotes

+

Blockquotes

> Email-style angle brackets
 > are used for blockquotes.
@@ -102,7 +102,7 @@ Header 2
 > * Etc.
-

Code Spans

+

Code Spans

`<code>` spans are delimited
 by backticks.
@@ -111,7 +111,7 @@ You can include literal backticks
 like `` `this` ``.
-

Preformatted Code Blocks

+

Preformatted Code Blocks

Indent every line of a code block by at least 4 spaces or 1 tab.

@@ -121,7 +121,7 @@ like `` `this` ``. code block. -

Horizontal Rules

+

Horizontal Rules

Three or more dashes or asterisks:

@@ -132,7 +132,7 @@ like `` `this` ``. - - - - -

Manual Line Breaks

+

Manual Line Breaks

End a line with two or more spaces:

diff --git a/public/res/html/buttonStat.html b/public/res/html/buttonStat.html index ed002a88..5874a5c9 100644 --- a/public/res/html/buttonStat.html +++ b/public/res/html/buttonStat.html @@ -3,7 +3,7 @@
-

Statistics

+

Statistics

diff --git a/public/res/html/buttonToc.html b/public/res/html/buttonToc.html index 75dc56ec..acdcb165 100644 --- a/public/res/html/buttonToc.html +++ b/public/res/html/buttonToc.html @@ -2,7 +2,7 @@
-

Table of contents

+

Table of contents

diff --git a/public/res/layout.js b/public/res/layout.js index d4398acb..06410848 100644 --- a/public/res/layout.js +++ b/public/res/layout.js @@ -518,9 +518,6 @@ define([ previewButtons.initHammer(true); previewButtons.adjustPosition = function() { - if(!previewButtons.isDragged) { - return; - } var minX = -windowSize.width + previewButtons.elt.offsetWidth; var minY = -windowSize.height + previewButtons.elt.offsetHeight; this.x < minX && (this.x = minX); @@ -533,8 +530,6 @@ define([ var buttonsInitialCoord; previewButtons.hammer.on('dragstart', function() { - previewButtons.isDragged = true; - previewButtons.$elt.removeClass('animate'); wrapperL2.$elt.addClass('dragging'); buttonsInitialCoord = { x: previewButtons.x, @@ -607,36 +602,6 @@ define([ previewButtons.y = previewButtonsOffset.y; previewButtons.applyCss(); - function openPreviewButtons() { - clearTimeout(closeTimeoutId); - if(!previewButtons.isDragged) { - previewButtons.x = previewButtonsOffset.x; - previewButtons.applyCss(); - } - } - - var closeTimeoutId; - var dropdownOpen = false; - - function closePreviewButtons() { - clearTimeout(closeTimeoutId); - closeTimeoutId = setTimeout(function() { - if(!previewButtons.isDragged && !dropdownOpen) { - previewButtons.$elt.addClass('animate'); - previewButtons.x = previewButtonsOffset.x + previewButtons.elt.offsetWidth; - previewButtons.applyCss(); - } - }, 3000); - } - - closePreviewButtons(); - previewButtons.$elt.hover(openPreviewButtons, closePreviewButtons).on('show.bs.dropdown', function() { - dropdownOpen = true; - }).on('hidden.bs.dropdown', function() { - dropdownOpen = false; - closePreviewButtons(); - }); - _.each(previewButtons.elt.querySelectorAll('.btn-group'), function(btnGroupElt) { var $btnGroupElt = $(btnGroupElt); $btnGroupElt.on('shown.bs.dropdown', function() { diff --git a/public/res/styles/base.less b/public/res/styles/base.less index 9078c344..e6f5a9bb 100644 --- a/public/res/styles/base.less +++ b/public/res/styles/base.less @@ -114,6 +114,7 @@ h6 { font-size: @title-base-size * 0.85; } h1, h2, h3, h4, h5, h6 { margin: 1.3em 0; + font-weight: 300; } pre { diff --git a/public/res/styles/main.less b/public/res/styles/main.less index bbf20a41..4cbc0243 100644 --- a/public/res/styles/main.less +++ b/public/res/styles/main.less @@ -130,14 +130,14 @@ @popover-arrow-outer-color: @secondary-border-color; @popover-title-bg: @transparent; @alert-border-radius: 0; -@label-warning-bg: spin(darken(@logo-yellow, 4%), -6); -@label-danger-bg: spin(darken(@logo-orange, 4%), -4); -@state-warning-text: spin(darken(@logo-yellow, 14%), -6); -@state-warning-bg: fade(spin(@logo-yellow, -6), 12%); -@state-warning-border: fade(spin(@logo-yellow, -6), 24%); -@state-danger-text: spin(darken(@logo-orange, 18%), -4); -@state-danger-bg: fade(spin(@logo-orange, -4), 10%); -@state-danger-border: fade(spin(@logo-orange, -4), 20%); +@label-warning-bg: spin(darken(@logo-yellow, 4%), -10); +@state-warning-text: spin(darken(@logo-yellow, 14%), -10); +@state-warning-bg: fade(spin(@logo-yellow, -10), 12%); +@state-warning-border: fade(spin(@logo-yellow, -10), 24%); +@label-danger-bg: spin(darken(@logo-orange, 4%), -8); +@state-danger-text: spin(darken(@logo-orange, 18%), -8); +@state-danger-bg: fade(spin(@logo-orange, -8), 10%); +@state-danger-border: fade(spin(@logo-orange, -8), 20%); body { @@ -1371,7 +1371,7 @@ div.dropdown-menu, { color: @link-hover-color; } h1, h2, h3, h4, h5, h6 { - margin: 1em 0; + margin: 0.8em 0; } }