#1387 Some style updates

GetLuna · Oct 18, 2015 · d2a750c · d2a750c
1 parent 3085d8c
commit d2a750c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/include/draw_functions.php b/include/draw_functions.php
@@ -77,7 +77,7 @@ function draw_editor($height) {
 
 ?>
 <div class="panel panel-default panel-editor">
-	<fieldset class="postfield editor">
+	<fieldset class="comment-field editor">
 		<input type="hidden" name="form_sent" value="1" />
 		<div class="alert alert-warning hide-if-js" role="alert">
 			<p><?php _e('The Editor Toolbar requires JavaScript to be enabled. BBCode will still work, though.', 'luna' ); ?></p>
@@ -1037,7 +1037,7 @@ function draw_mail_form($recipient_id) {
 <form id="email" method="post" action="misc.php?email=<?php echo $recipient_id ?>" onsubmit="this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 	<input class="info-textfield form-control" placeholder="<?php _e('Subject', 'luna') ?>" type="text" name="req_subject" maxlength="70" tabindex="<?php echo $cur_index++ ?>" autofocus />
 	<div class="panel panel-default panel-editor">
-		<fieldset class="postfield">
+		<fieldset class="comment-field">
 			<input type="hidden" name="form_sent" value="1" />
 			<input type="hidden" name="redirect_url" value="<?php echo luna_htmlspecialchars($redirect_url) ?>" />
 			<textarea name="req_message" class="form-control textarea" rows="10" tabindex="<?php echo $cur_index++ ?>"></textarea>

diff --git a/themes/Fifteen/style.css b/themes/Fifteen/style.css
@@ -1100,7 +1100,7 @@ a.active.list-group-item:focus {
 }
 
 .commentfield input[type="text"],
-.postfield input[type="text"] {
+.comment-field input[type="text"] {
 	font-size: 20px;
 	line-height: .8;
 	border: none;

diff --git a/themes/Fifteen/thread.php b/themes/Fifteen/thread.php
@@ -50,7 +50,7 @@
 	</div>
 	<div class="col-sm-9">
 		<?php draw_comment_list(); ?>
-		<?php if ($quickpost): ?>
+		<?php if ($comment_field): ?>
 			<form method="post" action="comment.php?tid=<?php echo $id ?>" onsubmit="window.onbeforeunload=null;this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 <?php
 			if ($luna_user['is_guest']) {

diff --git a/themes/Sixteen/style.css b/themes/Sixteen/style.css
@@ -311,7 +311,7 @@ hr {
 	border: none;
 }
 
-.panel-border .panel-body, .panel-border .postfield, .panel-border .panel-footer, .panel-border .quickpostfield {
+.panel-border .panel-body, .panel-border .comment-field, .panel-border .panel-footer {
 	border: 1px solid #ddd;
 	border-top: none;
 }
@@ -713,26 +713,20 @@ hr {
 }
 
 /* Quick post and comment */
-.quickpostfield textarea, .quickpostfield textarea:focus {
+.comment-field textarea, .comment-field textarea:focus {
 	border: none;
 	box-shadow: none;
-	height: 140px;
 }
 
-.postfield textarea, .postfield textarea:focus {
-	border: none;
-	box-shadow: none;
-}
-
-.quickpostfield input[type="text"], .postfield input[type="text"] {
+.comment-field input[type="text"] {
 	border: none;
 	border-bottom: #eee solid 1px;
 	box-shadow: none;
 	font-size: 20px;
 	line-height: 0.8;
 }
 
-.quickpostfield textarea::-webkit-input-placeholder, .postfield textarea::-webkit-input-placeholder, .quickpostfield textarea::-moz-placeholder, .postfield textarea::-moz-placeholder, .quickpostfield textarea::-ms-input-placeholder, .postfield textarea::-ms-input-placeholder {
+.comment-field textarea::-webkit-input-placeholder, .comment-field textarea::-moz-placeholder, .comment-field textarea::-ms-input-placeholder {
 	font-size: 20px;
 }
 

diff --git a/themes/Sixteen/thread.php b/themes/Sixteen/thread.php
@@ -28,7 +28,7 @@
 			<?php echo $comment_link ?><?php echo $paging_links ?>
 		</span>
 	</div>
-	<?php if ($quickpost): ?>
+	<?php if ($comment_field): ?>
 		<form method="post" action="comment.php?tid=<?php echo $id ?>" onsubmit="window.onbeforeunload=null;this.submit.disabled=true;if(process_form(this)){return true;}else{this.submit.disabled=false;return false;}">
 <?php
 		if ($luna_user['is_guest']) {

diff --git a/thread.php b/thread.php
@@ -118,7 +118,7 @@
 // Generate paging links
 $paging_links = paginate($num_pages, $p, 'thread.php?id='.$id);
 
-$quickpost = false;
+$comment_field = false;
 if (($cur_thread['comment'] == '1' || ($cur_thread['comment'] == '' && $luna_user['g_comment'] == '1')) && ($cur_thread['closed'] == '0' || $is_admmod)) {
 	$required_fields = array('req_message' => __('Message', 'luna'));
 	if ($luna_user['is_guest']) {
@@ -127,7 +127,7 @@
 			$required_fields['req_email'] = __('Email', 'luna');
 	}
 
-	$quickpost = true;
+	$comment_field = true;
 }
 
 if ($luna_config['o_censoring'] == '1')