summaryrefslogtreecommitdiff
path: root/modules/gallery/css
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2011-05-12 23:48:54 +0000
committerNathan Kinkade <nath@nkinka.de>2011-05-12 23:48:54 +0000
commit2ad445441974c64599df496ba4a585415aa41169 (patch)
tree49b2860fdac2d2ff16134bfa2aa8d8a972b93301 /modules/gallery/css
parent1f7c1f18c651c58048e92d615c71ac0fe6691c10 (diff)
parent9aeb824aa1d15bd94bd7cef0a322c4e8a667e67b (diff)
Manually merged a conflict after pulling from upstream.
Diffstat (limited to 'modules/gallery/css')
-rw-r--r--modules/gallery/css/gallery.css6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index 275a3d7d..ecf89565 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -29,12 +29,12 @@
#g-add-photos-canvas object,
#g-add-photos-button {
- left: 137px;
- margin: .5em 0;
+ left: 90px;
+ margin: .5em 0;
padding: .4em 1em;
position: absolute;
top: 0;
- width: 175px;
+ width: 300px;
}
#g-add-photos-canvas object {