Changeset 706 for trunk/phpbms/common

Timestamp:

01/03/10 21:33:53 (2 years ago)

Author:

brieb

Message:

• Tweaked some UI sizing and border issues
• Fixed client purchase history type updating (mispelling)
• Added ability to consolidate client records (for duplicates)

Location:

trunk/phpbms/common/stylesheet/mozilla

Files:

• basics.css (modified) (2 diffs)
• boxes.css (modified) (3 diffs)
• forms.css (modified) (2 diffs)
• modal.css (modified) (2 diffs)
• pages/base/reports.css (modified) (1 diff)
• pages/bms/consolidateclients.css (added)
• pages/invoice.css (modified) (12 diffs)
• pages/login.css (modified) (1 diff)
• sizes.css (modified) (2 diffs)

trunk/phpbms/common/stylesheet/mozilla/basics.css

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-BODY { 
-        background: white url("image/back.png"); 
+BODY {
+        background: #F8F8F8;
         margin:0;
 }
 
-BODY, P, TABLE, TD, FORM, INPUT, SELECT, TEXTAREA, OL, UL, LI, BUTTON { 
+BODY, P, TABLE, TD, FORM, INPUT, SELECT, TEXTAREA, OL, UL, LI, BUTTON {
         font-size : 12px;
         font-family : Arial,Helvitica,sans-serif;
-        color : black; 
+        color : black;
 }
-        
+
 P,.fauxP{
         margin:0;
@@ -28 +28 @@
 LI{margin-bottom:5px;}
 
-A {     
-        color : #455372; 
-        font-weight:bold; 
+A {
+        color : #455372;
+        font-weight:bold;
         text-decoration:none;
 }

trunk/phpbms/common/stylesheet/mozilla/boxes.css

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-fieldset,.bodyline,.box{ 
-        border: 1px solid #ACB7C4; 
-        padding:5px;            
+fieldset,.bodyline,.box{
+        border: 1px solid #ACB7C4;
+        padding:5px;
         margin-bottom:5px;
 }
@@ -16 +16 @@
         clear:both;
         border-color:#CAD1D1;
+        border: none;
         padding:10px;
 }
 
-fieldset,.box{  
+fieldset,.box{
         margin:3px 3px 7px 3px;
 }
 
 fieldset{
-        padding:8px;
+        padding:4px 8px;
         overflow:hidden;
 }
@@ -30 +31 @@
 .box{
         background-color:#EFF9F9;
-        border-color:#CCCCCC;   
+        border-color:#CCCCCC;
 }

trunk/phpbms/common/stylesheet/mozilla/forms.css

@@ -3 +3 @@
 
 SELECT, INPUT, TEXTAREA, .uneditable,button{
-        border:1px solid #ABB1B1;
+        /*border:1px solid #ABB1B1;*/
+        border: 1px solid #C0C7C7;
         font-size: 11px;
         padding: 2px 0px 2px 3px;
@@ -21 +22 @@
 .uneditable,.uneditable:Focus {
         background-color:transparent;
-        border-color:#ABB1B1;
+        border-color:#C0C7C7;
         color:#666666;
 }

trunk/phpbms/common/stylesheet/mozilla/modal.css

@@ -11 +11 @@
         padding:0px;
         margin:0px;
-        background-color: #666666; 
+        background-color: #666666;
 }
 
-#modalBox {     
-        border:1px solid #ABB1B1;
+#modalBox {
+        /*border:1px solid #ABB1B1;*/
         padding:0px;
         position: absolute;
@@ -29 +29 @@
         background-color:#0B63A2;
         border-bottom:1px solid #ABB1B1;
-        color:white; 
+        color:white;
 }
 #modalContent{

trunk/phpbms/common/stylesheet/mozilla/pages/base/reports.css

@@ -33 +33 @@
 
 #addNewRow td{
+    border-color: #BBBBBB;
     border-bottom:1px solid #BBBBBB;
     color: #999999;

trunk/phpbms/common/stylesheet/mozilla/pages/invoice.css

@@ -28 +28 @@
 
 
-#fsTops{margin-right:270px;}
+#fsTops{
+    padding-top: 1px;
+    margin-right:270px;
+}
 
 #billingAddressDiv, #shiptoAddressDiv{
@@ -53 +56 @@
         display:block;
         border:0;
-        margin:0;
+        margin:23px 0 0;
         padding:0;
 }
@@ -73 +76 @@
         display:inline;
         padding-left:15px;
-        color : #455372; 
+        color : #455372;
         font-weight:bold;
 }
@@ -112 +115 @@
 #lineItemsFS{clear:both;}
 
-#LITable{}
+#LITable{border-collapse: collapse;}
 #LIHeader th{
         background:#455372;
@@ -120 +123 @@
 }
 
+#LIHeader #liHeaderExtendedTd{
+    padding-right: 20px;
+}
+
 .LIRealInfo{display:none;}
 
-#LIAdd TD{border-bottom:2px solid #999999}
+    #LIAdd td{
+        border:1px solid #999999;
+        overflow: hidden;
+    }
+
+    #LIAdd input{
+        font-size: 14px;
+        border: none;
+    }
+
+    #LIAdd #liAddButtonTd{
+        border-right-width: 0;
+        border-left-width: 0;
+    }
+
+    #LIAdd #liAddExtendedTD{
+        border-right-width: 0;
+    }
+
+
 #LITotals TD{border-top:2px solid #999999}
 
@@ -146 +172 @@
         position:absolute;
         background:white;
-        padding-bottom:4px;
-        padding-right:2px;
+        padding-right:3px;
 }
 
@@ -155 +180 @@
 
 .lineitemsButtonDivs button{
-        margin-top:4px;
+        margin-bottom:4px;
 }
 
@@ -161 +186 @@
         overflow:hidden;
         background:none;
-        vertical-align:middle;
-        padding:0;
+        vertical-align:top;
+        padding: 7px 0;
         font-size:11px;
-        border-color:#AAAAAA;
+        border-color:#D0D0D0;
+        border-width: 1px;
         border-left:0;
         border-right:0;
 }
 
-.lineitems p{margin:4px;padding:0;}
-
-.lineitems:hover td{
-        background:white;
-}
+    .lineitems p{
+        margin:0 0 2px 5px;
+        padding:0;
+    }
+
+    .lineitems:hover td{
+            background:white;
+    }
+
+    .lineitems input {
+        border: 1px solid #E6ECEC;
+        background: none;
+    }
+
+    .lineitems input:focus{
+        background:white;
+        border-color: black;
+    }
+
+    .lineitems input[readonly]{
+        padding: 3px 1px 3px 4px;
+        border: none;
+    }
+
+    .lineitems input[readonly]:focus{
+        background: none;
+    }
 
 .lineitemMemos{
@@ -181 +229 @@
 .lineitemsRight{ border-right:1px solid #AAAAAA;}
 .lineitemsLeft{ border-left:1px solid #AAAAAA;}
+
+
 .lineitemsBottom{ border-bottom:1px solid #AAAAAA;}
 
 .totalItems,.invoiceTotalLabels,#parenInfo div span{border-bottom:1px solid #CCCCCC}
+
+    .totalItems input{
+        border:none;
+    }
+
 .invoiceTotalLabels{padding-left:25px;}
 .invoiceTotalLabels div{height:24px; line-height:24px;vertical-align:bottom;}
@@ -200 +255 @@
         padding:0 4px 0 4px;
         border:0;
-        border-bottom:1px solid #CCCCCC;
 }
 
@@ -214 +268 @@
 #totalSpacer{height:55px;line-height:55px;border:0;}
 #totalSpacer span{border:0;}
+
+#lastTotalsTr td, #totalDisplayTr td{
+    border: 0;
+}
 
 .vTabs,.vTabsHover{cursor:pointer;color:#455372;background:url(../image/button-rew.png) 5px 4px no-repeat;}
@@ -230 +288 @@
 #fsInstructions{clear:both;}
 #specialinstructions,#printedinstructions{width:99%}
-

trunk/phpbms/common/stylesheet/mozilla/pages/login.css

@@ -18 +18 @@
 
         #loginbox h1{
-                font-size: 21px;
-                font-weight: bold;
-                background-position: 6px 6px;
-                padding-left: 28px;
-                color:#455372;
+            margin: 10px 10px 0;
         }
 

trunk/phpbms/common/stylesheet/mozilla/sizes.css

@@ -44 +44 @@
 }
 
-LEGEND {margin-top:0px; font-size:14px;}
+legend {
+    margin-top:0px;
+    font-size:16px;
+    font-weight: normal;
+    padding: 0 3px;
+    margin-left: 4px;
+}
 
 H2{
@@ -52 +58 @@
         padding-bottom:0px;
         margin:0px;
-        margin-top:30px;
+        margin-top:35px;
         margin-bottom:5px;
 }