diff --git a/.gitignore b/.gitignore
index c96a4cd45..fe42b98ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@
TODO
*.zip
test.html
-*.log
\ No newline at end of file
+*.log
diff --git a/.jshintrc b/.jshintrc
index 37136b133..f91c8ee5c 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -14,4 +14,4 @@
"unused" : true,
// External variabls and plugins
"predef": [ "AdminLTEOptions", "FastClick", "moment", "Morris", "Chart" ]
-}
\ No newline at end of file
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index 88ade36ae..7e60672e8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,7 +7,7 @@
module.exports = function (grunt) {
-
+
'use strict';
grunt.initConfig({
@@ -95,19 +95,19 @@ module.exports = function (grunt) {
}
}
},
-
+
// Optimize images
image: {
dynamic: {
files: [{
expand: true,
- cwd: 'build/img/',
+ cwd: 'build/img/',
src: ['**/*.{png,jpg,gif,svg}'],
dest: 'dist/img/'
}]
}
},
-
+
// Validate JS code
jshint: {
options: {
@@ -123,7 +123,7 @@ module.exports = function (grunt) {
src: 'dist/js/pages/*.js'
}
},
-
+
csslint: {
options: {
csslintrc: 'build/less/.csslintrc'
@@ -132,7 +132,7 @@ module.exports = function (grunt) {
'dist/css/AdminLTE.css',
]
},
-
+
// Delete images in build directory
// After compressing the images in the build/img dir, there is no need
// for them
@@ -162,4 +162,4 @@ module.exports = function (grunt) {
// The default task (running "grunt" in console) is "watch"
grunt.registerTask('default', ['watch']);
-};
\ No newline at end of file
+};
diff --git a/README.md b/README.md
index d19ccb50d..d13e4cf64 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
Introduction
============
-**AdminLTE** -- is a fully responsive admin template. Based on **Bootstrap 3** framework. Highly customizable and easy to use. Fits many screen resolutions from small mobile devices to large desktops. Check out the live preview now and see for yourself.
+**AdminLTE** -- is a fully responsive admin template. Based on **[Bootstrap 3](https://github.com/twbs/bootstrap)** framework. Highly customizable and easy to use. Fits many screen resolutions from small mobile devices to large desktops. Check out the live preview now and see for yourself.
**Download & Preview on [Almsaeed Studio](https://almsaeedstudio.com)**
@@ -88,7 +88,7 @@ Todo List
Legacy Realeases
----------------
-AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://almsaeedstudio.com/themes/AdminLTE/documentation/index.html#browsers), but if you intend to keep using AdminLTE 1.x, you can download the latest release from the [releases](https://github.com/almasaeed2010/AdminLTE/releases) section above.
+AdminLTE 1.x can be easily upgraded to 2.x using [this guide](https://almsaeedstudio.com/themes/AdminLTE/documentation/index.html#upgrade), but if you intend to keep using AdminLTE 1.x, you can download the latest release from the [releases](https://github.com/almasaeed2010/AdminLTE/releases) section above.
Change log
----------
diff --git a/documentation/build/include/adminlte-options.html b/documentation/build/include/adminlte-options.html
index 22f8b682a..69b4da6ab 100644
--- a/documentation/build/include/adminlte-options.html
+++ b/documentation/build/include/adminlte-options.html
@@ -1,5 +1,5 @@
- Modifying the options of AdminLTE's app.js can be done using one of the following ways. Alternatively, you can define a global options variable named Example
+
Before you go to see your new awesome theme, here are few tips on how to familiarize yourself with it:
Note: LESS files are better commented than the compiled CSS file.
AdminLTE supports the following browsers: Note: IE9 does not support transitions or animations. The template will function properly but it won't use animations/transitions on IE9.
AdminLTE uses all of Bootstrap 3 components. It's a good start to review
@@ -8,7 +8,7 @@
that this documentation does not cover.
If you go through the example pages and would like to copy a component, right-click on
@@ -16,8 +16,8 @@
the HTML page.
The main header contains the logo and navbar. Construction of the
+ The main header contains the logo and navbar. Construction of the
navbar differs slightly from Bootstrap because it has components that Bootstrap doesn't provide.
The navbar can be constructed in two way. This an example for the normal navbar and next we will provide an example for
the top nav layout.
The sidebar used in this page to the left provides an example of what your sidebar should like.
Construction of a sidebar:
@@ -421,7 +421,7 @@
<!-- user panel (Optional) -->
<div class="user-panel">
<div class="pull-left image">
- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image" />
+ <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
</div>
<div class="pull-left info">
<p>User Name</p>
@@ -433,9 +433,9 @@
<!-- Search Form (Optional) -->
<form action="#" method="get" class="sidebar-form">
<div class="input-group">
- <input type="text" name="q" class="form-control" placeholder="Search..."/>
+ <input type="text" name="q" class="form-control" placeholder="Search...">
<span class="input-group-btn">
- <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
+ <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i></button>
</span>
</div>
</form><!-- /.sidebar-form -->
@@ -483,12 +483,12 @@
<!-- This div must placed right after the sidebar for it to work-->
<div class="control-sidebar-bg"></div> Once you create the sidebar, you will need a toggle button to open/close it.
+ Once you create the sidebar, you will need a toggle button to open/close it.
By adding the attribute Toggle Button Example Sidebar Toggle Markup Markup MarkupAdminLTE Javascript Options
+AdminLTE Javascript Options
Editing app.js
@@ -8,7 +8,7 @@
Defining AdminLTEOptions
AdminLTEOptions
and initialize it before loading app.js.<script>
+
+<script src="dist/js/app.js" type="text/javascript"></script><script>
var AdminLTEOptions = {
//Enable sidebar expand on hover effect for sidebar mini
//This option is forced to true if both the fixed layout and sidebar mini
@@ -20,17 +20,17 @@
enableBSToppltip: true
};
</script>
-<script src='dist/js/app.js' type='text/javascript'></script>
Available AdminLTE Options
- {
+
-{
//Add slimscroll to navbar menus
//This requires you to load the slimscroll plugin
//in every page before app.js
navbarMenuSlimscroll: true,
navbarMenuSlimscrollWidth: "3px", //The width of the scroll bar
navbarMenuHeight: "200px", //The height of the inner menu
- //General animation speed for JS animated elements such as box collapse/expand and
+ //General animation speed for JS animated elements such as box collapse/expand and
//sidebar treeview slide up/down. This options accepts an integer as milliseconds,
//'fast', 'normal', or 'slow'
animationSpeed: 500,
@@ -120,4 +120,4 @@
lg: 1200
}
}
A Word of Advice
- A Word of Advice
+ Browser Support
+Browser Support
Components
- Components
+ Reminder!
Tip!
Main Header
- Main Header
+ <header class="main-header">
+
<header class="main-header">
<a href="../../index2.html" class="logo">
<!-- LOGO -->
AdminLTE
@@ -184,7 +184,7 @@
<li><!-- start message -->
<a href="#">
<div class="pull-left">
- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"/>
+ <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
</div>
<h4>
Sender Name
@@ -256,13 +256,13 @@
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image"/>
+ <img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image">
<span class="hidden-xs">Alexander Pierce</span>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header">
- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image" />
+ <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
<p>
Alexander Pierce - Web Developer
<small>Member since Nov. 2012</small>
@@ -355,7 +355,7 @@
-
+
<header class="main-header">
<nav class="navbar navbar-static-top">
<div class="container-fluid">
@@ -409,7 +409,7 @@
-
- Sidebar
+ Sidebar
data-toggle="control-sidebar"
to any button, it will
automatically act as the toggle button.
+
@@ -538,7 +538,7 @@
<button class="btn btn-default" data-toggle="control-sidebar">Toggle Right Sidebar</button>
<div class="info-box">
- <-- Apply any bg-* class to to the icon to color it -->
+ <!-- Apply any bg-* class to to the icon to color it -->
<span class="info-box-icon bg-red"><i class="fa fa-star-o"></i></span>
<div class="info-box-content">
<span class="info-box-text">Likes</span>
@@ -610,13 +610,13 @@
<-- Apply any bg-* class to to the info-box to color it -->
+
<!-- Apply any bg-* class to to the info-box to color it -->
<div class="info-box bg-red">
<span class="info-box-icon"><i class="fa fa-comments-o"></i></span>
<div class="info-box-content">
<span class="info-box-text">Likes</span>
<span class="info-box-number">41,410</span>
- <-- The progress section is optional -->
+ <!-- The progress section is optional -->
<div class="progress">
<div class="progress-bar" style="width: 70%"></div>
</div>
@@ -629,7 +629,7 @@
first style apply any bg-* class to the icon itself. For the other style, apply the bg-* class to the info-box div.
The box component is the most widely used component through out this template. You can use it for anything from displaying charts to just blocks of text. It comes in many different styles that we will explore below.
@@ -818,9 +818,9 @@AdminLTE data-widget attribute provides boxes with the ability to collapse or be removed. The buttons are placed in the box-tools which is placed in the box-header.
-<-- This will cause the box to be removed when clicked --> +<!-- This will cause the box to be removed when clicked --> <button class="btn btn-box-tool" data-widget="remove" data-toggle="tooltip" title="Remove"><i class="fa fa-times"></i></button> -<-- This will cause the box to collapse when clicked --> +<!-- This will cause the box to collapse when clicked --> <button class="btn btn-box-tool" data-widget="collapse" data-toggle="tooltip" title="Collapse"><i class="fa fa-minus"></i></button>
We can also add labels, badges, pagination, tooltips, inputs and many more in the box tools. A few examples:
+We can also add labels, badges, pagination, tooltips, inputs and many more in the box tools. A few examples:
app.js
was loaded, you have to activate
the collapse/remove buttons explicitly by calling .activateBox()
:
- <script>
+ <script>
$("#box-widget").activateBox();
</script>
@@ -1045,7 +1045,7 @@
Direct Chat
- 3
+ 3
@@ -1056,11 +1056,11 @@