Permalink
Browse files

Merge remote branch 'gallery3-contrib/master'

  • Loading branch information...
1 parent d01599c commit b427805a69944f0c46dff96e34d3c0c0631c3a3a @mamouneyya mamouneyya committed with bharat Aug 29, 2010
Showing with 48 additions and 3 deletions.
  1. +21 −2 themes/browny_wind/css/fix-ie.css
  2. +26 −0 themes/browny_wind/css/screen.css
  3. +1 −1 themes/browny_wind/views/page.html.php
@@ -1,12 +1,16 @@
/**
- * Fix display in IE 6, 7
+ * Fix display in IE 6, 7, and 8
*/
#g-banner {
z-index: 2;
zoom: 1;
}
+#g-sidebar {
+ overflow: hidden;
+}
+
#g-photo,
#g-movie {
zoom: 1;
@@ -22,8 +26,23 @@ input.submit {
display: inline !important;
}
+.g-short-form input.text,
+.g-short-form input.submit {
+ font-size: 1em;
+ line-height: 1em;
+ padding: .38em .3em;
+}
+
+#g-search-form input#q {
+ width: 300px;
+}
+
#g-add-tag-form input.textbox {
- width: 110px;
+ width: 110px !important;
+}
+
+#g-add-tag-form input[type='submit'] {
+ padding: .3em 0 !important;
}
#g-dialog .g-cancel {
@@ -329,6 +329,32 @@ td {
background-color: #fff;
}
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-edit-permissions-form td {
+ background-image: none;
+}
+
+#g-edit-permissions-form fieldset {
+ border: 1px solid #ccc;
+}
+
+#g-permissions .g-denied {
+ background-color: #fcc;
+}
+
+#g-permissions .g-allowed {
+ background-color: #fcf9ce;
+}
+
+#g-permissions .g-breadcrumbs a {
+ border: 1px solid #fff;
+}
+
+#g-permissions .g-active a {
+ border: 1px solid #ddd;
+ background: #eee;
+}
+
/** *******************************************************************
* 5) Navigation and menus
*********************************************************************/
@@ -29,7 +29,7 @@
<?= $theme->css("themeroller/ui.base.css") ?>
<?= $theme->css("gallery.common.css") ?>
<?= $theme->css("screen.css") ?>
- <!--[if lt IE 8]>
+ <!--[if lte IE 8]>
<link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
media="screen,print,projection" />
<![endif]-->

0 comments on commit b427805

Please sign in to comment.