1
0

Merge remote branch 'gallery3-contrib/master'

This commit is contained in:
mamouneyya 2010-08-29 22:03:02 +08:00 committed by Bharat Mediratta
parent d01599c1c1
commit b427805a69
3 changed files with 48 additions and 3 deletions

View File

@ -1,5 +1,5 @@
/**
* Fix display in IE 6, 7
* Fix display in IE 6, 7, and 8
*/
#g-banner {
@ -7,6 +7,10 @@
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 {

View File

@ -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
*********************************************************************/

View File

@ -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]-->