#1334 Update Settings and profile style

GetLuna · Sep 3, 2015 · b81771d · b81771d
1 parent 99af86a
commit b81771d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/themes/Sixteen/profile.php b/themes/Sixteen/profile.php
@@ -19,11 +19,7 @@
 		</div>
 	</div>
 	<div class="profile col-sm-9">
-		<nav class="navbar navbar-default" role="navigation">
-			<div class="navbar-header">
-				<a href="profile.php?id=<?php echo $id ?>" class="navbar-brand"><span class="fa fa-fw fa-user"></span> <?php echo luna_htmlspecialchars($user['username']) ?></a>
-			</div>
-		</nav>
+		<h2 class="profile-title"><?php echo luna_htmlspecialchars($user['username']) ?></h2>
 		<div class="panel panel-default">
 			<div class="panel-heading">
 				<h3 class="panel-title"><?php _e('About user', 'luna') ?></h3>

diff --git a/themes/Sixteen/settings.php b/themes/Sixteen/settings.php
@@ -27,24 +27,7 @@
 	</div>
 	<div class="col-sm-9 profile">
 		<form id="profile-settings" method="post" action="settings.php?id=<?php echo $id ?>">
-			<nav class="navbar navbar-default" role="navigation">
-				<div class="navbar-header">
-					<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#settings-nav">
-						<span class="sr-only"><?php _e('Toggle navigation', 'luna') ?></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					</button>
-					<a href="settings.php?id=<?php echo $id ?>" class="navbar-brand"><span class="fa fa-fw fa-cogs"></span> <?php _e('Settings', 'luna') ?></a>
-				</div>
-				<div class="collapse navbar-collapse" id="settings-nav">
-					<ul class="navbar-form navbar-right">
-						<div class="btn-compose">
-							<button class="btn btn-default" type="submit" name="update"><span class="fa fa-fw fa-check"></span> <?php _e('Save', 'luna') ?></button>
-						</div>
-					</ul>
-				</div>
-			</nav>
+			<h2 class="profile-title"><?php _e('Settings', 'luna') ?> <span class="pull-right"><button class="btn btn-primary" type="submit" name="update"><span class="fa fa-fw fa-check"></span> <?php _e('Save', 'luna') ?></button></span></h2>
 			<div role="tabpanel">
 				<ul id="profilenav" class="nav nav-tabs" role="tablist">
 					<li role="presentation"<?php if ( 'profile' === $section ) { ?> class="active"<?php } ?>><a href="settings.php?id=<?php echo $id ?>&amp;section=profile#profile" aria-controls="profile" role="tab" data-toggle="tab"><span class="fa fa-fw fa-user"></span><span class="hidden-xs"> <?php _e('Profile', 'luna') ?></span></a></li>

diff --git a/themes/Sixteen/style.css b/themes/Sixteen/style.css
@@ -505,6 +505,14 @@ hr {
 	width: 1.1em !important;
 }
 
+/* Tabs */
+.tab-pane {
+	padding: 15px;
+	background: #fff;
+	border: solid 1px #ddd;
+	border-top: none;
+}
+
 /* Table */
 .table > tbody > tr > td.user-data {
 	background-color: #f7f7f7;