Merge remote-tracking branch 'origin/master' into develop

snipe · Apr 29, 2015 · bce0654 · bce0654
2 parents d61506f + 9841dbb
commit bce0654
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 177 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ crowdin.yaml
 public/uploads/logo.gif
 public/uploads/logo.png
 .siteflow
+public/assets/.siteflow
diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
@@ -19,6 +19,7 @@
 </style>
 
 <div id="pad-wrapper" class="user-profile">
+
                 <!-- header -->
 
                 <div class="pull-right">
@@ -30,12 +31,14 @@
 
 
                 <div class="profile">
+
                     <!-- bio, new note & orders column -->
+
                     <div class="col-md-9 bio">
                         <div class="profile-box">
                             <br>
 
-							{{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+								{{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'role' => 'form' ]) }}
                                 <!-- CSRF Token -->
                                 {{ Form::hidden('_token', csrf_token()) }}
 
@@ -110,7 +113,7 @@
 										</div>
                                     </div>
 
-                                    </div>
+
 
                                    <div class="checkbox col-md-offset-3">
 										<label>
@@ -224,9 +227,10 @@
                                             <button type="submit" class="btn-flat success"><i class="fa fa-check icon-white"></i> @lang('general.save')</button>
                                         </div>
                                 </div>
-                            </form>
-
+
+                          </form> 
                         </div>
+
 </div>
 
                     <!-- side address column -->
@@ -236,4 +240,5 @@
 
                     </div>
 
+</div>
 @stop