Skip to content

Commit 6d2fef0

Browse files
committed
Merged js resources.
Moved css/images into themes. Expose CSS theme in package. Version Bump.
1 parent 912c15e commit 6d2fef0

File tree

11 files changed

+26
-34
lines changed

11 files changed

+26
-34
lines changed

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-colorbox",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"author": {
55
"name": "Igor Lino",
66
"url": "http://igorlino.github.io/angular-colorbox/"
@@ -12,8 +12,8 @@
1212
}
1313
],
1414
"main": [
15-
"js/colorbox.module.js",
16-
"js/colorbox.directive.js"
15+
"js/angular-colorbox.js",
16+
"themes/dark/colorbox-darktheme-css"
1717
],
1818
"ignore": [
1919
"**/.*",

demo/index.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,18 @@
4545
<script src='https://rawgit.com/igorlino/angular-elevatezoom-plus/master/js/ezplus.module.js'></script>
4646
<script src='https://rawgit.com/igorlino/angular-elevatezoom-plus/master/js/ezplus.directive.js'></script>
4747

48-
<!--<script src='https://rawgit.com/igorlino/angular-colorbox/master/js/colorbox.module.js'></script>
49-
<script src='https://rawgit.com/igorlino/angular-colorbox/master/js/colorbox.directive.js'></script>-->
48+
<!--<script src='https://rawgit.com/igorlino/angular-colorbox/master/js/angular-colorbox.js'></script>-->
5049

51-
<script src='../js/colorbox.module.js'></script>
52-
<script src='../js/colorbox.directive.js'></script>
50+
<script src='../js/angular-colorbox.js'></script>
5351

5452
<!--<script src='https://rawgit.com/igorlino/angular-colorbox/master/demo/controller.js'></script>
5553
<script src='https://rawgit.com/igorlino/angular-colorbox/master/demo/app.js'></script>-->
5654

5755
<script src='controller.js'></script>
5856
<script src='app.js'></script>
5957

60-
<link rel="stylesheet" type="text/css" href="colorbox-darktheme.css" media="screen"/>
61-
<!--<link rel="stylesheet" type="text/css" href="https://rawgit.com/igorlino/angular-colorbox/master/demo/colorbox-darktheme.css" media="screen" />-->
58+
<link rel="stylesheet" type="text/css" href="../themes/dark/colorbox-darktheme.css" media="screen"/>
59+
<!--<link rel="stylesheet" type="text/css" href="https://rawgit.com/igorlino/angular-colorbox/master/themes/dark/colorbox-darktheme.css" media="screen" />-->
6260
<script src='https://cdnjs.cloudflare.com/ajax/libs/jquery.colorbox/1.4.33/jquery.colorbox.js'></script>
6361

6462
<script src='https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.0/ui-bootstrap-tpls.min.js'></script>

js/colorbox.directive.js renamed to js/angular-colorbox.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function () {
22
'use strict';
33

4-
angular.module('colorbox')
4+
angular.module('colorbox', [])
55
.directive('colorbox', colorboxDirective);
66

77
colorboxDirective.$inject = ['$compile', '$rootScope', '$http', '$parse', '$timeout'];

js/colorbox.module.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-colorbox",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"title": "Angular Colorbox",
55
"description": "Angular directive for Colorbox, the jQuery lightbox and modal window plugin.",
66
"keywords": [

demo/colorbox-darktheme.css renamed to themes/dark/colorbox-darktheme.css

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,42 @@
1515
.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
1616
#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
1717

18-
/*
18+
/*
1919
User Style:
2020
Change the following styles to modify the appearance of Colorbox. They are
2121
ordered & tabbed in a way that represents the nesting of the generated HTML.
2222
*/
23-
#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}
23+
#cboxOverlay{background:url(colorbox/overlay.png) repeat 0 0;}
2424
#colorbox{outline:0;}
25-
#cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;}
26-
#cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;}
27-
#cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px -29px;}
28-
#cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px -29px;}
29-
#cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;}
30-
#cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;}
31-
#cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;}
32-
#cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;}
25+
#cboxTopLeft{width:21px; height:21px; background:url(colorbox/controls.png) no-repeat -101px 0;}
26+
#cboxTopRight{width:21px; height:21px; background:url(colorbox/controls.png) no-repeat -130px 0;}
27+
#cboxBottomLeft{width:21px; height:21px; background:url(colorbox/controls.png) no-repeat -101px -29px;}
28+
#cboxBottomRight{width:21px; height:21px; background:url(colorbox/controls.png) no-repeat -130px -29px;}
29+
#cboxMiddleLeft{width:21px; background:url(colorbox/controls.png) left top repeat-y;}
30+
#cboxMiddleRight{width:21px; background:url(colorbox/controls.png) right top repeat-y;}
31+
#cboxTopCenter{height:21px; background:url(colorbox/border.png) 0 0 repeat-x;}
32+
#cboxBottomCenter{height:21px; background:url(colorbox/border.png) 0 -29px repeat-x;}
3333
#cboxContent{background:#fff; overflow:hidden;}
3434
.cboxIframe{background:#fff;}
3535
#cboxError{padding:50px; border:1px solid #ccc;}
3636
#cboxLoadedContent{margin-bottom:28px;}
3737
#cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
3838
#cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
39-
#cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
40-
#cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
39+
#cboxLoadingOverlay{background:url(colorbox/loading_background.png) no-repeat center center;}
40+
#cboxLoadingGraphic{background:url(colorbox/loading.gif) no-repeat center center;}
4141

4242
/* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
4343
#cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
44-
44+
4545
/* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
4646
#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
4747

4848
#cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
49-
#cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
49+
#cboxPrevious{position:absolute; bottom:0; left:0; background:url(colorbox/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
5050
#cboxPrevious:hover{background-position:-75px -25px;}
51-
#cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
51+
#cboxNext{position:absolute; bottom:0; left:27px; background:url(colorbox/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
5252
#cboxNext:hover{background-position:-50px -25px;}
53-
#cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
53+
#cboxClose{position:absolute; bottom:0; right:0; background:url(colorbox/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
5454
#cboxClose:hover{background-position:-25px -25px;}
5555

5656
/*
@@ -67,4 +67,4 @@
6767
.cboxIE #cboxMiddleLeft,
6868
.cboxIE #cboxMiddleRight {
6969
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
70-
}
70+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)