Merge branch 'feature/jquery_cleanup' into feature/bootstrapUI

Conflicts:
	application/views/items/manage.php
	application/views/partial/header.php
	dist/opensourcepos.min.css
	dist/opensourcepos.min.js
	templates/spacelab/views/partial/header.php
This commit is contained in:
jekkos committed 2016-03-07 21:33:26 +01:00
commit 554f2b32db
41 files changed
+698 -2756

No files matched your search

-54
View File
@@ -1,54 +0,0 @@
.ac_results
{
padding: 0px;
border: 1px solid black;
background-color: white;
overflow: hidden;
z-index: 99999;
}
.ac_results ul
{
width: 100%;
list-style-position: outside;
list-style: none;
padding: 0;
margin: 0;
}
.ac_results li
{
margin: 0px;
padding: 2px 5px;
cursor: default;
display: block;
/*
if width will be 100% horizontal scrollbar will apear
when scroll mode will be used
*/
/*width: 100%;*/
font: menu;
font-size: 12px;
/*
it is very important, if line-height not setted or setted
in relative units scroll will be broken in firefox
*/
line-height: 16px;
overflow: hidden;
}
.ac_loading
{
background: white url('../images/spinner_small.gif') right center no-repeat;
}
.ac_odd
{
background-color: #eee;
}
.ac_over
{
background-color: #0A246A;
color: white;
}
+1 -1
View File
@@ -155,4 +155,4 @@ a.rollover img
{
max-height: calc(100vh - 212px);
overflow-y: auto;
}
}