X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=css%2Fkivitendo%2Fmain.css;h=0c22493148d39d797c6b2dc525ce369337177344;hb=77b0b75d03639678e84d41a4605ac30686c6fc27;hp=5e4f4e23aba610e286e29a2fdbe5c5dc11e4f597;hpb=717d208802bee11da7ee84e892fbb6166620ffee;p=kivitendo-erp.git

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index 5e4f4e23a..0c2249314 100644
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -14,14 +14,15 @@ Tabcolor:      #CAFFA3
 body {
   background-color: #FFFFFF;
   color: #000000;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-family: sans-serif;
   font-size: 80%;
 }
 
 /* Input elements */
 input,
 textarea,
-select {
+select,
+div.cke_textarea_inline {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   -khtml-border-radius: 0;
@@ -50,7 +51,8 @@ select {
 
 input:focus,
 textarea:focus,
-select:focus {
+select:focus,
+div.cke_textarea_inline:focus {
   background-color: #ffffa0;
   border: 1px solid #fe5f14;
 }
@@ -328,11 +330,9 @@ body.menu {
   padding-left: 30px
 }
 .submit {
-  font-family: Verdana, Arial, Helvetica;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: Verdana, Arial, Helvetica;
   color: #778899;
 }
 .plus0 {
@@ -418,6 +418,7 @@ label {
   vertical-align: middle;
   height: 100%;
 }
+.kivi-validator-invalid,
 .customer-vendor-picker-undefined,
 .chartpicker-undefined,
 .projectpicker-undefined,
@@ -477,6 +478,10 @@ div.cpc_block span.cpc_block_number
 {
   float:left;
 }
+div.ppp_block span.ppp_block_ean {
+  float:left;
+  margin-left:1em;
+}
 div.ppp_block span.ppp_block_description {
   float:right;
   margin-left:1em;
@@ -487,6 +492,11 @@ div.cpc_block span.cpc_block_description {
   margin-left:1em;
   font-weight:bold;
 }
+div.ppp_line span.ppp_block_number,
+div.ppp_line span.ppp_block_ean {
+  float:left;
+  margin-left:1em;
+}
 div.ppp_line span.ppp_block_description,
 div.cpc_line span.cpc_block_description
 {
@@ -521,6 +531,15 @@ span.toggle_selected {
     max-width: 16px;
     max-height: 16px;
 }
+#update_from_master {
+    cursor: pointer;
+    display: block;
+    max-width: 16px;
+    max-height: 16px;
+}
+#update_from_master:hover {
+    background: #ddd;
+}
 
 /* Bank transactions */
 #bank_transactions_proposals .invoice_number_highlight a,
@@ -583,3 +602,15 @@ div.layout-actionbar .layout-actionbar-default-action {
 body > div.admin {
   padding-top: 24px;
 }
+
+/* cke editor */
+.cke_top {
+  padding: 0 !important;
+}
+.cke_toolgroup {
+  margin-bottom: 0 !important;
+  margin-top: 0 !important;
+}
+.cke_button {
+  padding: 0px; 6px !important;
+}