Permalink
Browse files

Bumped Bootstrap to 3.0.3. Added fontawesome.

  • Loading branch information...
1 parent bc68fff commit 3d28e7f8bb6d475efdff8ee3d6988369a8d6a237 @maxolasersquad committed Jan 10, 2014
Showing with 12 additions and 4 deletions.
  1. +6 −0 static/css/register.css
  2. +3 −2 templates/inventory/index.html
  3. +3 −2 templates/register/index.html
View
@@ -63,6 +63,12 @@
bottom: 0px;
}
+#totals > div {
+ float: left;
+ padding-left: 15px;
+ padding-right: 15px;
+}
+
.total_header {
display: inline;
font-size: 2.5em;
@@ -22,8 +22,9 @@
<head>
<title>Orthosie Inventory Management</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css">
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
<link rel='stylesheet' type='text/css' href='/static/css/inventory.css' />
<script type="text/javascript" src="/static/js/jquery.js"></script>
@@ -22,8 +22,9 @@
<title>Orthosie Cash Register</title>
<script type="text/javascript" src="/static/js/jquery.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css">
+ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css">
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
<link rel='stylesheet' type='text/css' href='/static/css/register.css' />
<script type="text/javascript" src="/static/js/input.js"></script>

0 comments on commit 3d28e7f

Please sign in to comment.