X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=css%2Flx-office-erp%2Fmain.css;h=a2a4ad02e5618181732489471a3973b488bfb44c;hb=4a89a4204d58f6c3f1f2e921b90f9c8927a26020;hp=db3536b8a15338de47b0c12b0c34c08539b87dd9;hpb=3dc29e42a53f674d4a5b745663b1f85b54131de2;p=kivitendo-erp.git

diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index db3536b8a..a2a4ad02e 100644
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -9,13 +9,8 @@ A:hover { color: black;
            background-color: lemonchiffon;
            text-decoration: none;
          }
-a, div {
-  transition: background-color 0.2s;
-  -moz-transition: background-color 0.2s;
-  -webkit-transition: background-color 0.2s;
-}
 
-input, textarea, select {
+input, textarea, select, div.cke_textarea_inline {
   border: 1px;
   border-color: darkgray lightgray lightgray;
   border-style: solid;
@@ -32,14 +27,14 @@ select {
   padding: 0 14px 0 0;
 }
 
-input:focus, textarea:focus, select:focus {
+input:focus, textarea:focus, select:focus, div.cke_textarea_inline:focus {
   background-color: whitesmoke;
   border: 1px;
   border-color: gray lightgray lightgray;
   border-style: solid;
 }
 
-input:hover, textarea:hover, select:hover {
+input:hover, textarea:hover, select:hover, div.cke_textarea_inline:hover {
   border-color: dimgray darkgray darkgray;
 }
 
@@ -76,16 +71,14 @@ html {
 }
 
 body {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-family: sans-serif;
   font-size: 80%;
   background-color: white;
-  background-image: url("../../image/fade.png"); background-repeat:repeat-x;
   color: black;
   height: 100%;
 }
 
 td {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-weight: normal;
 }
@@ -95,15 +88,11 @@ td.hover:hover {
 
 
 th {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-weight: normal;
 }
 
 /* login and admin */
-.login {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-}
 div.login {
   min-height: 100%;
   height: auto !important;
@@ -270,11 +259,9 @@ div.admin {
 
 
 .submit {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #000000;
 }
 .checkbox, .radio {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: #778899;
 }
 
@@ -391,6 +378,7 @@ label {
 .chart_picker,
 .part_picker {
 }
+.kivi-validator-invalid,
 .customer-vendor-picker-undefined,
 .chartpicker-undefined,
 .projectpicker-undefined,
@@ -473,11 +461,20 @@ div.ppp_block span.ppp_block_description {
   float:right;
   font-weight:bold;
 }
+div.ppp_block span.ppp_block_ean {
+  float:left;
+  margin-left:1em;
+}
 div.cpc_block span.cpc_block_description {
   float:left;
   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
 {
@@ -528,6 +525,15 @@ a.red {
     max-width: 16px;
     max-height: 16px;
 }
+#update_from_master {
+    cursor: pointer;
+    display: block;
+    max-width: 16px;
+    max-height: 16px;
+}
+#update_from_master:hover {
+    background: darkgrey;
+}
 
 /* Bank transactions */
 #bank_transactions_proposals .invoice_number_highlight a,
@@ -539,44 +545,27 @@ a.red {
 
 /* actionbar styling */
 div.layout-actionbar {
-  background-color: whitesmoke;
-}
-
-div.layout-actionbar-action {
-  -webkit-touch-callout: none; /* iOS Safari */
-  -webkit-user-select: none;   /* Chrome/Safari/Opera */
-  -khtml-user-select: none;    /* Konqueror */
-  -moz-user-select: none;      /* Firefox */
-  -ms-user-select: none;       /* Internet Explorer/Edge */
-  user-select: none;           /* don't select text on double click */
-  transition: background-color 0s;
-  -moz-transition: background-color 0s;
-  -webkit-transition: background-color 0s;
+  background-color: #d0cfc9;
 }
 
+div.layout-actionbar div.layout-actionbar-link,
 div.layout-actionbar div.layout-actionbar-submit,
 div.layout-actionbar div.layout-actionbar-scriptbutton,
+div.layout-actionbar div.layout-actionbar-link:focus,
 div.layout-actionbar div.layout-actionbar-submit:focus,
 div.layout-actionbar div.layout-actionbar-scriptbutton:focus {
-  display: inline-block;
-  box-sizing: border-box;
-  border: 1px;
   border-color: darkgray;
-  border-style: solid;
-  padding: 4px 4px;
+  background-color: whitesmoke;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  background-color: whitesmoke;
-  cursor:default;
 }
 
+div.layout-actionbar div.layout-actionbar-link:hover,
 div.layout-actionbar div.layout-actionbar-submit:hover,
 div.layout-actionbar div.layout-actionbar-scriptbutton:hover {
-  border: 1px;
   background-color: lightgray;
   border-color: gray;
-  border-style: solid;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
@@ -588,3 +577,37 @@ div.layout-actionbar div.layout-actionbar-action-disabled:hover {
   background-color: whitesmoke;
   border-color: lightgray;
 }
+
+div.layout-actionbar-combobox div.layout-actionbar-combobox-head span {
+  border-color: darkgray;
+  background-color: whitesmoke;
+  -webkit-border-top-right-radius: 2px;
+  -webkit-border-bottom-right-radius: 2px;
+  -moz-border-radius-topright: 2px;
+  -moz-border-radius-bottomright: 2px;
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+}
+
+div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:hover {
+  background-color: lightgray;
+}
+
+div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:after {
+  border-color: black transparent;
+}
+div.layout-actionbar .layout-actionbar-default-action {
+  font-weight: bold;
+}
+
+/* cke editor */
+.cke_top {
+  padding: 0 !important;
+}
+.cke_toolgroup {
+  margin-bottom: 0 !important;
+  margin-top: 0 !important;
+}
+.cke_button {
+  padding: 0px; 6px !important;
+}