From 88d47d2ce65e549ffccda213f4e53609cc75d882 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 23 Jan 2014 05:31:58 -0500
Subject: [PATCH] Resolved differences in sql incremental files between master and stable
---
interface/web/themes/default/css/styles.css | 121 +++++++++++++++++++++++++++++++++++++---
1 files changed, 111 insertions(+), 10 deletions(-)
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index 6c209df..afe36fd 100644
--- a/interface/web/themes/default/css/styles.css
+++ b/interface/web/themes/default/css/styles.css
@@ -153,6 +153,8 @@
#topNav a {
background: url("../icons/x32_sprite.png") no-repeat #D3D3D3;
+ border-top-left-radius:5px;
+ border-top-right-radius:5px;
color:black;
display:inline-block;
height:20px;
@@ -384,6 +386,8 @@
}
.pnl_listarea th[class^="tbl_col"] { cursor:pointer; }
.pnl_listarea th[class^="tbl_col"]:hover { background-position:0 -15px!important; }
+.pnl_listarea th.tbl_col_nosort { cursor:default; }
+.pnl_listarea th.tbl_col_nosort:hover { background-position:0 0!important; }
.pageForm_description { font-size: 12px; }
@@ -444,11 +448,12 @@
table.list thead th { font-size: 10px; }
table.list tbody { border: 1px solid #d3d3d3 !important; }
table.list tfoot td { text-align: center; background: #f8f8f8 url("../images/lists_tfoot_bg.png") repeat-x bottom left; padding: 24px 8px 8px 8px; }
+table.list .tbl_paging img { vertical-align: top; }
table.list .tbl_row_even { background: #fcfcfc; }
table.list .tbl_row_uneven { background: #f0f8ff; }
table.list tr:hover { background: #fffacd; }
table.list td { word-wrap:break-word;white-space:pre-wrap; }
-table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal; }
+table.list td.tbl_col_buttons { word-wrap:normal;white-space:normal;overflow:visible; }
/* Password Strength */
#passBar {
@@ -577,6 +582,7 @@
width:60px;
height: 60px;
border:1px dotted #888888;
+ border-radius:5px;
background-color: #cccccc;
margin:10px;
background-position: center 5px;
@@ -667,6 +673,7 @@
.buttons button[type]{
padding:5px 10px 5px 7px; /* Firefox */
line-height:17px; /* Safari */
+ white-space: nowrap;
}
*:first-child+html button[type]{
padding:4px 10px 3px 7px; /* IE7 */
@@ -739,7 +746,27 @@
.iconstxt.icoRestore { background-position: 6px -1px; }
/* Button with icon and without text */
-.icons16 span { display: none; }
+.icons16 { position: relative; }
+.icons16>span {
+ opacity: 0;
+ visibility: hidden;
+ -webkit-transition: opacity 1s linear;
+ -moz-transition: opacity 1s linear;
+ -o-transition: opacity 1s linear;
+ -ms-transition: opacity 1s linear;
+ transition: opacity 1s linear;
+ position: absolute;
+ right: 23px;
+ top: -1px;
+ padding: 1px 2px;
+ border: 1px solid rgb(155,155,11);
+ background: rgb(255,255,111);
+ white-space: nowrap;
+}
+.icons16:hover>span {
+ opacity: 1.0;
+ visibility: visible;
+}
a.icons16 {
height: 18px;
width: 18px;
@@ -760,7 +787,7 @@
.icons16.icoFilter { background-position: -1px -161px; }
.icons16.icoDbAdmin { background-position: -1px -221px; }
.icons16.icoAction { background-position: -1px -241px; }
-.icons16.icoLink { background-position: -1px -442px; float: right; }
+.icons16.icoLink { background-position: -1px -422px; float: right; }
div.group-icon {
float: left;
@@ -777,9 +804,20 @@
.group-admin { background-position: 0 -380px; }
.group-user { background-position: 0 -400px; }
+span.marked { color: #cc0000; }
+span.small { font-size: 0.9em; }
+
#ajaxloader {
+ position: absolute;
+ width: 325px;
+ height: 150px;
+ background: #ffffff url('../images/ajax-loader.gif') no-repeat center center;
+ border: solid 2px #e1e1e1;
+ border-radius: 10px;
+ /*background: rgba(255, 255, 255, 0.85);*/
+ padding: 20px;
text-align:center;
- margin-top: 180px;
+ z-index: 100;
}
.blockLabel.email_at {
width: 20px !important;
@@ -794,7 +832,7 @@
.selectInput.formLengthLimit { width: 85px !important; }
.formLengthDate { width: 75px !important; }
.formLengthIPv4 { width: 125px !important; }
-.formLengthIPv6 { width: 100% !important; }
+.formLengthIPv6 { }
.formLengthEmailUser { width: 30% !important; }
.formLengthEmailDomain { width: 30% !important; }
.formLengthHalf { width: 15% !important; }
@@ -828,6 +866,12 @@
height: 20px;
width: 26px;
}
+li[class^=country-] {
+ background-image: url("../icons/flags_sprite.png");
+ background-repeat: no-repeat;
+ text-indent: 24px;
+}
+li[class^=country-] a.ui-state-hover { background: transparent; }
div[class^=country-] span {
display: none;
}
@@ -902,8 +946,9 @@
select.flags option[value=EE], select.flags option[value=ee], .country-EE {background-position:0 -1387px}
select.flags option[value=EG], select.flags option[value=eg], .country-EG {background-position:0 -1409px}
select.flags option[value=EH], select.flags option[value=eh], .country-EH {background-position:0 -1431px}
-select.flags option[value=ER], select.flags option[value=er], .country-ER {background-position:0 -1497px}
-select.flags option[value=ES], select.flags option[value=ET], select.flags option[value=es], select.flags option[value=et], .country-ES, .country-ET {background-position:0 -1519px}
+select.flags option[value=ER], select.flags option[value=er], .country-ER {background-position:0 -1475px}
+select.flags option[value=ES], select.flags option[value=es], .country-ES {background-position:0 -1497px}
+select.flags option[value=ET], select.flags option[value=ET], select.flags option[value=et], .country-ET {background-position:0 -1519px}
select.flags option[value=FI], select.flags option[value=fi], .country-FI {background-position:0 -1585px}
select.flags option[value=FJ], select.flags option[value=fj], .country-FJ {background-position:0 -1607px}
select.flags option[value=FK], select.flags option[value=fk], .country-FK {background-position:0 -1629px}
@@ -1436,7 +1481,7 @@
width:16px;
height:16px;
cursor:pointer;
- background: url("../icons/x16_sprite.png") no-repeat center center transparent;
+ background: url("../icons/x16_sprite.png") no-repeat -2px -42px transparent;
float:right;
display:inline;
position:relative;
@@ -1461,7 +1506,7 @@
/* content_ispc
-------------------------------------------------------------- */
.tipsy {
- font-size: 10px;
+ font-size: 12px !important;
position: absolute;
padding: 5px;
z-index: 100000;
@@ -1762,4 +1807,60 @@
color:#000000;
}
.ui-widget { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; }
\ No newline at end of file
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Trebuchet MS", Arial, sans-serif; font-size: 100%; }
+ul.ui-autocomplete { max-height: 250px; overflow-y: auto; min-width: 85px;}
+.ui-combobox { position: relative; display: inline-block; margin-right: 17px; }
+.ui-combobox-toggle { position: absolute !important; top: 0; bottom: 0; margin-left: -1px; padding: 1px !important; background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important;}
+.ui-combobox-input { background: none repeat scroll 0 0 #FFFFFF !important; border: 1px solid #DFDFDF !important; padding: 1px; font-weight: normal !important; }
+.panel_install_package .ui-combobox { float: left; }
+.clear-float { clear: both; }
+
+a.link-page, span.page-spacer {
+ display: inline-block;
+ text-align: center;
+ padding: 2px;
+ line-height: 16px;
+ text-decoration: none !important;
+ color: inherit !important;
+ min-width: 16px;
+}
+a.link-page {
+ border: 1px solid #FFFFFF;
+ margin: 0 5px;
+}
+
+a.link-page:hover {
+ background-color: #DFDFDF;
+}
+
+span.page-spacer {
+ margin: 0 -5px;
+}
+
+a.link-page.current-page {
+ background-color: #DFDFDF;
+ font-weight: bold;
+}
+
+.command {
+ padding: 1em;
+ border: 1px dashed #2f6fab;
+ color: black;
+ background-color: #f9f9f9;
+ line-height: 1.1em;
+ font-family: Courier New, Courier, mono;
+ font-size: 12px;
+ font-style: italic;
+}
+.system {
+ color: black;
+ font-family: Courier New, Courier, mono;
+ font-size: 12px;
+ font-style: italic;
+}
+.highlight {
+ color: #FF0000;
+ font-family: Georgia, "Times New Roman", Times, serif;
+ font-size: 12px;
+ text-decoration: underline;
+}
\ No newline at end of file
--
Gitblit v1.9.1