Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -54,11 +54,11 @@ $result = PMA_DBI_query($sql_query);
|
||||
<thead>
|
||||
<tr>
|
||||
<?php if (!PMA_DRIZZLE): ?>
|
||||
<td><a href="<?php echo $full_text_link; ?>"
|
||||
<th><a href="<?php echo $full_text_link; ?>"
|
||||
title="<?php echo empty($full) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>">
|
||||
<img src="<?php echo $pmaThemeImage . 's_' . (empty($_REQUEST['full']) ? 'full' : 'partial'); ?>text.png"
|
||||
alt="<?php echo empty($_REQUEST['full']) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>" />
|
||||
</a></td>
|
||||
</a></th>
|
||||
<?php else: ?>
|
||||
<th></th>
|
||||
<?php endif; ?>
|
||||
|
@@ -1441,6 +1441,7 @@ table#serverconnection_trg_local {
|
||||
border-radius: 11px;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc));
|
||||
background: -moz-linear-gradient(top, #ffffff, #cccccc);
|
||||
background: -o-linear-gradient(top, #ffffff, #cccccc);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc');
|
||||
border: 1px solid #444444;
|
||||
cursor: pointer;
|
||||
|
@@ -192,18 +192,32 @@ div#left_tableList li {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
#newtable{border:1px solid #aaa;-moz-border-radius:20px;-webkit-border-radius:20px;border-radius:20px;margin-top:15px !important;padding:1px !important;
|
||||
#newtable {
|
||||
margin-top: 15px !important;
|
||||
}
|
||||
|
||||
#newtable a {
|
||||
display: block;
|
||||
padding: 1px;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc));
|
||||
background: -moz-linear-gradient(top, #ffffff, #cccccc);
|
||||
background: -o-linear-gradient(top, #ffffff, #cccccc);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc');
|
||||
|
||||
border: 1px solid #aaa;
|
||||
-moz-border-radius: 20px;
|
||||
-webkit-border-radius: 20px;
|
||||
border-radius: 20px;
|
||||
}
|
||||
#newtable:hover{
|
||||
|
||||
#newtable li:hover {
|
||||
background: transparent !important;
|
||||
}
|
||||
|
||||
#newtable a:hover {
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd)) !important;
|
||||
background: -moz-linear-gradient(top, #cccccc, #dddddd) !important;
|
||||
background: -o-linear-gradient(top, #cccccc, #dddddd) !important;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd') !important;
|
||||
cursor:pointer !important;
|
||||
}
|
||||
|
||||
select{
|
||||
|
@@ -97,6 +97,7 @@ a:hover {
|
||||
border-radius:5px;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc));
|
||||
background: -moz-linear-gradient(top, #ffffff, #cccccc);
|
||||
background: -o-linear-gradient(top, #ffffff, #cccccc);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc');
|
||||
}
|
||||
|
||||
@@ -115,9 +116,8 @@ th {
|
||||
background: #f3f3f3;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc));
|
||||
background: -moz-linear-gradient(top, #ffffff, #cccccc);
|
||||
background: -o-linear-gradient(top, #ffffff, #cccccc);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc');
|
||||
|
||||
|
||||
}
|
||||
|
||||
a img {
|
||||
@@ -188,12 +188,14 @@ input[type=submit]{
|
||||
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc));
|
||||
background: -moz-linear-gradient(top, #ffffff, #cccccc);
|
||||
background: -o-linear-gradient(top, #ffffff, #cccccc);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc');
|
||||
}
|
||||
|
||||
input[type=submit]:hover{ position: relative;
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd));
|
||||
background: -moz-linear-gradient(top, #cccccc, #dddddd);
|
||||
background: -o-linear-gradient(top, #cccccc, #dddddd);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd');
|
||||
cursor:pointer;
|
||||
}
|
||||
@@ -286,6 +288,15 @@ select{
|
||||
background:url(./themes/pmahomme/img/input_bg.gif)
|
||||
}
|
||||
|
||||
select[multiple] {
|
||||
background: #fff;
|
||||
background: -webkit-gradient(linear, center top, center bottom, from(#fff), color-stop(0.8, #f1f1f1), to(#fbfbfb));
|
||||
background: -webkit-linear-gradient(#fff, #f1f1f1 80%, #fbfbfb);
|
||||
background: -moz-linear-gradient(#fff, #f1f1f1 80%, #fbfbfb);
|
||||
/* none for Opera 11.10 as <option>s always have solid white background */
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f2f2f2');
|
||||
}
|
||||
|
||||
/******************************************************************************/
|
||||
/* classes */
|
||||
div.tools {
|
||||
@@ -337,12 +348,14 @@ button.mult_submit {
|
||||
table tr.odd th,
|
||||
.odd {
|
||||
background: #fff;
|
||||
filter: none;
|
||||
}
|
||||
|
||||
/* even items 2,4,6,8,... */
|
||||
table tr.even th,
|
||||
.even {
|
||||
background: #f3f3f3;
|
||||
filter: none;
|
||||
}
|
||||
|
||||
/* odd table rows 1,3,5,7,... */
|
||||
@@ -1296,11 +1309,13 @@ div#querywindowcontainer fieldset {
|
||||
*/
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc));
|
||||
background: -moz-linear-gradient(top, #ffffff, #cccccc);
|
||||
background: -o-linear-gradient(top, #ffffff, #cccccc);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc');
|
||||
}
|
||||
#sectionlinks a:hover, #statuslinks a:hover{
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd));
|
||||
background: -moz-linear-gradient(top, #cccccc, #dddddd);
|
||||
background: -o-linear-gradient(top, #cccccc, #dddddd);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd');
|
||||
}
|
||||
|
||||
@@ -1733,12 +1748,14 @@ table#serverconnection_trg_local {
|
||||
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#cccccc));
|
||||
background: -moz-linear-gradient(top, #ffffff, #cccccc);
|
||||
background: -o-linear-gradient(top, #ffffff, #cccccc);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#cccccc');
|
||||
cursor: pointer;
|
||||
}
|
||||
#buttonGo:hover{
|
||||
background: -webkit-gradient(linear, left top, left bottom, from(#cccccc), to(#dddddd));
|
||||
background: -moz-linear-gradient(top, #cccccc, #dddddd);
|
||||
background: -o-linear-gradient(top, #cccccc, #dddddd);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#dddddd');
|
||||
}
|
||||
|
||||
@@ -1915,21 +1932,21 @@ iframe.IE_hack {
|
||||
-moz-border-radius:5px 5px 0 0;
|
||||
-webkit-border-radius:5px 5px 0 0;
|
||||
border-radius:5px 5px 0 0;
|
||||
background:#d5d5d5;
|
||||
color:#fff;
|
||||
background:#f2f2f2;
|
||||
color:#555;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
}
|
||||
|
||||
.config-form ul.tabs li a:hover,
|
||||
.config-form ul.tabs li a:active,
|
||||
.config-form ul.tabs li a.active {
|
||||
/*margin: 0;*/
|
||||
/*padding: 0.1em 0.6em 0.2em;*/
|
||||
.config-form ul.tabs li a:active {
|
||||
background:#e5e5e5;
|
||||
}
|
||||
|
||||
.config-form ul.tabs li a.active {
|
||||
background-color: #fff;
|
||||
margin-top:1px;
|
||||
color:#000;
|
||||
text-shadow: none;
|
||||
}
|
||||
|
||||
.config-form fieldset {
|
||||
@@ -2004,6 +2021,7 @@ iframe.IE_hack {
|
||||
|
||||
.config-form fieldset th, .config-form fieldset td {
|
||||
border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
fieldset .group-header th {
|
||||
|
Reference in New Issue
Block a user