pull from master

ColorlibHQ · Jun 8, 2015 · 406de4e · 406de4e
2 parents 586db74 + e8553fd
commit 406de4e
Show file tree

Hide file tree

Showing 35 changed files with 48 additions and 48 deletions.
diff --git a/build/less/labels.less b/build/less/labels.less
@@ -12,7 +12,7 @@
 .label-info {
   &:extend(.bg-aqua);
 }
-.label-waring {
+.label-warning {
   &:extend(.bg-yellow);
 }
 .label-primary {

diff --git a/dist/css/AdminLTE.css b/dist/css/AdminLTE.css
@@ -3706,7 +3706,7 @@ table.text-center th {
 .alert-info,
 .label-danger,
 .label-info,
-.label-waring,
+.label-warning,
 .label-primary,
 .label-success,
 .modal-primary .modal-body,
@@ -3744,7 +3744,7 @@ table.text-center th {
 .bg-yellow,
 .callout.callout-warning,
 .alert-warning,
-.label-waring,
+.label-warning,
 .modal-warning .modal-body {
   background-color: #f39c12 !important;
 }

diff --git a/dist/css/AdminLTE.min.css b/dist/css/AdminLTE.min.css
diff --git a/documentation/build/include/faq.html b/documentation/build/include/faq.html
@@ -3,7 +3,7 @@ <h2 class='page-header'><a href="#faq">FAQ</a></h2>
   <h3>Can AdminLTE be used with Wordpress?</h3>
   <p class="lead">AdminLTE is an HTML template that can be used for any purpose. However, it is not made to be easily installed on Wordpress. It will require some effort and enough knowledge of the Wordpress script to do so.</p>
 
-  <h3>Is there an integration guide for PHP frameworks such as Yii or Symphony?</h3>
+  <h3>Is there an integration guide for PHP frameworks such as Yii or Symfony?</h3>
   <p class='lead'>Short answer, no. However, there are forks and tutorials around the web that
     provide info on how to integrate with many different frameworks. There are even versions of
     AdminLTE that are integrated with jQuery ajax, AngularJS and/or MVC5 ASP .NET.
@@ -14,4 +14,4 @@ <h3>How do I get notified of new AdminLTE versions?</h3>
     <a href="http://almsaeedstudio.com/#subscribe">subscription form on Almsaeed Studio</a>.
     If that's not appealing to you, you may watch the <a href="https://github.com/almasaeed2010/AdminLTE">repository on Github</a>
     or visit <a href="http://almsaeedstudio.com">Almsaeed Studio</a> every now and then for updates and announcements.</p>
-</section>
+</section>
diff --git a/documentation/index.html b/documentation/index.html
@@ -2092,7 +2092,7 @@ <h2 class='page-header'><a href="#faq">FAQ</a></h2>
   <h3>Can AdminLTE be used with Wordpress?</h3>
   <p class="lead">AdminLTE is an HTML template that can be used for any purpose. However, it is not made to be easily installed on Wordpress. It will require some effort and enough knowledge of the Wordpress script to do so.</p>
 
-  <h3>Is there an integration guide for PHP frameworks such as Yii or Symphony?</h3>
+  <h3>Is there an integration guide for PHP frameworks such as Yii or Symfony?</h3>
   <p class='lead'>Short answer, no. However, there are forks and tutorials around the web that
     provide info on how to integrate with many different frameworks. There are even versions of
     AdminLTE that are integrated with jQuery ajax, AngularJS and/or MVC5 ASP .NET.

diff --git a/index.html b/index.html
@@ -979,7 +979,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/index2.html b/index2.html
@@ -1189,7 +1189,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/UI/buttons.html b/pages/UI/buttons.html
@@ -1412,7 +1412,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/UI/general.html b/pages/UI/general.html
@@ -1293,7 +1293,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/UI/icons.html b/pages/UI/icons.html
@@ -2233,7 +2233,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/UI/modals.html b/pages/UI/modals.html
@@ -679,7 +679,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/UI/sliders.html b/pages/UI/sliders.html
@@ -625,7 +625,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/UI/timeline.html b/pages/UI/timeline.html
@@ -702,7 +702,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/calendar.html b/pages/calendar.html
@@ -612,7 +612,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/charts/chartjs.html b/pages/charts/chartjs.html
@@ -511,7 +511,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/charts/flot.html b/pages/charts/flot.html
@@ -640,7 +640,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/charts/inline.html b/pages/charts/inline.html
@@ -811,7 +811,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/charts/morris.html b/pages/charts/morris.html
@@ -619,7 +619,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/examples/404.html b/pages/examples/404.html
@@ -568,7 +568,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/examples/500.html b/pages/examples/500.html
@@ -569,7 +569,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/examples/blank.html b/pages/examples/blank.html
@@ -467,7 +467,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/examples/invoice.html b/pages/examples/invoice.html
@@ -689,7 +689,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/forms/advanced.html b/pages/forms/advanced.html
@@ -808,7 +808,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/forms/editors.html b/pages/forms/editors.html
@@ -589,7 +589,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/forms/general.html b/pages/forms/general.html
@@ -886,7 +886,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/layout/boxed.html b/pages/layout/boxed.html
@@ -468,7 +468,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/layout/collapsed-sidebar.html b/pages/layout/collapsed-sidebar.html
@@ -471,7 +471,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/layout/fixed.html b/pages/layout/fixed.html
@@ -472,7 +472,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/layout/rtl.html b/pages/layout/rtl.html
@@ -471,7 +471,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/mailbox/compose.html b/pages/mailbox/compose.html
@@ -379,7 +379,7 @@ <h3 class="box-title">Folders</h3>
                     <li><a href="mailbox.html"><i class="fa fa-inbox"></i> Inbox <span class="label label-primary pull-right">12</span></a></li>
                     <li><a href="#"><i class="fa fa-envelope-o"></i> Sent</a></li>
                     <li><a href="#"><i class="fa fa-file-text-o"></i> Drafts</a></li>
-                    <li><a href="#"><i class="fa fa-filter"></i> Junk <span class="label label-waring pull-right">65</span></a></li>
+                    <li><a href="#"><i class="fa fa-filter"></i> Junk <span class="label label-warning pull-right">65</span></a></li>
                     <li><a href="#"><i class="fa fa-trash-o"></i> Trash</a></li>
                   </ul>
                 </div><!-- /.box-body -->
@@ -534,7 +534,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/mailbox/mailbox.html b/pages/mailbox/mailbox.html
@@ -376,7 +376,7 @@ <h3 class="box-title">Folders</h3>
                     <li class="active"><a href="#"><i class="fa fa-inbox"></i> Inbox <span class="label label-primary pull-right">12</span></a></li>
                     <li><a href="#"><i class="fa fa-envelope-o"></i> Sent</a></li>
                     <li><a href="#"><i class="fa fa-file-text-o"></i> Drafts</a></li>
-                    <li><a href="#"><i class="fa fa-filter"></i> Junk <span class="label label-waring pull-right">65</span></a></li>
+                    <li><a href="#"><i class="fa fa-filter"></i> Junk <span class="label label-warning pull-right">65</span></a></li>
                     <li><a href="#"><i class="fa fa-trash-o"></i> Trash</a></li>
                   </ul>
                 </div><!-- /.box-body -->
@@ -664,7 +664,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>

diff --git a/pages/mailbox/read-mail.html b/pages/mailbox/read-mail.html
@@ -375,7 +375,7 @@ <h3 class="box-title">Folders</h3>
                     <li><a href="mailbox.html"><i class="fa fa-inbox"></i> Inbox <span class="label label-primary pull-right">12</span></a></li>
                     <li><a href="#"><i class="fa fa-envelope-o"></i> Sent</a></li>
                     <li><a href="#"><i class="fa fa-file-text-o"></i> Drafts</a></li>
-                    <li><a href="#"><i class="fa fa-filter"></i> Junk <span class="label label-waring pull-right">65</span></a></li>
+                    <li><a href="#"><i class="fa fa-filter"></i> Junk <span class="label label-warning pull-right">65</span></a></li>
                     <li><a href="#"><i class="fa fa-trash-o"></i> Trash</a></li>
                   </ul>
                 </div><!-- /.box-body -->
@@ -570,7 +570,7 @@ <h4 class="control-sidebar-subheading">
                 <a href='javascript::;'>               
                   <h4 class="control-sidebar-subheading">
                     Laravel Integration
-                    <span class="label label-waring pull-right">50%</span>
+                    <span class="label label-warning pull-right">50%</span>
                   </h4>
                   <div class="progress progress-xxs">
                     <div class="progress-bar progress-bar-warning" style="width: 50%"></div>