From befb3d1929fbe5cea02504bda1aba9d57e78ad20 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 30 Jan 2015 12:17:55 +1030
Subject: [PATCH] Tweak some styles

- Rename btn-blend to btn-naked
- Tweak input focus style
- Other stuff
---
 framework/core/ember/app/styles/bootstrap/variables.less | 2 +-
 framework/core/ember/app/styles/flarum/components.less   | 9 +++++++--
 framework/core/ember/app/styles/flarum/discussion.less   | 8 ++++----
 .../components/discussions/discussion-listing.hbs        | 2 +-
 .../templates/components/discussions/post-wrapper.hbs    | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/framework/core/ember/app/styles/bootstrap/variables.less b/framework/core/ember/app/styles/bootstrap/variables.less
index 9fa87c801..8669a7cf8 100644
--- a/framework/core/ember/app/styles/bootstrap/variables.less
+++ b/framework/core/ember/app/styles/bootstrap/variables.less
@@ -13,7 +13,7 @@
 @btn-default-color:  @fl-body-control-color;
 
 @input-bg: @fl-body-control-bg;
-@input-border-focus: darken(@fl-body-control-bg, 5%);
 @input-border: @fl-body-control-bg;
+@input-border-focus: @fl-body-control-bg;
 @input-color: @fl-body-control-color;
 @input-color-placeholder: @fl-body-control-color;
\ No newline at end of file
diff --git a/framework/core/ember/app/styles/flarum/components.less b/framework/core/ember/app/styles/flarum/components.less
index 1787924a8..636611791 100644
--- a/framework/core/ember/app/styles/flarum/components.less
+++ b/framework/core/ember/app/styles/flarum/components.less
@@ -65,13 +65,17 @@
 }
 
 // Buttons that blend into the background
-.btn-blend {
+.btn-naked {
 	background: transparent;
 	&:hover {
 		background: @fl-body-control-bg;
 	}
 }
 
+.btn-rounded {
+	border-radius: 18px;
+}
+
 // ------------------------------------
 // Form Controls
 
@@ -79,7 +83,8 @@
 	.box-shadow(none);
 	&:focus,
 	&.focus {
-		background-color: @input-border-focus;
+		background-color: #fff;
+		color: @fl-body-color;
 		.box-shadow(none);
 	}
 }
diff --git a/framework/core/ember/app/styles/flarum/discussion.less b/framework/core/ember/app/styles/flarum/discussion.less
index fd9af5dee..35e310c31 100644
--- a/framework/core/ember/app/styles/flarum/discussion.less
+++ b/framework/core/ember/app/styles/flarum/discussion.less
@@ -108,10 +108,10 @@
 	}
 }
 .item.highlight .post {
-	border: 10px solid rgba(255, 255, 0, 0.2);
-	border-radius: 10px;
+	border: 8px solid rgba(255, 255, 0, 0.2);
+	border-radius: 8px;
 	padding: 15px 15px 0 105px;
-	margin: -25px -25px -10px -25px;
+	margin: -23px -23px -8px -23px;
 }
 
 .post-header {
@@ -140,7 +140,7 @@
 	}
 }
 .post-body {
-	font-size: 15px;
+	font-size: 14px;
 	line-height: 1.6;
 	padding-bottom: 1px;
 }
diff --git a/framework/core/ember/app/templates/components/discussions/discussion-listing.hbs b/framework/core/ember/app/templates/components/discussions/discussion-listing.hbs
index 01f3da42c..dde753e26 100644
--- a/framework/core/ember/app/templates/components/discussions/discussion-listing.hbs
+++ b/framework/core/ember/app/templates/components/discussions/discussion-listing.hbs
@@ -1,7 +1,7 @@
 {{ui/controls/dropdown-button
 	items=controls
 	class="contextual-controls"
-	buttonClass="btn btn-default btn-icon btn-sm btn-blend"
+	buttonClass="btn btn-default btn-icon btn-sm btn-naked"
 	buttonClick="populateControls"
 	menuClass="pull-right"}}
 
diff --git a/framework/core/ember/app/templates/components/discussions/post-wrapper.hbs b/framework/core/ember/app/templates/components/discussions/post-wrapper.hbs
index 098535f8a..499d54c2a 100644
--- a/framework/core/ember/app/templates/components/discussions/post-wrapper.hbs
+++ b/framework/core/ember/app/templates/components/discussions/post-wrapper.hbs
@@ -1,7 +1,7 @@
 {{ui/controls/dropdown-button
 	items=controls
 	class="contextual-controls"
-	buttonClass="btn btn-default btn-icon btn-sm btn-blend"
+	buttonClass="btn btn-default btn-icon btn-sm btn-naked"
 	buttonClick="populateControls"
 	menuClass="pull-right"}}