X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=css%2Flx-office-erp%2Fmain.css;h=0c604fd72189d6913771614c1555b37f330cdf41;hb=73f7989fcf23410ebd879d5150f6a13913ca2b90;hp=40263f3514add526518f74b8681298cf08ee0404;hpb=1067492cb4e6fdfedfaa0f394a1665eab182ceb3;p=kivitendo-erp.git

diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index 40263f351..0c604fd72 100644
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -10,7 +10,7 @@ A:hover { color: black;
            text-decoration: none;
          }
 
-input, textarea, select {
+input, textarea, select, div.cke_textarea_inline {
   border: 1px;
   border-color: darkgray lightgray lightgray;
   border-style: solid;
@@ -27,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;
 }
 
@@ -71,7 +71,7 @@ html {
 }
 
 body {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-family: sans-serif;
   font-size: 80%;
   background-color: white;
   color: black;
@@ -79,7 +79,6 @@ body {
 }
 
 td {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
   color: black;
   font-weight: normal;
 }
@@ -89,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;
@@ -264,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;
 }
 
@@ -383,8 +376,10 @@ label {
 }
 
 .chart_picker,
-.part_picker {
+.part_picker,
+.project_picker {
 }
+.kivi-validator-invalid,
 .customer-vendor-picker-undefined,
 .chartpicker-undefined,
 .projectpicker-undefined,
@@ -393,7 +388,8 @@ label {
   font-style: italic;
 }
 div.part_picker_part,
-div.chart_picker_chart {
+div.chart_picker_chart,
+div.project_picker_project {
   padding: 5px;
   margin: 5px;
   border: 1px;
@@ -406,7 +402,8 @@ div.chart_picker_chart {
   cursor: pointer;
 }
 div.part_picker_part:hover,
-div.chart_picker_chart:hover {
+div.chart_picker_chart:hover,
+div.project_picker_project:hover {
   background-color: lightgray;
   border-color: gray;
 }
@@ -437,7 +434,8 @@ th span.ppp_popup_button {
   margin-left: -13px;
 }
 span.chart_picker input,
-span.part_picker input {
+span.part_picker input,
+span.project_picker input {
   padding-right: 20px;
   background: white url("../../image/search.svg") no-repeat center right;
   background-size: contain;
@@ -449,12 +447,16 @@ span.part_picker input {
 td span.chart_picker input,
 th span.chart_picker input,
 td span.part_picker input,
-th span.part_picker input {
+th span.part_picker input,
+td span.project_picker input,
+th span.project_picker input {
+
   padding-right: 15px;
 }
 
 span.chart_picker,
-span.part_picker {
+span.part_picker,
+span.project_picker {
  /* white-space: nowrap;*/
 }
 
@@ -467,11 +469,21 @@ 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
 {
@@ -522,6 +534,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,
@@ -533,62 +554,27 @@ a.red {
 
 /* actionbar styling */
 div.layout-actionbar {
-  position: fixed;
-  height: 25px;
-  top: 20px;
-  z-index: 20;
   background-color: #d0cfc9;
-  width: 100%;
-  padding: 2px;
-}
-
-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 */
-}
-
-div.layout-actionbar ~ div {
-  padding-top: 25px;
-}
-
-div.layout-actionbar > div + div {
-  margin-left: 2px;
-}
-
-div.layout-actionbar-separator {
-  display: inline-block;
-  width: 20px;
 }
 
+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;
-  width: 120px;
-  box-sizing: border-box;
-  text-align: center;
-  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;
@@ -601,33 +587,15 @@ div.layout-actionbar div.layout-actionbar-action-disabled:hover {
   border-color: lightgray;
 }
 
-div.layout-actionbar-combobox {
-  position: relative;
-  display: inline-block;
-}
-
-div.layout-actionbar-combobox div.layout-actionbar-combobox-head div {
-  width: 100px
-}
-
 div.layout-actionbar-combobox div.layout-actionbar-combobox-head span {
-  display: inline-block;
-  border-width: 1px 1px 1px 1px;
-  border-style: solid;
   border-color: darkgray;
-  padding: 4px;
-  width: 14px;
-  height: 15px;
-  position: absolute;
-  top: 0;
-  right: 0;
+  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;
-  background-color: whitesmoke;
 }
 
 div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:hover {
@@ -635,45 +603,42 @@ div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:hover {
 }
 
 div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:after {
-  content: "";
-  width: 0;
-  height: 0;
-  position: absolute;
-  right: 8px;
-  top: 50%;
-  margin-top: -3px;
-  border-width: 3px 3px 0 3px;
-  border-style: solid;
   border-color: black transparent;
 }
-
-div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head span:after {
-  border-width: 0 3px 3px 3px;
+div.layout-actionbar .layout-actionbar-default-action {
+  font-weight: bold;
 }
 
-
-div.layout-actionbar-combobox div.layout-actionbar-combobox-head {
-  padding-right: 20px;
-  white-space: nowrap;
-  display: block;
+/* cke editor */
+.cke_top {
+  padding: 0 !important;
+}
+.cke_toolgroup {
+  margin-bottom: 0 !important;
+  margin-top: 0 !important;
+}
+.cke_button {
+  padding: 0px; 6px !important;
 }
 
-div.layout-actionbar-combobox div.layout-actionbar-combobox-list {
-  position: absolute;
-  display: none;
-  min-width: 120px;
+/* selects with text filters */
+div.filtered_select input, div.filtered_select select {
+  display: block;
 }
 
-div.layout-actionbar-combobox.active div.layout-actionbar-combobox-list {
-  display: inline-block;
-  z-index: 10;
+div.filtered_select > input {
+  background-image: url(../../image/glass14x14.png);
+  background-repeat: no-repeat;
+  background-position: 2px 2px;
+  border-radius: 0px;
+  border: solid #a0a0a0 1px;
+  border-bottom: none;
+  padding: 0px;
+  padding-left: 20px;
+  margin: 0;
+  width: 500px;
 }
 
-div.layout-actionbar-combobox-list div.layout-actionbar-action {
-  white-space: nowrap;
-  display: block;
-  position: relative;
-  width: 100%;
-  text-align: left;
-  padding: 4px;
+div.filtered_select select {
+  width: 522px;
 }