From e434942a28d17b4ec907ff0ac2b759d0f38b1cd9 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 19 Aug 2015 12:36:42 -0400
Subject: [PATCH] first pass on settings design

---
 public/less/admin/admin.less         |  9 ++++++++-
 public/less/admin/settings.less      |  5 +++++
 src/views/admin/settings/footer.tpl  | 12 ++----------
 src/views/admin/settings/general.tpl | 29 ++++++++++++++++------------
 src/views/admin/settings/header.tpl  |  2 +-
 5 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 public/less/admin/settings.less

diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less
index 192de77f2c..b1438799ac 100644
--- a/public/less/admin/admin.less
+++ b/public/less/admin/admin.less
@@ -14,6 +14,7 @@
 @import "./extend/plugins";
 @import "./extend/rewards";
 @import "./advanced/database";
+@import "./settings";
 
 @import "./modules/alerts";
 @import "./modules/selectable";
@@ -21,7 +22,13 @@
 
 .admin {
 	padding-top: 70px;
-	background: #f0f0f0;
+	background: #fff;
+	font-size: 14px;
+
+	label {
+		font-weight: 700;
+	}
+
 
 	.btn {
 		border-radius: 0;
diff --git a/public/less/admin/settings.less b/public/less/admin/settings.less
new file mode 100644
index 0000000000..13fed59c88
--- /dev/null
+++ b/public/less/admin/settings.less
@@ -0,0 +1,5 @@
+.settings {
+	.settings-header {
+		font-weight: 700;
+	}
+}
\ No newline at end of file
diff --git a/src/views/admin/settings/footer.tpl b/src/views/admin/settings/footer.tpl
index 78e62335c5..f20e3294c7 100644
--- a/src/views/admin/settings/footer.tpl
+++ b/src/views/admin/settings/footer.tpl
@@ -1,14 +1,6 @@
 </div>
-
-<div class="col-lg-3 acp-sidebar">
-	<div class="panel panel-default">
-		<div class="panel-heading">Save Settings</div>
-		<div class="panel-body">
-			<button class="btn btn-primary btn-md" id="save">Save Changes</button>
-			<button class="btn btn-warning btn-md" id="revert">Revert Changes</button>
-		</div>
-	</div>
-</div>
+<!--<button class="btn btn-primary btn-md" id="save">Save Changes</button>
+			<button class="btn btn-warning btn-md" id="revert">Revert Changes</button>-->
 
 <script>
 	require(['admin/settings'], function(Settings) {
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index 05f2237f78..860ed527e1 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -1,8 +1,11 @@
 <!-- IMPORT admin/settings/header.tpl -->
 
-<div class="panel panel-default">
-	<div class="panel-heading">Site Settings</div>
-	<div class="panel-body">
+
+<div class="row">
+	<div class="col-xs-2 settings-header">
+		Site Settings
+	</div>
+	<div class="col-xs-10">
 		<form>
 			<label>Site Title</label>
 			<input class="form-control" type="text" placeholder="Your Community Name" data-field="title" />
@@ -28,9 +31,9 @@
 	</div>
 </div>
 
-<div class="panel panel-default">
-	<div class="panel-heading">Site Logo</div>
-	<div class="panel-body">
+<div class="row">
+	<div class="col-xs-2 settings-header">Site Logo</div>
+	<div class="col-xs-10">
 		<div class="form-group">
 			<label for="logoUrl">Image</label>
 			<div class="input-group">
@@ -54,9 +57,11 @@
 	</div>
 </div>
 
-<div class="panel panel-default">
-	<div class="panel-heading">Favicon</div>
-	<div class="panel-body">
+<div class="row">
+	<div class="col-xs-2 settings-header">
+		Favicon
+	</div>
+	<div class="col-xs-10">
 		<div class="form-group">
 			<div class="input-group">
 				<input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" data-action="upload" data-target="faviconUrl" data-route="{config.relative_path}/api/admin/uploadfavicon" readonly />
@@ -68,9 +73,9 @@
 	</div>
 </div>
 
-<div class="panel panel-default">
-	<div class="panel-heading">Miscellaneous</div>
-	<div class="panel-body">
+<div class="row">
+	<div class="col-xs-2 settings-header">Miscellaneous</div>
+	<div class="col-xs-10">
 		<form>
 			<div class="checkbox">
 				<label>
diff --git a/src/views/admin/settings/header.tpl b/src/views/admin/settings/header.tpl
index df305643d9..1a60075f9e 100644
--- a/src/views/admin/settings/header.tpl
+++ b/src/views/admin/settings/header.tpl
@@ -1 +1 @@
-<div class="col-lg-9">
\ No newline at end of file
+<div class="settings">
\ No newline at end of file