4 files changed, 121 insertions, 2 deletions
diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
new file mode 100644
index 00000000..a4a52155
--- /dev/null
+++ b/modules/gallery/css/gallery.css
@@ -0,0 +1,118 @@
+/**
+ *  @todo Make #g-welcome-message p unecessary
+ *  @todo Review permissions dialog, find home
+ */
+
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-edit-permissions-form {
+	clear: both;
+}
+
+#g-edit-permissions-form td {
+  background-image: none;
+}
+
+#g-edit-permissions-form fieldset {
+	border: 1px solid #ccc;
+	padding: 0;
+}
+
+#g-permissions .g-denied,
+#g-permissions .g-allowed {
+  text-align: center;
+  vertical-align: middle;
+}
+
+#g-permissions .g-denied {
+  background-color: #fcc;
+}
+
+#g-permissions .g-allowed {
+  background-color: #cfc;
+}
+
+/* Move items ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-move ul {
+  padding-left: 1em;
+}
+
+#g-move .selected {
+  background: #999;
+}
+
+/* Simple uploader ~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-add-photos #SWFUpload_0 {
+  position: relative;
+  top: -200px;
+  left: 134px;
+}
+
+#g-add-photos .g-breadcrumbs {
+  border: 0;
+  margin: 0;
+  padding-left:10px;
+}
+
+#g-add-photos-canvas {
+  border: 1px solid  #ccc;
+  margin: .5em 0 .5em 0;
+  width: 469px;
+	height: 325px;
+  overflow: auto;
+}
+
+#g-add-photos button {
+  margin-bottom: .5em;
+  float: right;
+}
+#g-uploadqueue-infobar {
+  clear: both;
+}
+
+#g-uploadqueue-infobar #g-cancelupload {
+  display: none;
+  cursor: pointer;
+}
+
+#g-add-photos-canvas {
+}
+
+#g-add-photos-queue .progressbar {
+  height: 4px;
+}
+
+#g-add-photos-queue .title {
+  font-size: 1.25em;
+}
+
+#g-add-photos-queue .status {
+  font-size: .75em;
+}
+
+#g-add-photos-queue .box {
+  margin-bottom: 8px;
+  padding: 4px;
+}
+
+#g-add-photos-queue .pending {
+  background-color: #e8e8e8;
+  border: 1px solid #d7d7d7;
+}
+
+#g-add-photos-queue .error {
+  background-color: #fcc;
+  border: 1px solid #ebb;
+}
+
+#g-add-photos-queue .uploading {
+  background-color: #ff9;
+  border: 1px solid #ee8;
+}
+
+#g-add-photos-queue .complete {
+  background-color: #cfc;
+  border: 1px solid #beb;
+}
diff --git a/modules/gallery/css/upgrader.css b/modules/gallery/css/upgrader.css
index 7c377817..64e4ca07 100644
--- a/modules/gallery/css/upgrader.css
+++ b/modules/gallery/css/upgrader.css
@@ -1,6 +1,6 @@
 body {
   background: #eee;
-  font-family: Trebuchet MS;
+  font-family: 'Trebuchet MS';
   font-size: 1.1em;
 }
 
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 216efa36..2ee20417 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -266,7 +266,7 @@ class gallery_event_Core {
             ->url(url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type")));
       }
 
-      // Don't move photos from the photo page; we don't yet have a good way of redirecting after
+      // @todo Don't move photos from the photo page; we don't yet have a good way of redirecting after
       // move
       if ($page_type == "album") {
         $options_menu
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index 5f3eb2a9..49a458b7 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -21,6 +21,7 @@ class gallery_theme_Core {
   static function head($theme) {
     $session = Session::instance();
     $buf = "";
+    $theme->css("gallery.css");
     if ($session->get("debug")) {
       $theme->css("debug.css");
     }