Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 0 insertions, 40 deletions

diff --git a/modules/gallery/css/quick.css b/modules/gallery/css/quick.css
deleted file mode 100644
index 02f9953e..00000000
--- a/modules/gallery/css/quick.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.gItem:hover {
-  background-color: #cfdeff;
-}
-
-.gQuick {
-  border: none !important;
-  margin: 0 !important;
-  padding: 0 !important;
-}
-
-#gQuickPane {
-  background: #000;
-  border-bottom: 1px solid #ccc;
-  opacity: 0.9;
-}
-
-#gQuickPane a {
-  cursor: pointer;
-  float: left;
-  margin: 4px;
-}
-
-#gQuickPaneOptions {
-  background: #000;
-  float: left;
-  width: 100%;
-}
-
-#gQuickPaneOptions li a {
-  display: block;
-  float: none;
-  width: auto;
-  margin: 0;
-  padding: .5em .5em .5em .8em;
-  text-align: left;
-}
-
-#gQuickPaneOptions li a:hover {
-  background-color: #4d4d4d;
-}