mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-05-25 00:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix employee tab width issue, now working fine (#116)

Browse Source
This commit is contained in:
FrancescoUK
2016-02-28 15:02:25 +00:00
parent d96fafa92f
commit 7b09961075
5 changed files with 26 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/views/employees/form.php
View File

@@ -2,7 +2,7 @@
<ul id="error_message_box" class="error_message_box"></ul>
<?php echo form_open('employees/save/'.$person_info->person_id, array('id'=>'employee_form', 'class'=> 'form-horizontal')); ?>
<?php echo form_open('employees/save/'.$person_info->person_id, array('id'=>'employee_form', 'class'=>'form-horizontal')); ?>
<ul class="nav nav-tabs nav-justified" data-tabs="tabs">
<li class="active" role="presentation">
<a data-toggle="tab" href="#employee_basic_info"><?php echo $this->lang->line("employees_basic_information"); ?></a>

2
application/views/partial/header.php
View File

@@ -65,7 +65,7 @@
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1d6d6ab1bf"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=f940457590"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=26dfd3d6cc" language="javascript"></script>

64
css/popupbox.css
View File

@@ -6,7 +6,15 @@
font-style: italic;
}
#customer_basic_info,#item_basic_info,#item_number_info,#supplier_basic_info,#sale_basic_info
.error_message_box
{
margin-bottom: 7px;
margin-left: 20px;
color: red;
font-weight: bold;
}
#customer_basic_info, #item_basic_info, #item_number_info, #supplier_basic_info, #sale_basic_info, #employee_basic_info, #employee_login_info, #employee_permission_info
{
padding: 5px;
}
@@ -14,82 +22,54 @@
#scan_item_number.loading
{
background-image: url(../images/spinner_small.gif);
background-position:center right;
background-repeat:no-repeat;
background-position: center right;
background-repeat: no-repeat;
}
#info_provided_by
{
display:none;
font-weight:bold;
}
#employee_basic_info
{
float:left;
width:47%;
padding:5px;
}
#employee_login_info
{
float:left;
width:47%;
margin-left:5px;
padding:5px;
display: none;
font-weight: bold;
}
#permission_list
{
list-style:none;
list-style: none;
}
#permission_list li
{
padding:5px;
padding: 5px;
}
#permission_list ul li
{
padding-left:20px;
padding-left: 20px;
padding-bottom: 0px;
list-style:none;
list-style: none;
}
#permission_list input
{
top:3px;
top: 3px;
}
#employee_permission_info
{
float:left;
width:47%;
margin-left:5px;
padding:5px;
}
#employee_permission_info p
{
font-weight:bold;
font-weight: bold;
}
#employee_permission_info span.small
{
font-style:italic;
font-size:80%;
font-style: italic;
font-size: 80%;
}
.error_message_box
{
margin-bottom:7px;
margin-left:20px;
color:red;
font-weight:bold;
}
#item_kit_items_title
{
text-align: center;
}
#item_kit_items
{
width: 100%;

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
templates/spacelab/views/partial/header.php
View File

@@ -65,7 +65,7 @@
<![endif]-->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=1d6d6ab1bf"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=f940457590"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
<!-- start minjs template tags -->