The css problem of Logout and Settings buttons in firefox is resolved.

serverfireteam · Aug 20, 2015 · d275e10 · d275e10
1 parent 2d5d691
commit d275e10
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/public/css/global.less b/public/css/global.less
@@ -139,8 +139,9 @@ body{
         }
         .caret
         {
-            top: 8px;
+            top: 1px;
             position: relative;
+	    margin-left: 25px;
         }
         &:hover{
             span.fl-right{
@@ -155,7 +156,7 @@ body{
     }
 .icon{
     color:#555;
-    font-size: 18px;
+    font-size: 14px;
     cursor: pointer;
     transition: all ease 250ms;
     &:hover{
@@ -296,3 +297,15 @@ li:hover{
      }
  }
 
+/** Logout Button **/
+a.btn.btn-default.main-link {
+	height: 32px;
+	span.icon {
+		padding-left: 20px;
+	}
+}
+
+/** Settings Button **/
+a.btn.btn-default.dropdown-toggle.main-link {
+	padding-top : 7px;
+}
diff --git a/public/css/styles.css b/public/css/styles.css
@@ -7705,8 +7705,9 @@ body {
   float: right;
 }
 .top-icon-bar a.main-link .caret {
-  top: 8px;
+  top: 1px;
   position: relative;
+  margin-left: 25px;
 }
 .top-icon-bar a.main-link:hover {
   color: #fff;
@@ -7720,7 +7721,7 @@ body {
 }
 .top-icon-bar .icon {
   color: #555;
-  font-size: 18px;
+  font-size: 14px;
   cursor: pointer;
   transition: all ease 250ms;
 }
@@ -7834,6 +7835,17 @@ body {
     left: 8px;
   }
 }
+/** Logout Button **/
+a.btn.btn-default.main-link {
+  height: 32px;
+}
+a.btn.btn-default.main-link span.icon {
+  padding-left: 20px;
+}
+/** Settings Button **/
+a.btn.btn-default.dropdown-toggle.main-link {
+  padding-top: 7px;
+}
 /*
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates

diff --git a/src/lang/en/fields.php b/src/lang/en/fields.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'settings' => 'Setting',
+    'settings' => 'Settings',
     'logout' => 'Log out',
     'ProfileEdit' => 'Profile Edit',
     'ResetPassword' => 'Reset Password',

diff --git a/src/views/dashboard.blade.php b/src/views/dashboard.blade.php
@@ -18,10 +18,10 @@
                         <div class="panel ">
                             <div class="panel-heading">
                                 <div class="row">
-                                    <div class="col-xs-9 title">
+                                    <div class="col-xs-7 title">
                                         {{$box['title']}}
                                     </div>
-                                    <div class="col-xs-3 text-right">
+                                    <div class="col-xs-5 text-right">
                                         <div class="huge">{{$box['count']}}</div>
                                         <div></div>
 

diff --git a/src/views/mainTemplate.blade.php b/src/views/mainTemplate.blade.php
@@ -89,14 +89,14 @@
                         <div class="btn-group" role="group">
                             <a  type="button" class="btn btn-default dropdown-toggle main-link" data-toggle="dropdown" aria-expanded="false">
                                 {{ Lang::get('panel::fields.settings') }} 
-                                <span class="caret fl-right"></span>
+                                <span class="caret"></span>
                             </a>
                           <ul class="dropdown-menu" role="menu">
                             <li><a href="{{url('panel/edit')}}"><span class="icon  ic-users "></span>{{ Lang::get('panel::fields.ProfileEdit') }}</a></li>
                             <li><a href="{{url('panel/changePassword')}}"><span class="icon ic-cog"></span>{{ Lang::get('panel::fields.ChangePassword') }}</a></li>
                           </ul>
                         </div>
-                        <a href="{{url('panel/logout')}}" type="button" class="btn btn-default main-link">{{ Lang::get('panel::fields.logout') }}<span class="icon  ic-switch fl-right"></span></a>
+                        <a href="{{url('panel/logout')}}" type="button" class="btn btn-default main-link">{{ Lang::get('panel::fields.logout') }}<span class="icon  ic-switch"></span></a>
                       </div>
                 </div>
             </div>