Merge branch 'master' into better_inventory

 Conflicts:
	README
	data/templates/products/entry.html
	docker/Dockerfile
	docker/init.sh
	src/database/database.vala
	src/database/db-interface.vala
	src/pdf-stock/Makefile
	src/pdf-stock/pdf-stock-interface.vala
	src/pdf-stock/pdf-stock.vala
	src/web/Makefile
	src/web/main.vala
	templates/menu.html
	templates/products/index.html

1 files changed, 95 insertions, 0 deletions

diff --git a/data/templates/css/base.css b/data/templates/css/base.css
new file mode 100644
index 0000000..2444eca
--- /dev/null
+++ b/data/templates/css/base.css
@@ -0,0 +1,95 @@
+/* sane margins for main content */
+.content {
+	margin-top: 55px;
+	margin-left: 20px;
+	margin-right: 20px;
+}
+
+/* class for tables without 100% width */
+.table-nonfluid {
+	width: auto;
+}
+
+/* navbar padding from sides */
+.navbar-fixed-top .navbar-inner {
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+/* statistics */
+#overviewLegend li > div {
+    display: inline-block;
+    margin-right: 4px;
+}
+
+#overviewLegend li {
+	list-style: none;
+}
+
+#placeholder .legend {
+	visibility: hidden;
+}
+
+#overviewLegend label {
+	display: inline;
+}
+
+#overviewLegend input {
+	margin: 0;
+}
+
+/* dropdown menu with button on the right */
+.btn-group > .cornered-dropdown-toggle {
+	border-top-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+}
+
+.btn-group > .dropdown-menu + .btn {
+	border-left: 0px;
+}
+
+/* disabled entries in dropdown */
+.dropdown-menu .disabled {
+	color: #999;
+}
+
+.two-columns {
+	overflow: hidden;
+	width: 400px;
+}
+
+.two-columns li {
+	width: 20%;
+	float: left;
+	display: inline;
+}
+
+.hidden {
+	display: none;
+}
+
+.table-nonfluid {
+	width: auto !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+table.user-entry th {
+	min-width: 150px;
+}
+
+table.user-entry td {
+	min-width: 350px;
+}
+
+h1 {
+	margin-bottom: 30px;
+}
+
+@media print {
+	.navbar-fixed-top {
+		display: none !important;
+	}
+}