From 7b992bed8e429ac9728d08f00a4778b79560b7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?=
 <nakajimashouhei@gmail.com>
Date: Tue, 16 Aug 2016 09:41:31 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E6=90=BA=E5=B8=AF=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E9=9D=9E=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E8=A6=8B=E7=9B=B4=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Helper/ButtonHelper.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/View/Helper/ButtonHelper.php b/View/Helper/ButtonHelper.php
index 8c6ee141..fb9d76f9 100644
--- a/View/Helper/ButtonHelper.php
+++ b/View/Helper/ButtonHelper.php
@@ -69,9 +69,11 @@ public function getButtonSize() {
  */
 	public function button($title, $options = array()) {
 		$icon = Hash::get($options, 'icon');
-		$title = '<span class="hidden-xs">' . $title . '</span>';
-
+		
 		if ($icon) {
+			if (Hash::get($options, 'mobileHide')) {
+				$title = '<span class="hidden-xs">' . $title . '</span>';
+			}
 			$title = '<span class="glyphicon ' . $icon . '" aria-hidden="true"></span> ' . $title;
 			$options = Hash::remove($options, 'icon');
 			$options = Hash::insert($options, 'escape', false);

From 70a97dead7b91e7ffb5a1f8ef07f5932a5783331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=AD=E5=B3=B6=20=E6=AD=A3=E5=B9=B3?=
 <nakajimashouhei@gmail.com>
Date: Tue, 16 Aug 2016 10:05:14 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Helper/ButtonHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/View/Helper/ButtonHelper.php b/View/Helper/ButtonHelper.php
index fb9d76f9..eeb8f1d7 100644
--- a/View/Helper/ButtonHelper.php
+++ b/View/Helper/ButtonHelper.php
@@ -69,7 +69,7 @@ public function getButtonSize() {
  */
 	public function button($title, $options = array()) {
 		$icon = Hash::get($options, 'icon');
-		
+
 		if ($icon) {
 			if (Hash::get($options, 'mobileHide')) {
 				$title = '<span class="hidden-xs">' . $title . '</span>';