Permalink
Browse files

Merge pull request #42 from collective/Jcrop-0.9.12

Update Jcrop to version 0.9.12 (closes #34)
  • Loading branch information...
frisi committed Jun 12, 2014
2 parents 9404fe3 + 383b27a commit 0e90b53b59f9f54696d42c7485e5e42443241859
View
@@ -4,6 +4,9 @@ Changelog
0.1rc3 (unreleased)
-------------------
+- Update Jcrop to version 0.9.12.
+ [hvelarde]
+
- Use ``plone.app.robotframework`` instead of writing all keywords from
scratch. This brings us autologin support for faster robot tests. Rewrite
tests to test scenarios.
@@ -1,5 +1,4 @@
-/* jquery.Jcrop.css v0.9.10 - MIT License */
-
+/* jquery.Jcrop.css v0.9.12 - MIT License */
/*
The outer-most container in a typical Jcrop instance
If you are having difficulty with formatting related to styles
@@ -13,74 +12,154 @@
direction: ltr;
text-align: left;
}
-
-/* These styles define the border lines */
-.jcrop-vline,.jcrop-hline{background:#FFF url(++resource++plone.app.imagecropping.static/Jcrop.gif) top left repeat;font-size:0;position:absolute;}
-.jcrop-vline{height:100%;width:1px!important;}
-.jcrop-hline{height:1px!important;width:100%;}
-.jcrop-vline.right{right:0;}
-.jcrop-hline.bottom{bottom:0;}
-
-/* Handle style - size is set by Jcrop handleSize option (currently) */
-.jcrop-handle{background-color:#333;border:1px #eee solid;font-size:1px;}
-
-/* This style is used for invisible click targets */
-.jcrop-tracker
-{
+/* Selection Border */
+.jcrop-vline,
+.jcrop-hline {
+ background: #ffffff url("++resource++plone.app.imagecropping.static/Jcrop.gif");
+ font-size: 0;
+ position: absolute;
+}
+.jcrop-vline {
height: 100%;
+ width: 1px !important;
+}
+.jcrop-vline.right {
+ right: 0;
+}
+.jcrop-hline {
+ height: 1px !important;
width: 100%;
- -webkit-tap-highlight-color: transparent; /* "turn off" link highlight */
- -webkit-touch-callout: none; /* disable callout, image save panel */
- -webkit-user-select: none; /* disable cut copy paste */
}
-
-/* Positioning of handles and drag bars */
-.jcrop-handle.ord-n{left:50%;margin-left:-4px;margin-top:-4px;top:0;}
-.jcrop-handle.ord-s{bottom:0;left:50%;margin-bottom:-4px;margin-left:-4px;}
-.jcrop-handle.ord-e{margin-right:-4px;margin-top:-4px;right:0;top:50%;}
-.jcrop-handle.ord-w{left:0;margin-left:-4px;margin-top:-4px;top:50%;}
-.jcrop-handle.ord-nw{left:0;margin-left:-4px;margin-top:-4px;top:0;}
-.jcrop-handle.ord-ne{margin-right:-4px;margin-top:-4px;right:0;top:0;}
-.jcrop-handle.ord-se{bottom:0;margin-bottom:-4px;margin-right:-4px;right:0;}
-.jcrop-handle.ord-sw{bottom:0;left:0;margin-bottom:-4px;margin-left:-4px;}
-.jcrop-dragbar.ord-n,.jcrop-dragbar.ord-s{height:7px;width:100%;}
-.jcrop-dragbar.ord-e,.jcrop-dragbar.ord-w{height:100%;width:7px;}
-.jcrop-dragbar.ord-n{margin-top:-4px;}
-.jcrop-dragbar.ord-s{bottom:0;margin-bottom:-4px;}
-.jcrop-dragbar.ord-e{margin-right:-4px;right:0;}
-.jcrop-dragbar.ord-w{margin-left:-4px;}
-
+.jcrop-hline.bottom {
+ bottom: 0;
+}
+/* Invisible click targets */
+.jcrop-tracker {
+ height: 100%;
+ width: 100%;
+ /* "turn off" link highlight */
+ -webkit-tap-highlight-color: transparent;
+ /* disable callout, image save panel */
+ -webkit-touch-callout: none;
+ /* disable cut copy paste */
+ -webkit-user-select: none;
+}
+/* Selection Handles */
+.jcrop-handle {
+ background-color: #333333;
+ border: 1px #eeeeee solid;
+ width: 7px;
+ height: 7px;
+ font-size: 1px;
+}
+.jcrop-handle.ord-n {
+ left: 50%;
+ margin-left: -4px;
+ margin-top: -4px;
+ top: 0;
+}
+.jcrop-handle.ord-s {
+ bottom: 0;
+ left: 50%;
+ margin-bottom: -4px;
+ margin-left: -4px;
+}
+.jcrop-handle.ord-e {
+ margin-right: -4px;
+ margin-top: -4px;
+ right: 0;
+ top: 50%;
+}
+.jcrop-handle.ord-w {
+ left: 0;
+ margin-left: -4px;
+ margin-top: -4px;
+ top: 50%;
+}
+.jcrop-handle.ord-nw {
+ left: 0;
+ margin-left: -4px;
+ margin-top: -4px;
+ top: 0;
+}
+.jcrop-handle.ord-ne {
+ margin-right: -4px;
+ margin-top: -4px;
+ right: 0;
+ top: 0;
+}
+.jcrop-handle.ord-se {
+ bottom: 0;
+ margin-bottom: -4px;
+ margin-right: -4px;
+ right: 0;
+}
+.jcrop-handle.ord-sw {
+ bottom: 0;
+ left: 0;
+ margin-bottom: -4px;
+ margin-left: -4px;
+}
+/* Dragbars */
+.jcrop-dragbar.ord-n,
+.jcrop-dragbar.ord-s {
+ height: 7px;
+ width: 100%;
+}
+.jcrop-dragbar.ord-e,
+.jcrop-dragbar.ord-w {
+ height: 100%;
+ width: 7px;
+}
+.jcrop-dragbar.ord-n {
+ margin-top: -4px;
+}
+.jcrop-dragbar.ord-s {
+ bottom: 0;
+ margin-bottom: -4px;
+}
+.jcrop-dragbar.ord-e {
+ margin-right: -4px;
+ right: 0;
+}
+.jcrop-dragbar.ord-w {
+ margin-left: -4px;
+}
/* The "jcrop-light" class/extension */
-.jcrop-light .jcrop-vline,.jcrop-light .jcrop-hline
-{
- background:#FFF;
- filter:Alpha(opacity=70)!important;
- opacity:.70!important;
-}
-.jcrop-light .jcrop-handle
-{
- -moz-border-radius:3px;
- -webkit-border-radius:3px;
- background-color:#000;
- border-color:#FFF;
- border-radius:3px;
+.jcrop-light .jcrop-vline,
+.jcrop-light .jcrop-hline {
+ background: #ffffff;
+ filter: alpha(opacity=70) !important;
+ opacity: .70!important;
+}
+.jcrop-light .jcrop-handle {
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ background-color: #000000;
+ border-color: #ffffff;
+ border-radius: 3px;
}
-
/* The "jcrop-dark" class/extension */
-.jcrop-dark .jcrop-vline,.jcrop-dark .jcrop-hline
-{
- background:#000;
- filter:Alpha(opacity=70)!important;
- opacity:.7!important;
-}
-.jcrop-dark .jcrop-handle
-{
- -moz-border-radius:3px;
- -webkit-border-radius:3px;
- background-color:#FFF;
- border-color:#000;
- border-radius:3px;
+.jcrop-dark .jcrop-vline,
+.jcrop-dark .jcrop-hline {
+ background: #000000;
+ filter: alpha(opacity=70) !important;
+ opacity: 0.7 !important;
+}
+.jcrop-dark .jcrop-handle {
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ background-color: #ffffff;
+ border-color: #000000;
+ border-radius: 3px;
+}
+/* Simple macro to turn off the antlines */
+.solid-line .jcrop-vline,
+.solid-line .jcrop-hline {
+ background: #ffffff;
}
-
/* Fix for twitter bootstrap et al. */
-.jcrop-holder img,img.jcrop-preview{ max-width: none; }
+.jcrop-holder img,
+img.jcrop-preview {
+ max-width: none;
+}
Oops, something went wrong.

0 comments on commit 0e90b53

Please sign in to comment.