diff --git a/css/styles.css b/css/styles.css index 6385f41..a6523ea 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,5 +1,5 @@ -.cb-control * { +.cb-control { font-family: helvetica, arial, sans-serif; font-size: 12px; } @@ -77,81 +77,65 @@ border-radius: 4px; } +#cb-toolbar #cb-comic-info { + float: right; + line-height: 24px; +} + #cb-toolbar { top: 0; border-bottom: 2px solid #444; } #cb-toolbar button { - height: 32px; - width: 32px; + height: 24px; + width: 24px; color: transparent; border: none; + background-image: url("../img/iconic/sprite.png"); background-color: transparent; background-repeat: no-repeat; - background-position: center; margin: 0 16px; cursor: pointer; } -#cb-toolbar button.cb-close { - background-image: url(../img/iconic/white/x_28x28.png); +#cb-toolbar button:hover, +#cb-toolbar button:active, +#cb-toolbar button.active { + background-position-x: -24px; } -#cb-toolbar button.cb-close:hover, -#cb-toolbar button.cb-close:active { - background-image: url(../img/iconic/green/x_28x28.png); +#cb-toolbar button.disabled { + background-position-x: -48px; +} + +#cb-toolbar button.cb-close { + background-position-y: -120px; } #cb-toolbar button.cb-color { - background-image: url(../img/iconic/white/cog_alt_32x32.png); -} - -#cb-toolbar button.cb-color:hover, -#cb-toolbar button.cb-color:active, -#cb-toolbar button.cb-color.active { - background-image: url(../img/iconic/green/cog_alt_32x32.png); + background-position-y: 0; } #cb-toolbar button.cb-layout { - background-image: url(../img/iconic/white/document_fill_32x32.png); -} - -#cb-toolbar button.cb-layout:hover, -#cb-toolbar button.cb-layout:active { - background-image: url(../img/iconic/green/document_fill_32x32.png); + background-position-y: -24px; } #cb-toolbar button.cb-zoom-out { - background-image: url(../img/iconic/white/minus_32x8.png); -} - -#cb-toolbar button.cb-zoom-out:hover, -#cb-toolbar button.cb-zoom-out:active { - background-image: url(../img/iconic/green/minus_32x8.png); + background-position-y: -72px; } #cb-toolbar button.cb-zoom-in { - background-image: url(../img/iconic/white/plus_32x32.png); -} - -#cb-toolbar button.cb-zoom-in:hover, -#cb-toolbar button.cb-zoom-in:active { - background-image: url(../img/iconic/green/plus_32x32.png); + background-position-y: -96px; } #cb-toolbar button.cb-fit-width { - background-image: url(../img/iconic/white/fullscreen_32x32.png); -} - -#cb-toolbar button.cb-fit-width:hover, -#cb-toolbar button.cb-fit-width:active { - background-image: url(../img/iconic/green/fullscreen_32x32.png); + background-position-y: -48px; } #cb-color { width: 246px; - top: 52px; + top: 44px; left: 136px; z-index: 1; border: 2px solid #444; diff --git a/img/iconic/green/cog_alt_32x32.png b/img/iconic/green/cog_alt_32x32.png deleted file mode 100644 index 97936e7..0000000 Binary files a/img/iconic/green/cog_alt_32x32.png and /dev/null differ diff --git a/img/iconic/green/document_fill_32x32.png b/img/iconic/green/document_fill_32x32.png deleted file mode 100644 index 071e74c..0000000 Binary files a/img/iconic/green/document_fill_32x32.png and /dev/null differ diff --git a/img/iconic/green/fullscreen_32x32.png b/img/iconic/green/fullscreen_32x32.png deleted file mode 100644 index 6d6832f..0000000 Binary files a/img/iconic/green/fullscreen_32x32.png and /dev/null differ diff --git a/img/iconic/green/magnifying_glass_32x32.png b/img/iconic/green/magnifying_glass_32x32.png deleted file mode 100644 index d115cfa..0000000 Binary files a/img/iconic/green/magnifying_glass_32x32.png and /dev/null differ diff --git a/img/iconic/green/minus_32x8.png b/img/iconic/green/minus_32x8.png deleted file mode 100644 index 177e703..0000000 Binary files a/img/iconic/green/minus_32x8.png and /dev/null differ diff --git a/img/iconic/green/plus_32x32.png b/img/iconic/green/plus_32x32.png deleted file mode 100644 index 35743cd..0000000 Binary files a/img/iconic/green/plus_32x32.png and /dev/null differ diff --git a/img/iconic/green/x_28x28.png b/img/iconic/green/x_28x28.png deleted file mode 100644 index 7072f56..0000000 Binary files a/img/iconic/green/x_28x28.png and /dev/null differ diff --git a/img/iconic/sprite.png b/img/iconic/sprite.png new file mode 100644 index 0000000..d90c23e Binary files /dev/null and b/img/iconic/sprite.png differ diff --git a/img/iconic/sprite.psd b/img/iconic/sprite.psd new file mode 100644 index 0000000..f7c1ab6 Binary files /dev/null and b/img/iconic/sprite.psd differ diff --git a/img/iconic/white/cog_alt_32x32.png b/img/iconic/white/cog_alt_32x32.png deleted file mode 100644 index 447ded5..0000000 Binary files a/img/iconic/white/cog_alt_32x32.png and /dev/null differ diff --git a/img/iconic/white/document_fill_32x32.png b/img/iconic/white/document_fill_32x32.png deleted file mode 100644 index d8992b1..0000000 Binary files a/img/iconic/white/document_fill_32x32.png and /dev/null differ diff --git a/img/iconic/white/fullscreen_32x32.png b/img/iconic/white/fullscreen_32x32.png deleted file mode 100644 index 5a38874..0000000 Binary files a/img/iconic/white/fullscreen_32x32.png and /dev/null differ diff --git a/img/iconic/white/magnifying_glass_32x32.png b/img/iconic/white/magnifying_glass_32x32.png deleted file mode 100644 index c20a383..0000000 Binary files a/img/iconic/white/magnifying_glass_32x32.png and /dev/null differ diff --git a/img/iconic/white/minus_32x8.png b/img/iconic/white/minus_32x8.png deleted file mode 100644 index 3aec4a8..0000000 Binary files a/img/iconic/white/minus_32x8.png and /dev/null differ diff --git a/img/iconic/white/plus_32x32.png b/img/iconic/white/plus_32x32.png deleted file mode 100644 index 9ddfb4e..0000000 Binary files a/img/iconic/white/plus_32x32.png and /dev/null differ diff --git a/img/iconic/white/reload_12x14.png b/img/iconic/white/reload_12x14.png deleted file mode 100644 index c634491..0000000 Binary files a/img/iconic/white/reload_12x14.png and /dev/null differ diff --git a/img/iconic/white/x_28x28.png b/img/iconic/white/x_28x28.png deleted file mode 100644 index ed861c8..0000000 Binary files a/img/iconic/white/x_28x28.png and /dev/null differ diff --git a/lib/ComicBook.js b/lib/ComicBook.js index 515e68e..2f14547 100755 --- a/lib/ComicBook.js +++ b/lib/ComicBook.js @@ -5,7 +5,6 @@ Fo sho: - fix last page loading bug - - make control images sprites - disable the strech button if in an auto zoom mode - improve prev/next buttons, only show them when they can possibly work (not at beginning/end) - check for html5 feature support where used: diveintohtml5.org/everything.html or www.modernizr.com