Commit 272c8e0327acd2a6f5777b26c84b8bcdd4987f33
1 parent
44297261
Exists in
staging
and in
26 other branches
Moving colorbox images to public/images/colorbox
* Also removing the folder colorbox from stylesheets. (ActionItem2132)
Showing
29 changed files
with
83 additions
and
87 deletions
Show diff stats
app/helpers/application_helper.rb
@@ -990,7 +990,7 @@ module ApplicationHelper | @@ -990,7 +990,7 @@ module ApplicationHelper | ||
990 | 'thickbox', | 990 | 'thickbox', |
991 | 'lightbox', | 991 | 'lightbox', |
992 | 'colorpicker', | 992 | 'colorpicker', |
993 | - colorbox_stylesheet_path, | 993 | + 'colorbox', |
994 | pngfix_stylesheet_path, | 994 | pngfix_stylesheet_path, |
995 | ] + | 995 | ] + |
996 | tokeninput_stylesheets | 996 | tokeninput_stylesheets |
@@ -1005,10 +1005,6 @@ module ApplicationHelper | @@ -1005,10 +1005,6 @@ module ApplicationHelper | ||
1005 | 'iepngfix/iepngfix.css' | 1005 | 'iepngfix/iepngfix.css' |
1006 | end | 1006 | end |
1007 | 1007 | ||
1008 | - def colorbox_stylesheet_path | ||
1009 | - 'colorbox/colorbox.css' | ||
1010 | - end | ||
1011 | - | ||
1012 | def tokeninput_stylesheets | 1008 | def tokeninput_stylesheets |
1013 | ['token-input', 'token-input-facebook', 'token-input-mac'] | 1009 | ['token-input', 'token-input-facebook', 'token-input-mac'] |
1014 | end | 1010 | end |
112 Bytes
1.22 KB
111 Bytes
215 Bytes
217 Bytes
108 Bytes
108 Bytes
111 Bytes
216 Bytes
214 Bytes
9.21 KB
157 Bytes
182 Bytes
@@ -0,0 +1,82 @@ | @@ -0,0 +1,82 @@ | ||
1 | +/* | ||
2 | + ColorBox Core Style: | ||
3 | + The following CSS is consistent between example themes and should not be altered. | ||
4 | +*/ | ||
5 | +#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} | ||
6 | +#cboxOverlay{position:fixed; width:100%; height:100%;} | ||
7 | +#cboxMiddleLeft, #cboxBottomLeft{clear:left;} | ||
8 | +#cboxContent{position:relative;} | ||
9 | +#cboxLoadedContent{overflow:auto;} | ||
10 | +#cboxTitle{margin:0;} | ||
11 | +#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;} | ||
12 | +#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} | ||
13 | +.cboxPhoto{float:left; margin:auto; border:0; display:block;} | ||
14 | +.cboxIframe{width:100%; height:100%; display:block; border:0;} | ||
15 | + | ||
16 | +/* | ||
17 | + User Style: | ||
18 | + Change the following styles to modify the appearance of ColorBox. They are | ||
19 | + ordered & tabbed in a way that represents the nesting of the generated HTML. | ||
20 | +*/ | ||
21 | +#cboxOverlay{background:url(/images/colorbox/overlay.png) repeat 0 0;} | ||
22 | +#colorbox{} | ||
23 | + #cboxTopLeft{width:21px; height:21px; background:url(/images/colorbox/controls.png) no-repeat -100px 0;} | ||
24 | + #cboxTopRight{width:21px; height:21px; background:url(/images/colorbox/controls.png) no-repeat -129px 0;} | ||
25 | + #cboxBottomLeft{width:21px; height:21px; background:url(/images/colorbox/controls.png) no-repeat -100px -29px;} | ||
26 | + #cboxBottomRight{width:21px; height:21px; background:url(/images/colorbox/controls.png) no-repeat -129px -29px;} | ||
27 | + #cboxMiddleLeft{width:21px; background:url(/images/colorbox/controls.png) left top repeat-y;} | ||
28 | + #cboxMiddleRight{width:21px; background:url(/images/colorbox/controls.png) right top repeat-y;} | ||
29 | + #cboxTopCenter{height:21px; background:url(/images/colorbox/border.png) 0 0 repeat-x;} | ||
30 | + #cboxBottomCenter{height:21px; background:url(/images/colorbox/border.png) 0 -29px repeat-x;} | ||
31 | + #cboxContent{background:#fff; overflow:hidden;} | ||
32 | + #cboxError{padding:50px; border:1px solid #ccc;} | ||
33 | + #cboxLoadedContent{margin-bottom:28px;} | ||
34 | + #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;} | ||
35 | + #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;} | ||
36 | + #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;} | ||
37 | + #cboxPrevious{position:absolute; bottom:0; left:0; background:url(/images/colorbox/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;} | ||
38 | + #cboxPrevious.hover{background-position:-75px -25px;} | ||
39 | + #cboxNext{position:absolute; bottom:0; left:27px; background:url(/images/colorbox/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;} | ||
40 | + #cboxNext.hover{background-position:-50px -25px;} | ||
41 | + #cboxLoadingOverlay{background:url(/images/colorbox/loading_background.png) no-repeat center center;} | ||
42 | + #cboxLoadingGraphic{background:url(/images/colorbox/loading.gif) no-repeat center center;} | ||
43 | + #cboxClose{position:absolute; bottom:0; right:0; background:url(/images/colorbox/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;} | ||
44 | + #cboxClose.hover{background-position:-25px -25px;} | ||
45 | + | ||
46 | +/* | ||
47 | + The following fixes a problem where IE7+ replaces a PNG's alpha transparency with a black fill | ||
48 | + when an alpha filter (opacity change) is set on the element or ancestor element. | ||
49 | +*/ | ||
50 | +.cboxIE #cboxTopLeft, | ||
51 | +.cboxIE #cboxTopCenter, | ||
52 | +.cboxIE #cboxTopRight, | ||
53 | +.cboxIE #cboxBottomLeft, | ||
54 | +.cboxIE #cboxBottomCenter, | ||
55 | +.cboxIE #cboxBottomRight, | ||
56 | +.cboxIE #cboxMiddleLeft, | ||
57 | +.cboxIE #cboxMiddleRight { | ||
58 | + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF); | ||
59 | +} | ||
60 | + | ||
61 | +/* | ||
62 | + The following provides PNG transparency support for IE6 | ||
63 | +*/ | ||
64 | +.cboxIE6 #cboxTopLeft{background:url(/images/colorbox/ie6/borderTopLeft.png);} | ||
65 | +.cboxIE6 #cboxTopCenter{background:url(/images/colorbox/ie6/borderTopCenter.png);} | ||
66 | +.cboxIE6 #cboxTopRight{background:url(/images/colorbox/ie6/borderTopRight.png);} | ||
67 | +.cboxIE6 #cboxBottomLeft{background:url(/images/colorbox/ie6/borderBottomLeft.png);} | ||
68 | +.cboxIE6 #cboxBottomCenter{background:url(/images/colorbox/ie6/borderBottomCenter.png);} | ||
69 | +.cboxIE6 #cboxBottomRight{background:url(/images/colorbox/ie6/borderBottomRight.png);} | ||
70 | +.cboxIE6 #cboxMiddleLeft{background:url(/images/colorbox/ie6/borderMiddleLeft.png);} | ||
71 | +.cboxIE6 #cboxMiddleRight{background:url(/images/colorbox/ie6/borderMiddleRight.png);} | ||
72 | + | ||
73 | +.cboxIE6 #cboxTopLeft, | ||
74 | +.cboxIE6 #cboxTopCenter, | ||
75 | +.cboxIE6 #cboxTopRight, | ||
76 | +.cboxIE6 #cboxBottomLeft, | ||
77 | +.cboxIE6 #cboxBottomCenter, | ||
78 | +.cboxIE6 #cboxBottomRight, | ||
79 | +.cboxIE6 #cboxMiddleLeft, | ||
80 | +.cboxIE6 #cboxMiddleRight { | ||
81 | + _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')"); | ||
82 | +} |
public/stylesheets/colorbox/colorbox.css
@@ -1,82 +0,0 @@ | @@ -1,82 +0,0 @@ | ||
1 | -/* | ||
2 | - ColorBox Core Style: | ||
3 | - The following CSS is consistent between example themes and should not be altered. | ||
4 | -*/ | ||
5 | -#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;} | ||
6 | -#cboxOverlay{position:fixed; width:100%; height:100%;} | ||
7 | -#cboxMiddleLeft, #cboxBottomLeft{clear:left;} | ||
8 | -#cboxContent{position:relative;} | ||
9 | -#cboxLoadedContent{overflow:auto;} | ||
10 | -#cboxTitle{margin:0;} | ||
11 | -#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%;} | ||
12 | -#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;} | ||
13 | -.cboxPhoto{float:left; margin:auto; border:0; display:block;} | ||
14 | -.cboxIframe{width:100%; height:100%; display:block; border:0;} | ||
15 | - | ||
16 | -/* | ||
17 | - User Style: | ||
18 | - Change the following styles to modify the appearance of ColorBox. They are | ||
19 | - ordered & tabbed in a way that represents the nesting of the generated HTML. | ||
20 | -*/ | ||
21 | -#cboxOverlay{background:url(/stylesheets/colorbox/images/overlay.png) repeat 0 0;} | ||
22 | -#colorbox{} | ||
23 | - #cboxTopLeft{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -100px 0;} | ||
24 | - #cboxTopRight{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -129px 0;} | ||
25 | - #cboxBottomLeft{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -100px -29px;} | ||
26 | - #cboxBottomRight{width:21px; height:21px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -129px -29px;} | ||
27 | - #cboxMiddleLeft{width:21px; background:url(/stylesheets/colorbox/images/controls.png) left top repeat-y;} | ||
28 | - #cboxMiddleRight{width:21px; background:url(/stylesheets/colorbox/images/controls.png) right top repeat-y;} | ||
29 | - #cboxTopCenter{height:21px; background:url(/stylesheets/colorbox/images/border.png) 0 0 repeat-x;} | ||
30 | - #cboxBottomCenter{height:21px; background:url(/stylesheets/colorbox/images/border.png) 0 -29px repeat-x;} | ||
31 | - #cboxContent{background:#fff; overflow:hidden;} | ||
32 | - #cboxError{padding:50px; border:1px solid #ccc;} | ||
33 | - #cboxLoadedContent{margin-bottom:28px;} | ||
34 | - #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;} | ||
35 | - #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;} | ||
36 | - #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;} | ||
37 | - #cboxPrevious{position:absolute; bottom:0; left:0; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;} | ||
38 | - #cboxPrevious.hover{background-position:-75px -25px;} | ||
39 | - #cboxNext{position:absolute; bottom:0; left:27px; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;} | ||
40 | - #cboxNext.hover{background-position:-50px -25px;} | ||
41 | - #cboxLoadingOverlay{background:url(/stylesheets/colorbox/images/loading_background.png) no-repeat center center;} | ||
42 | - #cboxLoadingGraphic{background:url(/stylesheets/colorbox/images/loading.gif) no-repeat center center;} | ||
43 | - #cboxClose{position:absolute; bottom:0; right:0; background:url(/stylesheets/colorbox/images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;} | ||
44 | - #cboxClose.hover{background-position:-25px -25px;} | ||
45 | - | ||
46 | -/* | ||
47 | - The following fixes a problem where IE7+ replaces a PNG's alpha transparency with a black fill | ||
48 | - when an alpha filter (opacity change) is set on the element or ancestor element. | ||
49 | -*/ | ||
50 | -.cboxIE #cboxTopLeft, | ||
51 | -.cboxIE #cboxTopCenter, | ||
52 | -.cboxIE #cboxTopRight, | ||
53 | -.cboxIE #cboxBottomLeft, | ||
54 | -.cboxIE #cboxBottomCenter, | ||
55 | -.cboxIE #cboxBottomRight, | ||
56 | -.cboxIE #cboxMiddleLeft, | ||
57 | -.cboxIE #cboxMiddleRight { | ||
58 | - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF); | ||
59 | -} | ||
60 | - | ||
61 | -/* | ||
62 | - The following provides PNG transparency support for IE6 | ||
63 | -*/ | ||
64 | -.cboxIE6 #cboxTopLeft{background:url(/stylesheets/colorbox/images/ie6/borderTopLeft.png);} | ||
65 | -.cboxIE6 #cboxTopCenter{background:url(/stylesheets/colorbox/images/ie6/borderTopCenter.png);} | ||
66 | -.cboxIE6 #cboxTopRight{background:url(/stylesheets/colorbox/images/ie6/borderTopRight.png);} | ||
67 | -.cboxIE6 #cboxBottomLeft{background:url(/stylesheets/colorbox/images/ie6/borderBottomLeft.png);} | ||
68 | -.cboxIE6 #cboxBottomCenter{background:url(/stylesheets/colorbox/images/ie6/borderBottomCenter.png);} | ||
69 | -.cboxIE6 #cboxBottomRight{background:url(/stylesheets/colorbox/images/ie6/borderBottomRight.png);} | ||
70 | -.cboxIE6 #cboxMiddleLeft{background:url(/stylesheets/colorbox/images/ie6/borderMiddleLeft.png);} | ||
71 | -.cboxIE6 #cboxMiddleRight{background:url(/stylesheets/colorbox/images/ie6/borderMiddleRight.png);} | ||
72 | - | ||
73 | -.cboxIE6 #cboxTopLeft, | ||
74 | -.cboxIE6 #cboxTopCenter, | ||
75 | -.cboxIE6 #cboxTopRight, | ||
76 | -.cboxIE6 #cboxBottomLeft, | ||
77 | -.cboxIE6 #cboxBottomCenter, | ||
78 | -.cboxIE6 #cboxBottomRight, | ||
79 | -.cboxIE6 #cboxMiddleLeft, | ||
80 | -.cboxIE6 #cboxMiddleRight { | ||
81 | - _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')"); | ||
82 | -} |
public/stylesheets/colorbox/images/border.png
112 Bytes
public/stylesheets/colorbox/images/controls.png
1.22 KB
public/stylesheets/colorbox/images/ie6/borderBottomCenter.png
111 Bytes
public/stylesheets/colorbox/images/ie6/borderBottomLeft.png
215 Bytes
public/stylesheets/colorbox/images/ie6/borderBottomRight.png
217 Bytes
public/stylesheets/colorbox/images/ie6/borderMiddleLeft.png
108 Bytes
public/stylesheets/colorbox/images/ie6/borderMiddleRight.png
108 Bytes
public/stylesheets/colorbox/images/ie6/borderTopCenter.png
111 Bytes
public/stylesheets/colorbox/images/ie6/borderTopLeft.png
216 Bytes
public/stylesheets/colorbox/images/ie6/borderTopRight.png
214 Bytes
public/stylesheets/colorbox/images/loading.gif
9.21 KB
public/stylesheets/colorbox/images/loading_background.png
157 Bytes
public/stylesheets/colorbox/images/overlay.png
182 Bytes