From 6871bc0bcbe70b933380d94647e6535488e237c2 Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Fri, 12 Jul 2013 16:04:21 +0200 Subject: [PATCH 1/9] Removed test header --- pages/forms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/forms.html b/pages/forms.html index 8930c3c..4f0971c 100644 --- a/pages/forms.html +++ b/pages/forms.html @@ -56,7 +56,7 @@

Special handling for inputs when using Smallipop


-

Special support for form elements

+

Special support for form elements

Smallipop will appear when form elements are focused and From 75242304b937ca2504c924fc1fb5e5977d8ba78f Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Sun, 14 Jul 2013 14:15:10 +0200 Subject: [PATCH 2/9] Fixed first click prevention when triggerOnClick is used or touch events. Some refactoring. --- index.html | 2 ++ lib/jquery.smallipop.js | 12 ++++++------ src/coffee/jquery.smallipop.coffee | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index 306b119..fa8b44b 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,8 @@ Documentation - Smallipop + + diff --git a/lib/jquery.smallipop.js b/lib/jquery.smallipop.js index 8909913..e2776c4 100644 --- a/lib/jquery.smallipop.js +++ b/lib/jquery.smallipop.js @@ -1,5 +1,5 @@ /*! -Smallipop (06/21/2013) +Smallipop (07/12/2013) Copyright (c) 2011-2013 Small Improvements (http://www.small-improvements.com) Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. @@ -14,7 +14,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice return factory(jQuery); } })(function($) { - var $document, $overlay, $window, classAlignLeft, classAlignRight, classBase, classBottom, classContent, classHint, classInitialized, classInstance, classLeft, classRight, classTheme, classTour, classTourClose, classTourCloseIcon, classTourContent, classTourFooter, classTourNext, classTourOverlay, classTourPrev, classTourProgress, cssAnimationsEnabled, currentTour, dataBeingShown, dataIsTour, dataPopupHovered, dataPosition, dataShown, dataTimerHide, dataTimerShow, dataTriggerHovered, dataXDistance, dataYDistance, dataZIndex, destroy, eventBlur, eventClick, eventFocus, eventKeyUp, eventMouseOut, eventMouseOver, eventResize, eventScroll, eventTouchEnd, fadeInPopup, fadeInPopupFinished, filterAlignmentClass, filterBaseClass, filterClass, forceRefreshPosition, getInstance, getOverlay, getTrigger, hideSmallipop, hideTourOverlay, instances, isElementFixed, killTimers, lastId, lastScrollCheck, nextInstanceId, onWindowKeyUp, onWindowScroll, popupTemplate, queueRefreshPosition, reAlignmentClass, reBaseClass, refreshPosition, refreshQueueTimer, resetTourZIndices, runTour, scrollTimer, setContent, showPopup, showSmallipop, showWhenVisible, sip, touchEnabled, tourClose, tourNext, tourPrev, tourShow, tours, triggerMouseout, triggerMouseover; + var $document, $overlay, $window, classAlignLeft, classAlignRight, classBase, classBottom, classContent, classHint, classInitialized, classInstance, classLeft, classRight, classTheme, classTour, classTourClose, classTourCloseIcon, classTourContent, classTourFooter, classTourNext, classTourOverlay, classTourPrev, classTourProgress, cssAnimationsEnabled, currentTour, dataBeingShown, dataIsTour, dataPopupHovered, dataPosition, dataShown, dataTimerHide, dataTimerShow, dataTriggerHovered, dataXDistance, dataYDistance, dataZIndex, destroy, eventBlur, eventClick, eventFocus, eventKeyUp, eventMouseOut, eventMouseOver, eventResize, eventScroll, eventTouchEnd, fadeInPopup, fadeInPopupFinished, filterAlignmentClass, filterBaseClass, filterClass, forceRefreshPosition, getInstance, getOverlay, getTrigger, hideSmallipop, hideTourOverlay, instances, isElementFixed, killTimers, lastId, lastScrollCheck, nextInstanceId, onClickTrigger, onWindowKeyUp, onWindowScroll, popupTemplate, queueRefreshPosition, reAlignmentClass, reBaseClass, refreshPosition, refreshQueueTimer, resetTourZIndices, runTour, scrollTimer, setContent, showPopup, showWhenVisible, sip, touchEnabled, tourClose, tourNext, tourPrev, tourShow, tours, triggerMouseout, triggerMouseover; classBase = 'smallipop'; classHint = classBase + '-hint'; classInstance = classBase + '-instance'; @@ -230,13 +230,13 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice } return _results; }; - showSmallipop = function(e) { + onClickTrigger = function(e) { var triggerData, _ref; triggerData = $(this).data(classBase); if (!triggerData) { return; } - if (triggerData.popupInstance.data(dataShown) !== triggerData.id && ((_ref = !triggerData.type) === 'checkbox' || _ref === 'radio')) { + if (triggerData.popupInstance.data(dataShown) !== triggerData.id && ((_ref = !triggerData.type) !== 'checkbox' && _ref !== 'radio')) { if (e != null) { e.preventDefault(); } @@ -729,7 +729,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice if (typeof options === 'string') { switch (options.toLowerCase()) { case 'show': - showSmallipop.call(this.first().get(0)); + triggerMouseover.call(this.first().get(0)); break; case 'hide': hideSmallipop(this.first().get(0)); @@ -804,7 +804,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice triggerEvents[eventMouseOut] = triggerMouseout; } if (triggerOptions.triggerOnClick || touchTrigger) { - triggerEvents[eventClick] = showSmallipop; + triggerEvents[eventClick] = onClickTrigger; } else { triggerEvents[eventClick] = triggerMouseout; triggerEvents[eventMouseOver] = triggerMouseover; diff --git a/src/coffee/jquery.smallipop.coffee b/src/coffee/jquery.smallipop.coffee index 078e62a..edbcd21 100644 --- a/src/coffee/jquery.smallipop.coffee +++ b/src/coffee/jquery.smallipop.coffee @@ -232,12 +232,12 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice triggerOptions.onAfterHide?() - showSmallipop= (e) -> + onClickTrigger = (e) -> triggerData = $(@).data classBase return unless triggerData if triggerData.popupInstance.data(dataShown) isnt triggerData.id \ - and not triggerData.type in ['checkbox', 'radio'] + and not triggerData.type not in ['checkbox', 'radio'] e?.preventDefault() triggerMouseover.call @ @@ -734,7 +734,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice # Handle direct method calls if typeof(options) is 'string' switch options.toLowerCase() - when 'show' then showSmallipop.call @first().get(0) + when 'show' then triggerMouseover.call @first().get(0) when 'hide' then hideSmallipop @first().get(0) when 'destroy' then destroy @ when 'tour' then runTour @first(), hint @@ -814,7 +814,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice # Check whether the trigger should activate smallipop by click or hover if triggerOptions.triggerOnClick or touchTrigger - triggerEvents[eventClick] = showSmallipop + triggerEvents[eventClick] = onClickTrigger else triggerEvents[eventClick] = triggerMouseout triggerEvents[eventMouseOver] = triggerMouseover From 9d5142b9b123aeaee95f9fd614e2185fa4362d0c Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Thu, 5 Sep 2013 18:18:49 +0200 Subject: [PATCH 3/9] Working on new version --- index.html | 2 +- lib/jquery.smallipop.js | 4 ++-- pages/forms.html | 4 +++- pages/methods.html | 4 +++- pages/options.html | 4 +++- pages/tours.html | 4 +++- smallipop.jquery.json | 2 +- src/coffee/jquery.smallipop.coffee | 4 ++-- src/coffee/main.coffee | 2 +- 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/index.html b/index.html index fa8b44b..acb779c 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@

Smallipop - A versatile jQuery plugin for displaying beautiful tooltips and interactive tours

- Version 0.6.1 - + Version 0.6.2 - Created by Sebastian Helzle for Small Improvements

diff --git a/lib/jquery.smallipop.js b/lib/jquery.smallipop.js index e2776c4..3ce77cd 100644 --- a/lib/jquery.smallipop.js +++ b/lib/jquery.smallipop.js @@ -1,5 +1,5 @@ /*! -Smallipop (07/12/2013) +Smallipop (07/14/2013) Copyright (c) 2011-2013 Small Improvements (http://www.small-improvements.com) Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. @@ -70,7 +70,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice refreshQueueTimer = null; popupTemplate = "
"; $.smallipop = sip = { - version: '0.6.1', + version: '0.6.2', defaults: { autoscrollPadding: 200, contentAnimationSpeed: 150, diff --git a/pages/forms.html b/pages/forms.html index 4f0971c..cdb1271 100644 --- a/pages/forms.html +++ b/pages/forms.html @@ -2,7 +2,9 @@ Form handling - Smallipop - + + + diff --git a/pages/methods.html b/pages/methods.html index cac53ca..5367793 100644 --- a/pages/methods.html +++ b/pages/methods.html @@ -2,7 +2,9 @@ Methods - Smallipop - + + + diff --git a/pages/options.html b/pages/options.html index 0520d98..0bd3240 100644 --- a/pages/options.html +++ b/pages/options.html @@ -2,7 +2,9 @@ Options - Smallipop - + + + diff --git a/pages/tours.html b/pages/tours.html index e896ac5..90d4edc 100644 --- a/pages/tours.html +++ b/pages/tours.html @@ -2,7 +2,9 @@ Creating a tour - Smallipop - + + + diff --git a/smallipop.jquery.json b/smallipop.jquery.json index 0ba0498..666addb 100644 --- a/smallipop.jquery.json +++ b/smallipop.jquery.json @@ -1,6 +1,6 @@ { "name": "smallipop", - "version": "0.6.1", + "version": "0.6.2", "title": "jQuery Smallipop", "description": "A versatile jQuery plugin for displaying beautiful tooltips and interactive tours", "homepage": "http://projects.sebastianhelzle.net/jquery.smallipop", diff --git a/src/coffee/jquery.smallipop.coffee b/src/coffee/jquery.smallipop.coffee index edbcd21..fff5b5d 100644 --- a/src/coffee/jquery.smallipop.coffee +++ b/src/coffee/jquery.smallipop.coffee @@ -1,5 +1,5 @@ ###! -Smallipop (07/12/2013) +Smallipop (07/14/2013) Copyright (c) 2011-2013 Small Improvements (http://www.small-improvements.com) Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) license. @@ -86,7 +86,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice popupTemplate = "
" $.smallipop = sip = - version: '0.6.1' + version: '0.6.2' defaults: autoscrollPadding: 200 contentAnimationSpeed: 150 diff --git a/src/coffee/main.coffee b/src/coffee/main.coffee index dcf839a..157329b 100644 --- a/src/coffee/main.coffee +++ b/src/coffee/main.coffee @@ -10,7 +10,7 @@ requirejs.config piwik: "https://tracking.sebastianhelzle.net/piwik" # Load modernizr and the demo initialization module -requirejs ['jquery', 'prettify', 'piwik', 'smallipop'], ($) -> +requirejs ['jquery', 'prettify', 'smallipop', 'piwik'], ($) -> # Floating side menu sideMenu = $ '.side-menu' sideMenuItems = $ 'a', sideMenu From 2ababe1ca3ecf6fd1fbb5dd3ec05c78e2e0b24c7 Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Sat, 19 Oct 2013 12:57:41 +0200 Subject: [PATCH 4/9] smallipopHint element can be wrapped --- src/coffee/jquery.smallipop.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coffee/jquery.smallipop.coffee b/src/coffee/jquery.smallipop.coffee index fff5b5d..ddd5354 100644 --- a/src/coffee/jquery.smallipop.coffee +++ b/src/coffee/jquery.smallipop.coffee @@ -760,7 +760,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice # If it's inline markup, create a deep copy of the hint html objHint = hint or $self.attr('title') - $objInfo = $ "> .#{options.infoClass}:first", $self + $objInfo = $ ".#{options.infoClass}:first", $self if $objInfo.length objHint = $objInfo.clone(true, true).removeClass options.infoClass From 443a700abff2a3562a920c6aae85399f7201cfe1 Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Sat, 19 Oct 2013 14:36:22 +0200 Subject: [PATCH 5/9] Fixed setContent example. Fixes #39 --- lib/main.js | 6 +++--- pages/options.html | 4 ++-- src/coffee/main.coffee | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/main.js b/lib/main.js index cade24e..2df6157 100644 --- a/lib/main.js +++ b/lib/main.js @@ -14,7 +14,7 @@ requirejs.config({ } }); -requirejs(['jquery', 'prettify', 'piwik', 'smallipop'], function($) { +requirejs(['jquery', 'prettify', 'smallipop', 'piwik'], function($) { var currentSideMenuItem, lastSideMenuY, piwikTracker, sideMenu, sideMenuItems, sideMenuMinY; sideMenu = $('.side-menu'); sideMenuItems = $('a', sideMenu); @@ -122,10 +122,10 @@ requirejs(['jquery', 'prettify', 'piwik', 'smallipop'], function($) { }); $('#tipChangeContent').smallipop({ onAfterShow: function(trigger) { - return $.smallipop.setContent(trigger, "I'm the new content and I have replaced the old boring content!"); + return trigger.smallipop('update', "I'm the new content and I have replaced the old boring content!"); }, onBeforeHide: function(trigger) { - return $.smallipop.setContent(trigger, "Bye bye"); + return trigger.smallipop('update', "Bye bye"); } }); $('#tipCSSAnimated').smallipop({ diff --git a/pages/options.html b/pages/options.html index 0bd3240..4acecdc 100644 --- a/pages/options.html +++ b/pages/options.html @@ -329,10 +329,10 @@
Change content on the fly and use callbacks
<script type="text/javascript"> $('#tipChangeContent').smallipop({ onAfterShow: function(trigger) { - $.smallipop.setContent("I'm the new content and replaced the old boring content!"); + trigger.smallipop('update', "I'm the new content and I have replaced the old boring content!"); }, onBeforeHide: function(trigger) { - $.smallipop.setContent("Bye bye"); + trigger.smallipop('update', "Bye bye"); } }); </script> diff --git a/src/coffee/main.coffee b/src/coffee/main.coffee index 157329b..876a08f 100644 --- a/src/coffee/main.coffee +++ b/src/coffee/main.coffee @@ -110,9 +110,9 @@ requirejs ['jquery', 'prettify', 'smallipop', 'piwik'], ($) -> $('#tipChangeContent').smallipop onAfterShow: (trigger) -> - $.smallipop.setContent trigger, "I'm the new content and I have replaced the old boring content!" + trigger.smallipop 'update', "I'm the new content and I have replaced the old boring content!" onBeforeHide: (trigger) -> - $.smallipop.setContent trigger, "Bye bye" + trigger.smallipop 'update', "Bye bye" $('#tipCSSAnimated').smallipop cssAnimations: From 5040e0af3f9a8d1ba6753bdd222cd5a569ca55e0 Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Sat, 19 Oct 2013 14:37:03 +0200 Subject: [PATCH 6/9] Added separate compile task to gruntfile --- Gruntfile.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index af96d96..d143169 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -67,6 +67,8 @@ module.exports = (grunt) -> # Default task which watches, sass and coffee. grunt.registerTask 'default', ['watch'] + # Compile task + grunt.registerTask 'compile', ['sass:compile', 'coffee:compile'] # Minify task grunt.registerTask 'minify', ['uglify', 'sass:dist'] # Release task to run tests then minify js and css From 32ef709e7b17b138f96f7017e18a18d89ef4bff8 Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Sat, 19 Oct 2013 14:37:24 +0200 Subject: [PATCH 7/9] Refactored and fixed themes. Made some simpler. Improved sass --- css/jquery.smallipop.css | 223 +++++++++++++++++---------------- css/screen.css | 128 ++++++++----------- lib/jquery.smallipop.js | 2 +- src/scss/_mixins.scss | 32 +++-- src/scss/_theme_black.scss | 17 +-- src/scss/_theme_blue.scss | 26 ++-- src/scss/_theme_default.scss | 20 +-- src/scss/_theme_orange.scss | 18 +-- src/scss/_theme_white.scss | 53 ++------ src/scss/jquery.smallipop.scss | 20 ++- src/scss/screen.scss | 108 +++++++--------- 11 files changed, 274 insertions(+), 373 deletions(-) diff --git a/css/jquery.smallipop.css b/css/jquery.smallipop.css index 0ec5a1d..672adee 100644 --- a/css/jquery.smallipop.css +++ b/css/jquery.smallipop.css @@ -24,7 +24,7 @@ } .smallipop-instance font { size: 11px; - family: arial; + family: "Helvetica Neue Light", "Helvetica Neue", Arial, sans-serif; } .smallipop-instance a { color: #98cbea; @@ -38,14 +38,14 @@ pointer-events: none; } .smallipop-instance:before { - bottom: -20px; + bottom: -21px; margin-left: -10px; border: 10px solid transparent; } .smallipop-instance:after { - bottom: -24px; - margin-left: -12px; - border: 12px solid transparent; + bottom: -20px; + margin-left: -10px; + border: 10px solid transparent; } .smallipop-align-left:before, .smallipop-align-left:after { @@ -53,25 +53,19 @@ left: auto; right: 20px; } -.smallipop-align-left:after { - right: 18px; -} .smallipop-align-right:before, .smallipop-align-right:after { margin-left: 0; left: 20px; right: auto; } -.smallipop-align-right:after { - left: 18px; -} .smallipop-bottom:before, .smallipop-bottom:after { bottom: auto; top: -20px; } -.smallipop-bottom:after { - top: -24px; +.smallipop-bottom:before { + top: -21px; } .smallipop-left:before, .smallipop-left:after, @@ -84,8 +78,8 @@ border-width: 8px; margin: -8px 0 0; } -.smallipop-left:after, -.smallipop-right:after { +.smallipop-left:before, +.smallipop-right:before { right: -20px; border-width: 10px; margin: -10px 0 0; @@ -95,7 +89,7 @@ left: -16px; right: auto; } -.smallipop-right:after { +.smallipop-right:before { left: -20px; } @@ -136,7 +130,7 @@ background: #555; color: #ccc; text-align: center; - text-shadow: 0 -1px 1px #666666; + text-shadow: 0 -1px 1px #666; text-decoration: none; -webkit-border-radius: 8px; -moz-border-radius: 8px; @@ -190,57 +184,51 @@ -webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); - -webkit-border-radius: 12px; - -moz-border-radius: 12px; - -ms-border-radius: 12px; - -o-border-radius: 12px; - border-radius: 12px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(49, 75, 100, 0.9)), color-stop(100%, rgba(26, 38, 52, 0.9))); background: -webkit-linear-gradient(rgba(49, 75, 100, 0.9), rgba(26, 38, 52, 0.9)); background: -moz-linear-gradient(rgba(49, 75, 100, 0.9), rgba(26, 38, 52, 0.9)); background: -o-linear-gradient(rgba(49, 75, 100, 0.9), rgba(26, 38, 52, 0.9)); background: linear-gradient(rgba(49, 75, 100, 0.9), rgba(26, 38, 52, 0.9)); - /* Fallback for opera */ - background: -webkit-gradient(radial, 50% -100px, 0, 50% -100px, 150, color-stop(66.66667%, rgba(49, 75, 100, 0.9)), color-stop(86.66667%, rgba(33, 50, 66, 0.9)), color-stop(100%, rgba(26, 38, 52, 0.9))); - background: -webkit-radial-gradient(50% -100px, circle contain, rgba(49, 75, 100, 0.9) 100px, rgba(33, 50, 66, 0.9) 130px, rgba(26, 38, 52, 0.9) 150px); - background: -moz-radial-gradient(50% -100px, circle contain, rgba(49, 75, 100, 0.9) 100px, rgba(33, 50, 66, 0.9) 130px, rgba(26, 38, 52, 0.9) 150px); - background: -o-radial-gradient(50% -100px, circle contain, rgba(49, 75, 100, 0.9) 100px, rgba(33, 50, 66, 0.9) 130px, rgba(26, 38, 52, 0.9) 150px); - background: radial-gradient(50% -100px, circle contain, rgba(49, 75, 100, 0.9) 100px, rgba(33, 50, 66, 0.9) 130px, rgba(26, 38, 52, 0.9) 150px); } .smallipop-theme-default a { text-shadow: 0 -1px 1px #0f161e; } .smallipop-theme-default .smallipop-content { border-top: 1px solid #586d82; - -webkit-border-radius: 12px; - -moz-border-radius: 12px; - -ms-border-radius: 12px; - -o-border-radius: 12px; - border-radius: 12px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; } .smallipop-theme-default:before { - border-color: #1a2634 transparent transparent transparent; + border-color: #0f161e transparent transparent transparent; } .smallipop-theme-default:after { - border-color: #0f161e transparent transparent transparent; + border-color: #1a2634 transparent transparent transparent; } .smallipop-theme-default.smallipop-bottom:before { - border-color: transparent transparent #1a2634 transparent; + border-color: transparent transparent #0f161e transparent; } .smallipop-theme-default.smallipop-bottom:after { - border-color: transparent transparent #0f161e transparent; + border-color: transparent transparent #1a2634 transparent; } .smallipop-theme-default.smallipop-left:before { - border-color: transparent transparent transparent #1a2634; + border-color: transparent transparent transparent #0f161e; } .smallipop-theme-default.smallipop-left:after { - border-color: transparent transparent transparent #0f161e; + border-color: transparent transparent transparent #1a2634; } .smallipop-theme-default.smallipop-right:before { - border-color: transparent #1a2634 transparent transparent; + border-color: transparent #0f161e transparent transparent; } .smallipop-theme-default.smallipop-right:after { - border-color: transparent #0f161e transparent transparent; + border-color: transparent #1a2634 transparent transparent; } .cssgradients.rgba .smallipop-theme-default { @@ -255,38 +243,51 @@ -webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); - -webkit-border-radius: 7px; - -moz-border-radius: 7px; - -ms-border-radius: 7px; - -o-border-radius: 7px; - border-radius: 7px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; } .smallipop-theme-blue a { color: #2276aa; } -.smallipop-theme-blue:after { - bottom: -34px; - border-color: rgba(0, 100, 180, 0.9) transparent transparent transparent; +.smallipop-theme-blue:before { + bottom: -30px; +} +.smallipop-theme-blue.smallipop-bottom:before { + top: -30px; +} +.smallipop-theme-blue.smallipop-left:before { + right: -22px; +} +.smallipop-theme-blue.smallipop-right:before { + left: -22px; } .smallipop-theme-blue:before { - display: none; + border-color: rgba(0, 100, 180, 0.9) transparent transparent transparent; } -.smallipop-theme-blue.smallipop-bottom:after { - top: -34px; +.smallipop-theme-blue:after { + border-color: transparent transparent transparent transparent; +} +.smallipop-theme-blue.smallipop-bottom:before { border-color: transparent transparent rgba(0, 100, 180, 0.9) transparent; } -.smallipop-theme-blue.smallipop-left { - right: -26px; +.smallipop-theme-blue.smallipop-bottom:after { + border-color: transparent transparent transparent transparent; } -.smallipop-theme-blue.smallipop-left:after { +.smallipop-theme-blue.smallipop-left:before { border-color: transparent transparent transparent rgba(0, 100, 180, 0.9); } -.smallipop-theme-blue.smallipop-right { - left: -26px; +.smallipop-theme-blue.smallipop-left:after { + border-color: transparent transparent transparent transparent; } -.smallipop-theme-blue.smallipop-right:after { +.smallipop-theme-blue.smallipop-right:before { border-color: transparent rgba(0, 100, 180, 0.9) transparent transparent; } +.smallipop-theme-blue.smallipop-right:after { + border-color: transparent transparent transparent transparent; +} .smallipop-theme-blue .smallipop-content { border: 0; background: #fcfcfc; @@ -311,7 +312,7 @@ .smallipop-theme-black { background-color: #222222; border-color: #111; - text-shadow: 0 -1px 1px #111111; + text-shadow: 0 -1px 1px #111; color: #f5f5f5; -webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); @@ -321,39 +322,39 @@ background: -moz-linear-gradient(#333333, #222222); background: -o-linear-gradient(#333333, #222222); background: linear-gradient(#333333, #222222); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - -ms-border-radius: 5px; - -o-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; } .smallipop-theme-black a { color: #eef8ff; - text-shadow: 0 -1px 1px #111111; + text-shadow: 0 -1px 1px #111; } .smallipop-theme-black:before { - border-color: #222222 transparent transparent transparent; + border-color: #111111 transparent transparent transparent; } .smallipop-theme-black:after { - border-color: #111111 transparent transparent transparent; + border-color: #222222 transparent transparent transparent; } .smallipop-theme-black.smallipop-bottom:before { - border-color: transparent transparent #222222 transparent; + border-color: transparent transparent #111111 transparent; } .smallipop-theme-black.smallipop-bottom:after { - border-color: transparent transparent #111111 transparent; + border-color: transparent transparent #222222 transparent; } .smallipop-theme-black.smallipop-left:before { - border-color: transparent transparent transparent #222222; + border-color: transparent transparent transparent #111111; } .smallipop-theme-black.smallipop-left:after { - border-color: transparent transparent transparent #111111; + border-color: transparent transparent transparent #222222; } .smallipop-theme-black.smallipop-right:before { - border-color: transparent #222222 transparent transparent; + border-color: transparent #111111 transparent transparent; } .smallipop-theme-black.smallipop-right:after { - border-color: transparent #111111 transparent transparent; + border-color: transparent #222222 transparent transparent; } .smallipop-theme-black .smallipop-content { border-top: 1px solid #666; @@ -397,39 +398,39 @@ -webkit-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); box-shadow: 0 2px 6px rgba(0, 0, 0, 0.5); - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - -ms-border-radius: 10px; - -o-border-radius: 10px; - border-radius: 10px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + -ms-border-radius: 8px; + -o-border-radius: 8px; + border-radius: 8px; } .smallipop-theme-orange a { color: #145d95; text-shadow: 0 1px 1px #fff24d; } .smallipop-theme-orange:before { - border-color: #f9aa18 transparent transparent transparent; + border-color: #e17500 transparent transparent transparent; } .smallipop-theme-orange:after { - border-color: #e17500 transparent transparent transparent; + border-color: #f9aa18 transparent transparent transparent; } .smallipop-theme-orange.smallipop-bottom:before { - border-color: transparent transparent #f9aa18 transparent; + border-color: transparent transparent #e17500 transparent; } .smallipop-theme-orange.smallipop-bottom:after { - border-color: transparent transparent #e17500 transparent; + border-color: transparent transparent #f9aa18 transparent; } .smallipop-theme-orange.smallipop-left:before { - border-color: transparent transparent transparent #f9aa18; + border-color: transparent transparent transparent #e17500; } .smallipop-theme-orange.smallipop-left:after { - border-color: transparent transparent transparent #e17500; + border-color: transparent transparent transparent #f9aa18; } .smallipop-theme-orange.smallipop-right:before { - border-color: transparent #f9aa18 transparent transparent; + border-color: transparent #e17500 transparent transparent; } .smallipop-theme-orange.smallipop-right:after { - border-color: transparent #e17500 transparent transparent; + border-color: transparent #f9aa18 transparent transparent; } .smallipop-theme-orange .smallipop-content { border-top: 1px solid #fffabc; @@ -458,7 +459,7 @@ /* white theme */ .smallipop-theme-white { background-color: #fcfcfc; - border-color: #ccc; + border-color: #777777; text-shadow: 0 1px 1px #eee; color: #444; width: 200px; @@ -466,35 +467,35 @@ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - -ms-border-radius: 6px; - -o-border-radius: 6px; - border-radius: 6px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; } .smallipop-theme-white:before { - border-color: #fcfcfc transparent transparent transparent; + border-color: #777777 transparent transparent transparent; } .smallipop-theme-white:after { - border-color: #cccccc transparent transparent transparent; + border-color: #fcfcfc transparent transparent transparent; } .smallipop-theme-white.smallipop-bottom:before { - border-color: transparent transparent #fcfcfc transparent; + border-color: transparent transparent #777777 transparent; } .smallipop-theme-white.smallipop-bottom:after { - border-color: transparent transparent #cccccc transparent; + border-color: transparent transparent #fcfcfc transparent; } .smallipop-theme-white.smallipop-left:before { - border-color: transparent transparent transparent #fcfcfc; + border-color: transparent transparent transparent #777777; } .smallipop-theme-white.smallipop-left:after { - border-color: transparent transparent transparent #cccccc; + border-color: transparent transparent transparent #fcfcfc; } .smallipop-theme-white.smallipop-right:before { - border-color: transparent #fcfcfc transparent transparent; + border-color: transparent #777777 transparent transparent; } .smallipop-theme-white.smallipop-right:after { - border-color: transparent #cccccc transparent transparent; + border-color: transparent #fcfcfc transparent transparent; } .smallipop-theme-white .smallipop-content { text-align: center; @@ -532,22 +533,30 @@ /* white theme extended, requires rgba support */ .smallipop-theme-white-transparent { background-color: rgba(255, 255, 255, 0.8); + border: 0; } .smallipop-theme-white-transparent:before { - bottom: -21px; - border-color: rgba(255, 255, 255, 0.8) transparent transparent transparent; + border-color: transparent transparent transparent transparent; } .smallipop-theme-white-transparent:after { - border-color: transparent; + border-color: rgba(255, 255, 255, 0.8) transparent transparent transparent; } -.smallipop-theme-white-transparent.sipAlignBottom:before { - top: -21px; +.smallipop-theme-white-transparent.smallipop-bottom:before { + border-color: transparent transparent transparent transparent; +} +.smallipop-theme-white-transparent.smallipop-bottom:after { border-color: transparent transparent rgba(255, 255, 255, 0.8) transparent; } -.smallipop-theme-white-transparent.sipPositionedLeft:before { +.smallipop-theme-white-transparent.smallipop-left:before { + border-color: transparent transparent transparent transparent; +} +.smallipop-theme-white-transparent.smallipop-left:after { border-color: transparent transparent transparent rgba(255, 255, 255, 0.8); } -.smallipop-theme-white-transparent.sipPositionedRight:before { +.smallipop-theme-white-transparent.smallipop-right:before { + border-color: transparent transparent transparent transparent; +} +.smallipop-theme-white-transparent.smallipop-right:after { border-color: transparent rgba(255, 255, 255, 0.8) transparent transparent; } diff --git a/css/screen.css b/css/screen.css index 1aa4644..b048124 100644 --- a/css/screen.css +++ b/css/screen.css @@ -703,7 +703,7 @@ html { body { height: 100%; - font-family: arial; + font-family: "Helvetica Neue Light", "Helvetica Neue", Arial, sans-serif; font-size: 1em; line-height: 1.3em; padding: 30px 0; @@ -859,19 +859,24 @@ img.inline { background-color: #ffe199; font-size: 1.1em; text-shadow: 0 1px 1px #fff24d; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - -ms-border-radius: 6px; - -o-border-radius: 6px; - border-radius: 6px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; -webkit-box-shadow: 0 1px 4px rgba(255, 162, 0, 0.3); -moz-box-shadow: 0 1px 4px rgba(255, 162, 0, 0.3); box-shadow: 0 1px 4px rgba(255, 162, 0, 0.3); + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fff24d), color-stop(100%, #f9aa18)); + background: -webkit-linear-gradient(#fff24d, #f9aa18); + background: -moz-linear-gradient(#fff24d, #f9aa18); + background: -o-linear-gradient(#fff24d, #f9aa18); + background: linear-gradient(#fff24d, #f9aa18); } .sampleElement.white, .sampleElement.black, .sampleElement.blue, .sampleElement.green, .sampleElement.default { - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1); } .sampleElement.big { font-size: 1.4em; @@ -884,92 +889,71 @@ img.inline { background-color: #fff4d9; border-color: #ffd777; text-decoration: none; -} -.sampleElement.white { - background-color: #fff; - border-color: #ddd; - text-shadow: none; -} -.sampleElement.green { - background-color: #2ea41e; - border-color: #239714; - color: #fafafa; - text-shadow: 0 1px 1px #196d0e; -} -.sampleElement.black { - background-color: #333; - color: #eee; - border-color: #000; - text-shadow: none; -} -.sampleElement.blue { - background-color: #0064b4; - color: #eee; - border-color: #0064b4; - text-shadow: none; -} -.sampleElement.orange { - background-color: #fbb913; - color: #714900; -} -.sampleElement.default { - background-color: #586d82; - color: #eee; - border-color: #314b64; - text-shadow: none; -} - -.cssgradients .sampleElement { - background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fff24d), color-stop(100%, #f9aa18)); - background: -webkit-linear-gradient(#fff24d, #f9aa18); - background: -moz-linear-gradient(#fff24d, #f9aa18); - background: -o-linear-gradient(#fff24d, #f9aa18); - background: linear-gradient(#fff24d, #f9aa18); -} -.cssgradients .sampleElement:hover { background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fff24d), color-stop(100%, #fdc661)); background: -webkit-linear-gradient(#fff24d, #fdc661); background: -moz-linear-gradient(#fff24d, #fdc661); background: -o-linear-gradient(#fff24d, #fdc661); background: linear-gradient(#fff24d, #fdc661); } -.cssgradients .sampleElement.white { +.sampleElement.white { + background-color: #fff; + border-color: #ddd; + text-shadow: none; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #fafafa)); background: -webkit-linear-gradient(#ffffff, #fafafa); background: -moz-linear-gradient(#ffffff, #fafafa); background: -o-linear-gradient(#ffffff, #fafafa); background: linear-gradient(#ffffff, #fafafa); } -.cssgradients .sampleElement.green { +.sampleElement.green { + background-color: #2ea41e; + border-color: #239714; + color: #fafafa; + text-shadow: 0 1px 1px #196d0e; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #35b125), color-stop(100%, #29a219)); background: -webkit-linear-gradient(#35b125, #29a219); background: -moz-linear-gradient(#35b125, #29a219); background: -o-linear-gradient(#35b125, #29a219); background: linear-gradient(#35b125, #29a219); } -.cssgradients .sampleElement.green:hover { +.sampleElement.green:hover { background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #40bb30), color-stop(100%, #31aa21)); background: -webkit-linear-gradient(#40bb30, #31aa21); background: -moz-linear-gradient(#40bb30, #31aa21); background: -o-linear-gradient(#40bb30, #31aa21); background: linear-gradient(#40bb30, #31aa21); } -.cssgradients .sampleElement.black { +.sampleElement.black { + background-color: #333; + color: #eee; + border-color: #000; + text-shadow: none; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #444444), color-stop(100%, #111111)); background: -webkit-linear-gradient(#444444, #111111); background: -moz-linear-gradient(#444444, #111111); background: -o-linear-gradient(#444444, #111111); background: linear-gradient(#444444, #111111); } -.cssgradients .sampleElement.blue { +.sampleElement.blue { + background-color: #0064b4; + color: #eee; + border-color: #0064b4; + text-shadow: none; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #1279cb), color-stop(100%, #0064b4)); background: -webkit-linear-gradient(#1279cb, #0064b4); background: -moz-linear-gradient(#1279cb, #0064b4); background: -o-linear-gradient(#1279cb, #0064b4); background: linear-gradient(#1279cb, #0064b4); - color: #eee; } -.cssgradients .sampleElement.default { +.sampleElement.orange { + background-color: #fbb913; + color: #714900; +} +.sampleElement.default { + background-color: #586d82; + color: #eee; + border-color: #314b64; + text-shadow: none; background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4f6c88), color-stop(100%, #314b64)); background: -webkit-linear-gradient(#4f6c88, #314b64); background: -moz-linear-gradient(#4f6c88, #314b64); @@ -1015,7 +999,7 @@ img.inline { height: 21px; font-size: 26px; font-weight: bold; - line-height: 21px; + line-height: 18px; text-align: center; color: #6fc048; background-color: #fff; @@ -1025,20 +1009,17 @@ img.inline { -ms-border-radius: 2px; -o-border-radius: 2px; border-radius: 2px; -} -.indicator .indicatorPlus { - width: 14px; - margin: 0 3px; - overflow: hidden; -} - -.cssgradients .indicator { background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #fafafa)); background: -webkit-linear-gradient(#ffffff, #fafafa); background: -moz-linear-gradient(#ffffff, #fafafa); background: -o-linear-gradient(#ffffff, #fafafa); background: linear-gradient(#ffffff, #fafafa); } +.indicator .indicatorPlus { + width: 14px; + margin: 0 3px; + overflow: hidden; +} .smallipopArrow { width: 25px; @@ -1242,7 +1223,6 @@ img.inline { -o-border-radius: 30px; border-radius: 30px; } - .pulser .inner { height: 16px; width: 16px; @@ -1251,22 +1231,18 @@ img.inline { top: 0px; background: #fcfcfc; color: #1ec016; - text-shadow: 0 -1px 1px #cccccc; + text-shadow: 0 -1px 1px #ccc; font-size: 16px; - line-height: 16px; + line-height: 14px; font-weight: bold; text-align: center; -} - -.cssgradients .pulser .inner { background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fafafa), color-stop(100%, #dddddd)); background: -webkit-linear-gradient(#fafafa, #dddddd); background: -moz-linear-gradient(#fafafa, #dddddd); background: -o-linear-gradient(#fafafa, #dddddd); background: linear-gradient(#fafafa, #dddddd); } - -.cssanimations .pulser .outer { +.pulser .outer { height: 12px; width: 12px; position: absolute; diff --git a/lib/jquery.smallipop.js b/lib/jquery.smallipop.js index 3ce77cd..6e45135 100644 --- a/lib/jquery.smallipop.js +++ b/lib/jquery.smallipop.js @@ -757,7 +757,7 @@ Licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) lice type = $self.attr('type'); triggerData = $self.data(); objHint = hint || $self.attr('title'); - $objInfo = $("> ." + options.infoClass + ":first", $self); + $objInfo = $("." + options.infoClass + ":first", $self); if ($objInfo.length) { objHint = $objInfo.clone(true, true).removeClass(options.infoClass); } diff --git a/src/scss/_mixins.scss b/src/scss/_mixins.scss index a209102..47453fa 100644 --- a/src/scss/_mixins.scss +++ b/src/scss/_mixins.scss @@ -6,15 +6,27 @@ border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); } -@mixin border-color-top($color) { - border-color: $color transparent transparent transparent; +@mixin border-color($orientation, $color) { + @if $orientation == top { + border-color: $color transparent transparent transparent; + } @else if $orientation == right { + border-color: transparent $color transparent transparent; + } @else if $orientation == bottom { + border-color: transparent transparent $color transparent; + } @else if $orientation == left { + border-color: transparent transparent transparent $color; + } } -@mixin border-color-right($color) { - border-color: transparent $color transparent transparent; -} -@mixin border-color-bottom($color) { - border-color: transparent transparent $color transparent; -} -@mixin border-color-left($color) { - border-color: transparent transparent transparent $color; + +@mixin smallipop-arrow($inner-color, $outer-color) { + + &:before { @include border-color(top, $outer-color); } + &:after { @include border-color(top, $inner-color); } + + @each $orientation in bottom, left, right { + &.smallipop-#{$orientation} { + &:before { @include border-color(#{$orientation}, $outer-color); } + &:after { @include border-color(#{$orientation}, $inner-color); } + } + } } diff --git a/src/scss/_theme_black.scss b/src/scss/_theme_black.scss index f5ad235..23aa4e7 100644 --- a/src/scss/_theme_black.scss +++ b/src/scss/_theme_black.scss @@ -10,27 +10,14 @@ $black-background-color: #222; color: #f5f5f5; @include box-shadow(0 2px 6px rgba(0, 0, 0, 0.5)); @include background(linear-gradient(#333333, #222222)); - @include border-radius(5px); + @include border-radius(3px); a { color: #eef8ff; text-shadow: 0 -1px 1px #111; } - &:before { @include border-color-top($black-arrow-color); } - &:after { @include border-color-top($black-arrow-border-color); } - &.smallipop-bottom { - &:before { @include border-color-bottom($black-arrow-color); } - &:after { @include border-color-bottom($black-arrow-border-color); } - } - &.smallipop-left { - &:before { @include border-color-left($black-arrow-color); } - &:after { @include border-color-left($black-arrow-border-color); } - } - &.smallipop-right { - &:before { @include border-color-right($black-arrow-color); } - &:after { @include border-color-right($black-arrow-border-color); } - } + @include smallipop-arrow($black-arrow-color, $black-arrow-border-color); .smallipop-content { border-top: 1px solid #666; diff --git a/src/scss/_theme_blue.scss b/src/scss/_theme_blue.scss index 3acae14..e3b0bc3 100644 --- a/src/scss/_theme_blue.scss +++ b/src/scss/_theme_blue.scss @@ -8,33 +8,27 @@ $blue-background-color: #fcfcfc; color: #111; border: 10px solid $blue-arrow-border-color; @include box-shadow(0 2px 6px rgba(0, 0, 0, 0.5)); - @include border-radius(7px); + @include border-radius(3px); a { color: #2276aa; } - &:after { - bottom: -34px; - @include border-color-top($blue-arrow-border-color); - } &:before { - display: none; + bottom: -30px; } - - &.smallipop-bottom:after { - top: -34px; - @include border-color-bottom($blue-arrow-border-color); + &.smallipop-bottom:before { + top: -30px; } - &.smallipop-left { - right: -26px; - &:after { @include border-color-left($blue-arrow-border-color); } + &.smallipop-left:before { + right: -22px; } - &.smallipop-right { - left: -26px; - &:after { @include border-color-right($blue-arrow-border-color); } + &.smallipop-right:before { + left: -22px; } + @include smallipop-arrow(transparent, $blue-arrow-border-color); + .smallipop-content { border: 0; background: $blue-background-color; diff --git a/src/scss/_theme_default.scss b/src/scss/_theme_default.scss index ef68c1e..b160e3a 100644 --- a/src/scss/_theme_default.scss +++ b/src/scss/_theme_default.scss @@ -6,8 +6,7 @@ $default-arrow-border-color: $base-color; text-shadow: $default-text-shadow; @include box-shadow($default-box-shadow); @include border-radius($default-border-radius); - @include background(linear-gradient(rgba(49, 75, 100, 0.9), rgba(26, 38, 52, 0.9))); /* Fallback for opera */ - @include background(radial-gradient(50% -100px, circle contain, rgba(49, 75, 100, 0.9) 100px, rgba(33, 50, 66, 0.9) 130px, rgba(26, 38, 52, 0.9) 150px)); + @include background(linear-gradient(rgba(49, 75, 100, 0.9), rgba(26, 38, 52, 0.9))); a { text-shadow: $default-link-text-shadow; @@ -18,22 +17,7 @@ $default-arrow-border-color: $base-color; @include border-radius($default-border-radius); } - &:before { @include border-color-top($default-arrow-color); } - &:after { @include border-color-top($default-arrow-border-color); } - - &.smallipop-bottom { - &:before { @include border-color-bottom($default-arrow-color); } - &:after { @include border-color-bottom($default-arrow-border-color); } - } - - &.smallipop-left { - &:before { @include border-color-left($default-arrow-color); } - &:after { @include border-color-left($default-arrow-border-color); } - } - &.smallipop-right { - &:before { @include border-color-right($default-arrow-color); } - &:after { @include border-color-right($default-arrow-border-color); } - } + @include smallipop-arrow($default-arrow-color, $default-arrow-border-color); } .cssgradients.rgba .smallipop-theme-default { background-color: transparent; diff --git a/src/scss/_theme_orange.scss b/src/scss/_theme_orange.scss index 1562258..3b855a2 100644 --- a/src/scss/_theme_orange.scss +++ b/src/scss/_theme_orange.scss @@ -10,28 +10,14 @@ $orange-background-color: #f9aa18; color: #714900; @include background(linear-gradient(#fff24d, #f9aa18)); @include box-shadow(0 2px 6px rgba(0, 0, 0, 0.5)); - @include border-radius(10px); + @include border-radius(8px); a { color: #145d95; text-shadow:0 1px 1px #fff24d; } - &:before { @include border-color-top($orange-arrow-color); } - &:after { @include border-color-top($orange-arrow-border-color); } - - &.smallipop-bottom { - &:before { @include border-color-bottom($orange-arrow-color); } - &:after { @include border-color-bottom($orange-arrow-border-color); } - } - &.smallipop-left { - &:before { @include border-color-left($orange-arrow-color); } - &:after { @include border-color-left($orange-arrow-border-color); } - } - &.smallipop-right { - &:before { @include border-color-right($orange-arrow-color); } - &:after { @include border-color-right($orange-arrow-border-color); } - } + @include smallipop-arrow($orange-arrow-color, $orange-arrow-border-color); .smallipop-content { border-top:1px solid #fffabc; diff --git a/src/scss/_theme_white.scss b/src/scss/_theme_white.scss index 280311e..231eee3 100644 --- a/src/scss/_theme_white.scss +++ b/src/scss/_theme_white.scss @@ -1,33 +1,20 @@ /* white theme */ $white-arrow-color: #fcfcfc; -$white-arrow-border-color: #ccc; +$white-arrow-border-color: #777; $white-background-color: #fcfcfc; +$white-transparent-border-color: rgba(255, 255, 255, 0.8); .smallipop-theme-white { background-color: $white-background-color; - border-color:#ccc; - text-shadow:0 1px 1px #eee; - color:#444; - width:200px; - max-width:200px; + border-color: $white-arrow-border-color; + text-shadow: 0 1px 1px #eee; + color: #444; + width: 200px; + max-width: 200px; @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.1)); - @include border-radius(6px); + @include border-radius(3px); - &:before { @include border-color-top($white-arrow-color); } - &:after { @include border-color-top($white-arrow-border-color); } - - &.smallipop-bottom { - &:before { @include border-color-bottom($white-arrow-color); } - &:after { @include border-color-bottom($white-arrow-border-color); } - } - &.smallipop-left { - &:before { @include border-color-left($white-arrow-color); } - &:after { @include border-color-left($white-arrow-border-color); } - } - &.smallipop-right { - &:before { @include border-color-right($white-arrow-color); } - &:after { @include border-color-right($white-arrow-border-color); } - } + @include smallipop-arrow($white-arrow-color, $white-arrow-border-color); .smallipop-content { text-align:center; @@ -62,24 +49,8 @@ $white-background-color: #fcfcfc; /* white theme extended, requires rgba support */ .smallipop-theme-white-transparent { - background-color: rgba(255, 255, 255, 0.8); - - &:before { - bottom: -21px; - border-color: rgba(255, 255, 255, 0.8) transparent transparent transparent; - } - &:after { - border-color: transparent; - } + background-color: $white-transparent-border-color; + border: 0; - &.sipAlignBottom:before { - top: -21px; - border-color: transparent transparent rgba(255, 255, 255, 0.8) transparent; - } - &.sipPositionedLeft:before { - border-color: transparent transparent transparent rgba(255, 255, 255, 0.8); - } - &.sipPositionedRight:before { - border-color: transparent rgba(255, 255, 255, 0.8) transparent transparent; - } + @include smallipop-arrow($white-transparent-border-color, transparent); } diff --git a/src/scss/jquery.smallipop.scss b/src/scss/jquery.smallipop.scss index a7650bc..9804411 100644 --- a/src/scss/jquery.smallipop.scss +++ b/src/scss/jquery.smallipop.scss @@ -4,7 +4,7 @@ $base-color: #0f161e; $default-background-color: #314b64; $default-border: 1px solid $base-color; -$default-border-radius: 12px; +$default-border-radius: 3px; $default-box-shadow: 0 2px 6px rgba(0, 0, 0, .5); $default-color: #d2dfe7; $default-text-shadow: 0 -1px 1px $base-color; @@ -43,7 +43,7 @@ $fat-shadow: 0 2px 20px rgba(0, 0, 0, .8); max-width: $max-width; font { size: 11px; - family: arial; + family: "Helvetica Neue Light", "Helvetica Neue", Arial, sans-serif; } a { @@ -59,29 +59,27 @@ $fat-shadow: 0 2px 20px rgba(0, 0, 0, .8); pointer-events: none; } &:before { - bottom: -20px; + bottom: -21px; margin-left: -10px; border: 10px solid transparent; } &:after { - bottom: -24px; - margin-left: -12px; - border: 12px solid transparent; + bottom: -20px; + margin-left: -10px; + border: 10px solid transparent; } } .smallipop-align-left { &:before, &:after { margin-left:0; left:auto; right:20px; } - &:after { right:18px; } } .smallipop-align-right { &:before, &:after { margin-left:0; left:20px; right:auto; } - &:after { left:18px; } } .smallipop-bottom { &:before, &:after { bottom:auto; top:-20px; } - &:after { top:-24px; } + &:before { top:-21px; } } .smallipop-left, .smallipop-right { @@ -94,7 +92,7 @@ $fat-shadow: 0 2px 20px rgba(0, 0, 0, .8); border-width: 8px; margin: -8px 0 0; } - &:after { + &:before { right: -20px; border-width: 10px; margin: -10px 0 0; @@ -107,7 +105,7 @@ $fat-shadow: 0 2px 20px rgba(0, 0, 0, .8); left: -16px; right: auto; } - &:after { + &:before { left: -20px; } } diff --git a/src/scss/screen.scss b/src/scss/screen.scss index 8899dba..f3fa8db 100644 --- a/src/scss/screen.scss +++ b/src/scss/screen.scss @@ -10,7 +10,7 @@ html { body { height: 100%; - font-family: arial; + font-family: "Helvetica Neue Light", "Helvetica Neue", Arial, sans-serif; font-size: 1em; line-height: 1.3em; padding: 30px 0; @@ -119,15 +119,16 @@ img.inline { margin: 10px; } background-color: #ffe199; font-size: 1.1em; text-shadow:0 1px 1px #fff24d; - @include border-radius(6px); + @include border-radius(3px); @include box-shadow(0 1px 4px rgba(255, 162, 0, 0.3)); + @include background(linear-gradient(#fff24d, #f9aa18)); &.white, &.black, &.blue, &.green, &.default { - @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.3)); + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.1)); } &.big { @@ -140,30 +141,38 @@ img.inline { margin: 10px; } background-color: #fff4d9; border-color: #ffd777; text-decoration: none; + @include background(linear-gradient(#fff24d, #fdc661)); } &.white { background-color: #fff; border-color: #ddd; text-shadow:none; + @include background(linear-gradient(#ffffff, #fafafa)); } &.green { background-color: #2ea41e; border-color: #239714; color: #fafafa; text-shadow: 0 1px 1px #196d0e; + @include background(linear-gradient(#35b125, #29a219)); + &:hover { + @include background(linear-gradient(#40bb30, #31aa21)); + } } &.black { background-color: #333; color: #eee; border-color: #000; text-shadow:none; + @include background(linear-gradient(#444444, #111111)); } &.blue { background-color: #0064b4; color: #eee; border-color: #0064b4; text-shadow:none; + @include background(linear-gradient(#1279cb, #0064b4)); } &.orange { background-color: #fbb913; @@ -174,32 +183,6 @@ img.inline { margin: 10px; } color: #eee; border-color: #314b64; text-shadow:none; - } -} -.cssgradients .sampleElement { - @include background(linear-gradient(#fff24d, #f9aa18)); - - &:hover { - @include background(linear-gradient(#fff24d, #fdc661)); - } - - &.white { - @include background(linear-gradient(#ffffff, #fafafa)); - } - &.green { - @include background(linear-gradient(#35b125, #29a219)); - &:hover { - @include background(linear-gradient(#40bb30, #31aa21)); - } - } - &.black { - @include background(linear-gradient(#444444, #111111)); - } - &.blue { - @include background(linear-gradient(#1279cb, #0064b4)); - color: #eee; - } - &.default { @include background(linear-gradient(#4f6c88, #314b64)); } } @@ -249,12 +232,13 @@ img.inline { margin: 10px; } width: 21px; height: 21px; font-size: 26px; font-weight: bold; - line-height: 21px; + line-height: 18px; text-align: center; color: #6fc048; background-color: #fff; opacity: 0.95; @include border-radius(2px); + @include background(linear-gradient(#ffffff, #fafafa)); .indicatorPlus { width: 14px; @@ -262,9 +246,6 @@ img.inline { margin: 10px; } overflow:hidden; } } -.cssgradients .indicator { - @include background(linear-gradient(#ffffff, #fafafa)); -} .smallipopArrow { width: 25px; @@ -330,38 +311,42 @@ img.inline { margin: 10px; } /* pulser */ .pulser { - height:12px; width:12px; - position:absolute; + height: 12px; + width: 12px; + position: absolute; &, .outer, .inner { @include border-radius(30px); } -} -.pulser .inner { - height:16px; width:16px; - position:absolute; - left:0px; top:0px; - background:#fcfcfc; - color:#1ec016; - text-shadow:0 -1px 1px #ccc; - font-size:16px; - line-height:16px; - font-weight:bold; - text-align:center; -} -.cssgradients .pulser .inner { - @include background(linear-gradient(#fafafa, #dddddd)); -} -.cssanimations .pulser .outer { - height: 12px; width: 12px; - position: absolute; - left:0; top:0; - border: 2px solid #50b6f4; - -webkit-animation: pulsate 1.2s ease-out; - -webkit-animation-iteration-count: infinite; - -moz-animation: pulsate 1.2s ease-out; - -moz-animation-iteration-count: infinite; - opacity: 0.0; + + .inner { + height: 16px; + width: 16px; + position: absolute; + left: 0px; + top: 0px; + background: #fcfcfc; + color: #1ec016; + text-shadow: 0 -1px 1px #ccc; + font-size: 16px; + line-height: 14px; + font-weight: bold; + text-align: center; + @include background(linear-gradient(#fafafa, #dddddd)); + } + .outer { + height: 12px; + width: 12px; + position: absolute; + left:0; + top:0; + border: 2px solid #50b6f4; + -webkit-animation: pulsate 1.2s ease-out; + -webkit-animation-iteration-count: infinite; + -moz-animation: pulsate 1.2s ease-out; + -moz-animation-iteration-count: infinite; + opacity: 0.0; + } } @-webkit-keyframes pulsate { 0% {-webkit-transform: scale(1, 1); opacity: 0.0;} @@ -387,7 +372,6 @@ img.inline { margin: 10px; } border: 1px solid #ccc; padding: 10px; background: #fafafa; - @include box-shadow(0 1px 3px 1px rgba(0, 0, 0, 0.2)); } From a8c72cc871855c337108f32f246bc0b9b6046728 Mon Sep 17 00:00:00 2001 From: Sebastian Helzle Date: Sat, 19 Oct 2013 14:58:16 +0200 Subject: [PATCH 8/9] Improved referenced content example --- pages/options.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pages/options.html b/pages/options.html index 4acecdc..3f68ae6 100644 --- a/pages/options.html +++ b/pages/options.html @@ -339,15 +339,17 @@
Change content on the fly and use callbacks
Use referenced element as tooltip content
- Hover me! + Hover me!

- The real tooltip content! +

+ The real tooltip content! +

-<a id="tipReferenced" data-smallipop-referenced-content="#tipReferencedTarget" title="Referenced content">
+<a id="tipReferenced" data-smallipop-referenced-content="#tipReferencedTarget > *" title="Referenced content">
     Hover me!
 </a>
 <div id="tipReferencedTarget">

From 860af3ea183263a7d111d2dd46913d045571c91b Mon Sep 17 00:00:00 2001
From: Sebastian Helzle 
Date: Sat, 19 Oct 2013 14:58:48 +0200
Subject: [PATCH 9/9] Fixed tooltip font and removed white theme text-shadow.

---
 css/jquery.smallipop.css       | 7 ++-----
 src/scss/_theme_white.scss     | 1 -
 src/scss/jquery.smallipop.scss | 4 ++--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/css/jquery.smallipop.css b/css/jquery.smallipop.css
index 672adee..c44aa94 100644
--- a/css/jquery.smallipop.css
+++ b/css/jquery.smallipop.css
@@ -21,10 +21,8 @@
   color: #d2dfe7;
   z-index: 9999;
   max-width: 400px;
-}
-.smallipop-instance font {
-  size: 11px;
-  family: "Helvetica Neue Light", "Helvetica Neue", Arial, sans-serif;
+  font-size: 12px;
+  font-family: "Helvetica Neue Light", "Helvetica Neue", Arial, sans-serif;
 }
 .smallipop-instance a {
   color: #98cbea;
@@ -460,7 +458,6 @@
 .smallipop-theme-white {
   background-color: #fcfcfc;
   border-color: #777777;
-  text-shadow: 0 1px 1px #eee;
   color: #444;
   width: 200px;
   max-width: 200px;
diff --git a/src/scss/_theme_white.scss b/src/scss/_theme_white.scss
index 231eee3..f670c0b 100644
--- a/src/scss/_theme_white.scss
+++ b/src/scss/_theme_white.scss
@@ -7,7 +7,6 @@ $white-transparent-border-color: rgba(255, 255, 255, 0.8);
 .smallipop-theme-white {
   background-color: $white-background-color;
   border-color: $white-arrow-border-color;
-  text-shadow: 0 1px 1px #eee;
   color: #444;
   width: 200px;
   max-width: 200px;
diff --git a/src/scss/jquery.smallipop.scss b/src/scss/jquery.smallipop.scss
index 9804411..8daef54 100644
--- a/src/scss/jquery.smallipop.scss
+++ b/src/scss/jquery.smallipop.scss
@@ -41,8 +41,8 @@ $fat-shadow: 0 2px 20px rgba(0, 0, 0, .8);
   color: $default-color;
   z-index: 9999;
   max-width: $max-width;
-  font {
-    size: 11px;
+  font: {
+    size: 12px;
     family: "Helvetica Neue Light", "Helvetica Neue", Arial, sans-serif;
   }