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

1 files changed, 122 insertions, 134 deletions

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 03c13cc1..e37de70e 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -4,24 +4,22 @@
  * @requires YUI reset, font, grids CSS
  *
  * Sheet organization:
- * 1)  Basic HTML elements
- * 2)  Reusable classes
- * 3)  Reusable content blocks
- * 4)  Page layout containers
- * 5)  Content blocks in specific layout containers
- * 6)  Navigation and menus
- * 7)  Browser hacks
- * 8)  jQuery and jQuery UI
+ *  1)  Basic HTML elements
+ *  2)  Reusable classes
+ *  3)  Reusable content blocks
+ *  4)  Page layout containers
+ *  5)  Content blocks in specific layout containers
+ *  6)  Navigation and menus
+ *  7)  Browser hacks
+ *  8)  jQuery and jQuery UI
+ *  9)  Right-to-left language styles
+ * 10)  Digibug Print
  */
 
 /** *******************************************************************
  * 1) Basic HTML elements
  **********************************************************************/
 
-.rtl {
-  direction: rtl;
-}
-
 body, html {
   background-color: #ccc;
   font-family: 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
@@ -31,17 +29,11 @@ p {
   margin-bottom: 1em;
 }
 
-strong {
-  font-weight: bold;
-}
-
 em {
   font-style: oblique;
 }
 
-/* Headings ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-h1, h2, h3, h4, h5 {
+h1, h2, h3, h4, h5, strong, th {
   font-weight: bold;
 }
 
@@ -53,6 +45,10 @@ h1 {
   margin-bottom: 1em;
 }
 
+#gProgress h1 {
+  font-size: 1.1em;
+}
+
 h2 {
   font-size: 1.4em;
 }
@@ -61,6 +57,10 @@ h2 {
   font-size: 1.2em;
 }
 
+#gSidebar .gBlock li {
+  margin-bottom: .6em;
+}
+
 h3 {
   font-size: 1.2em;
 }
@@ -71,7 +71,8 @@ a,
 .gMenu a,
 #gDialog a,
 .gButtonLink,
-.gButtonLink:hover {
+.gButtonLink:hover,
+.gButtonLink:active {
   color: #5382BF !important;
   text-decoration: none;
   -moz-outline-style: none;
@@ -92,11 +93,12 @@ a:hover,
   margin: .3em 1em;
 }
 
-#gForgotPasswordLink, .rtl #gDialog .gCancel {
+#gForgotPasswordLink {
   float: right;
+  font-size: .9em;
 }
 
-#gDialog .gCancel, .rtl #gForgotPasswordLink {
+#gDialog .gCancel {
   float: left;
 }
 
@@ -115,15 +117,6 @@ th {
   text-align: left;
 }
 
-.rtl caption,
-.rtl th {
-  text-align: right;
-}
-
-th {
-  font-weight: bold;
-}
-
 th,
 td {
   border: none;
@@ -152,7 +145,9 @@ legend {
 
 #gHeader legend,
 #gSidebar legend,
-#gContent #gSearchForm legend {
+#gContent #gSearchForm legend,
+input[type="hidden"],
+.gShortForm label {
   display: none;
 }
 
@@ -174,10 +169,6 @@ textarea {
   color: #333;
 }
 
-input[type="hidden"] {
-  display: none;
-}
-
 textarea {
   width: 100%;
   height: 12em;
@@ -205,10 +196,6 @@ form ul ul li {
   float: left;
 }
 
-.rtl form ul ul li {
-  float: right;
-}
-
 input,
 select,
 textarea {
@@ -224,11 +211,6 @@ input[type="reset"] {
   float: left;
 }
 
-.rtl input[type="submit"],
-.rtl input[type="reset"] {
-  float: right;
-}
-
 /* Form validation ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .gValidationRule {
@@ -330,7 +312,7 @@ form p.gError,
 }
 
 form .gError {
-	color: #f00;
+  color: #f00;
 }
 
 #gSiteStatus .gError,
@@ -368,7 +350,7 @@ form p.gError {
 
 form .gError,
 .gPager .gInfo {
-	background-color: #fff;
+  background-color: #fff;
 }
 
 #gAdminMaintenance .gError,
@@ -385,14 +367,6 @@ form .gError,
   padding: .4em 0;
 }
 
-.rtl .gShortForm li {
-  float: right;
-}
-
-.gShortForm label {
-  display: none;
-}
-
 .gShortForm input[type="text"] {
   color: #666;
   padding: .3em .6em;
@@ -414,7 +388,7 @@ form .gError,
 /* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
 
 #gHeader {
-	background-color: #e8e8e8;
+  background-color: #e8e8e8;
   border-bottom: 1px solid #fff;
   font-size: .8em;
   margin-bottom: 1em;
@@ -435,7 +409,7 @@ form .gError,
 }
 
 #gFooter {
-	background-color: #e8e8e8;
+  background-color: #e8e8e8;
   border-top: 1px solid #ccc;
   font-size: .8em;
   margin-top: 20px;
@@ -453,21 +427,12 @@ form .gError,
   margin: -4px 10px 0 0;
 }
 
-.rtl #gHeader #gLogo {
-  float: right;
-}
-
 #gHeader #gQuickSearchForm {
   clear: right;
   float: right;
   margin: 1em 0;
 }
 
-.rtl #gHeader #gQuickSearchForm {
-  clear: left;
-  float: left;
-}
-
 #gHeader #gQuickSearchForm input[type='text'] {
   width: 17em;
 }
@@ -481,14 +446,6 @@ form .gError,
   padding-left: 1em;
 }
 
-/* Album/Photo information ~~~~~~~~~~~~~~~ */
-
-#gContent #gInfo {
-}
-
-#gContent #gInfo .gDescription {
-}
-
 /* Album content ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gContent #gAlbumGrid {
@@ -508,11 +465,6 @@ form .gError,
   width: 213px;
 }
 
-
-.rtl #gContent #gAlbumGrid .gItem {
-  float: right;
-}
-
 #gContent #gAlbumGrid .gItem h2 {
   margin: 5px 0;
 }
@@ -618,10 +570,6 @@ form .gError,
   float: right;
 }
 
-.rtl #gHeader #gLoginMenu {
-  float: left;
-}
-
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gSiteMenu {
@@ -630,10 +578,6 @@ form .gError,
   padding: 0 20px 0 0;
 }
 
-.rtl #gSiteMenu {
-  float: right;
-}
-
 #gSiteMenu ul {
   margin-bottom: 0;
 }
@@ -665,6 +609,10 @@ form .gError,
   background-image: url('../images/ico-view-comments.png');
 }
 
+#gViewMenu #gDigibugLink {
+  background-image: url('../images/ico-print.png');
+}
+
 /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .gBreadcrumbs {
@@ -681,10 +629,6 @@ form .gError,
   padding: 10px 6px 10px 16px !important;
 }
 
-.rtl .gBreadcrumbs li {
-  float: right;
-}
-
 .gBreadcrumbs li.root {
   background: transparent;
 }
@@ -700,7 +644,7 @@ form .gError,
 }
 
 #gAddPhotos .gBreadcrumbs {
-	font-size: .9em;
+  font-size: .9em;
 }
 
 /* Tags and cloud ~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -785,10 +729,6 @@ form .gError,
   width: 30%;
 }
 
-.rtl .gPager li {
-  float: right;
-}
-
 .gPager .gInfo {
   text-align: center;
   width: 40%;
@@ -833,14 +773,14 @@ form .gError,
 }
 
 .gDraggable {
-	cursor: move;
+  cursor: move;
 }
 
 .gDropTarget {
-	background-color: #cfdeff;
-	border: 1px dotted #999;
-	height: 100px;
-	margin: 1em 0;
+  background-color: #cfdeff;
+  border: 1px dotted #999;
+  height: 100px;
+  margin: 1em 0;
 }
 
 /* jQuery UI Dialog ~~~~~~~~~~~~~~~~~~~~~~ */
@@ -852,19 +792,11 @@ form .gError,
 }
 
 #gDialog {
-  font-family: inherit;
-  font-size: inherit;
   text-align: left;
 }
 
-.rtl #gDialog {
-  font-family: inherit;
-  font-size: inherit;
-  text-align: right;
-}
-
 #gDialog li {
-	padding-left: 0;
+  padding-left: 0;
 }
 
 #gDialog form input[type="text"],
@@ -904,10 +836,6 @@ form .gError,
   float: left;
 }
 
-.rtl .gButtonSet li {
-  float: right;
-}
-
 .gButtonSet .gButtonLink {
   margin: 0;
 }
@@ -917,19 +845,11 @@ form .gError,
   margin-right: .2em;
 }
 
-.rtl .ui-icon-left .ui-icon {
-  float: right;
-}
-
 .ui-icon-right .ui-icon {
   float: right;
   margin-left: .2em;
 }
 
-.rtl .ui-icon-right .ui-icon {
-  float: left;
-}
-
 .ui-icon-rotate-ccw {
   background-position: -192px -64px;
 }
@@ -949,6 +869,7 @@ form .gError,
 }
 
 /* Server Add */
+
 .gCheckboxTree input {
   display: inline;
 }
@@ -987,7 +908,7 @@ form .gError,
   font-size: 1em;
   padding: 0;
   margin: 0;
-  border-top-width: 0px;
+  border-top-width: 0;
 }
 
 #gServerAdd p {
@@ -998,18 +919,32 @@ form .gError,
   padding: 10px 6px 10px 16px;
 }
 
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gPermissions .gDenied,
+#gPermissions .gAllowed {
+  text-align: center;
+  vertical-align: middle;
+}
+#gPermissions .gDenied {
+  background-color: #fcc;
+}
+#gPermissions .gAllowed {
+  background-color: #cfc;
+}
 
 /*************** STUFF THAT NEEDS A HOME ****************/
+
 .gProgressBar {
   height: 1em;
   width: 100%;
-  margin-top: 0.5em;
+  margin-top: .5em;
   display: inline-block;
 }
 
 #gAddPhotos p {
-  margin: 0px;
-  padding: 0px;
+  margin: 0;
+  padding: 0;
 }
 
 #gAddPhotosCanvas {
@@ -1055,15 +990,68 @@ form .gError,
   border: 1px solid #beb;
 }
 
-/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#gAdminG2ImportNotes {
+  padding-bottom: 20px;
+}
 
-#gPermissions .gDenied, #gPermissions .gAllowed {
-  text-align: center;
-  vertical-align: middle;
+#gAdminG2ImportDetails {
+  padding-top: 20px;
 }
-#gPermissions .gDenied {
-  background-color: #fcc;
+
+#gAdminG2ImportDetails .gWarning {
+  margin-top: 4px;
 }
-#gPermissions .gAllowed {
-  background-color: #cfc;
+
+#gAdminG2ImportDetails .gInfo {
+  padding: 2px;
+  border: 1px solid #999;
+  margin-bottom: 10px;
+}
+
+#gAdminG2ImportNotes p,
+#gAdminG2ImportDetails .gInfo p {
+  padding: 0;
+  margin: 0;
+}
+
+#gAdminG2ImportNotes ul li,
+#gAdminG2Import .gInfo ul li {
+  padding-left: 0;
+  margin-left: 20px;
+  list-style-type: disc;
+}
+
+/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl {
+  direction: rtl;
+}
+
+.rtl caption,
+.rtl th,
+.rtl #gDialog {
+  text-align: right;
+}
+
+.rtl #gHeader #gQuickSearchForm,
+.rtl #gForgotPasswordLink,
+.rtl #gHeader #gLoginMenu,
+.rtl .ui-icon-right .ui-icon {
+  clear: left;
+  float: left;
+}
+
+.rtl #gDialog .gCancel,
+.rtl form ul ul li,
+.rtl input[type="submit"],
+.rtl input[type="reset"],
+.rtl .gShortForm li,
+.rtl #gHeader #gLogo,
+.rtl #gContent #gAlbumGrid .gItem,
+.rtl #gSiteMenu,
+.rtl .gBreadcrumbs li,
+.rtl .gPager li,
+.rtl .gButtonSet li,
+.rtl .ui-icon-left .ui-icon {
+  float: right;
 }