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

tidy up of old styles, make login to use standard bootstrap, regen dist (#116)

Browse Source
This commit is contained in:
FrancescoUK
2016-03-31 18:25:17 +01:00
parent b2597df44c
commit da5c821de3
8 changed files with 18 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/views/login.php
View File

@@ -24,24 +24,14 @@
<div id="login">
<?php echo form_open('login') ?>
<div id="container">
<?php echo validation_errors(); ?>
<div align="center" style="color:red"><?php echo validation_errors(); ?></div>
<div id="login_form">
<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
<div class="form_field">
<?php echo form_input(array(
'name'=>'username',
'id'=>'username',
'size'=>'20')); ?>
</div>
<?php echo $this->lang->line('login_username') . ':'; ?>
<?php echo form_input(array('name'=>'username', 'id'=>'username', 'class'=>'form-control', 'size'=>'20')); ?>
<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
<div class="form_field">
<?php echo form_password(array(
'name'=>'password',
'id' => 'password',
'size'=>'20')); ?>
</div>
<?php echo $this->lang->line('login_password') . ':'; ?>
<?php echo form_password(array('name'=>'password', 'id' => 'password', 'class'=>'form-control', 'size'=>'20')); ?>
<input class="btn btn-primary btn-block" type="submit" name="loginButton" value="Go"/>
</div>

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

@@ -20,7 +20,6 @@
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/barcode_font.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.autocomplete.css"/>
<link rel="stylesheet" type="text/css" href="css/general.css"/>
<link rel="stylesheet" type="text/css" href="css/invoice.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css"/>
@@ -62,7 +61,7 @@
<!-- 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/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b2108594cd"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=c8934fe7a7"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->

2
application/views/sales/invoice.php
View File

@@ -47,8 +47,6 @@ if (isset($error_message))
?>
</div>
</div>
<div class="clearfix"></div>
<div id="block2">
<textarea id="company-title" rows="5" cols="35"><?php echo $company_info ?></textarea>

52
css/general.css
View File

@@ -1,52 +0,0 @@
.field_row label
{
float:left;
width:20%;
text-align:left;
}
.field_row label.wide
{
width:30%;
}
label.required
{
color:red;
}
.form_field
{
float:left;
padding: 3px;
}
.form_field input, .form_field textarea
{
padding: 4px;
}
.clearfix:after
{
content: ".";
display: block;
clear: both;
visibility: hidden;
line-height: 0;
height: 0;
}
.clearfix
{
display: inline-block;
}
html[xmlns] .clearfix
{
display: block;
}
* html .clearfix
{
height: 1%;
}

5
css/ospos.css
View File

@@ -144,6 +144,11 @@ button.btn.dropdown-toggle.btn-sm
font-size: 13px;
}
label.required
{
color:red;
}
@media (min-width: 768px)
{
.navbar-nav > li > a

2
dist/opensourcepos.min.css vendored
View File

File diff suppressed because one or more lines are too long

20
templates/spacelab/views/login.php
View File

@@ -25,24 +25,14 @@
<div id="login">
<?php echo form_open('login') ?>
<div id="container">
<?php echo validation_errors(); ?>
<div align="center" style="color:red"><?php echo validation_errors(); ?></div>
<div id="login_form">
<div class="form_field_label"><?php echo $this->lang->line('login_username'); ?>: </div>
<div class="form_field">
<?php echo form_input(array(
'name'=>'username',
'id'=>'username',
'size'=>'20')); ?>
</div>
<?php echo $this->lang->line('login_username') . ':'; ?>
<?php echo form_input(array('name'=>'username', 'id'=>'username', 'class'=>'form-control', 'size'=>'20')); ?>
<div class="form_field_label"><?php echo $this->lang->line('login_password'); ?>: </div>
<div class="form_field">
<?php echo form_password(array(
'name'=>'password',
'id' => 'password',
'size'=>'20')); ?>
</div>
<?php echo $this->lang->line('login_password') . ':'; ?>
<?php echo form_password(array('name'=>'password', 'id' => 'password', 'class'=>'form-control', 'size'=>'20')); ?>
<input class="btn btn-primary btn-block" type="submit" name="loginButton" value="Go"/>
</div>

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

@@ -63,7 +63,7 @@
<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/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b2108594cd"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=c8934fe7a7"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
<!-- end mincss template tags -->
<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>