Compare commits

...

13 Commits

Author SHA1 Message Date
Abdullah Almsaeed
4f40077a5b Update README.md 2015-03-09 10:23:06 -04:00
Abdullah Almsaeed
3e3fedd4f5 Fix bower.json issue #227 2015-03-09 10:21:18 -04:00
Abdullah Almsaeed
22c5b35043 Merge branch 'master' of https://github.com/almasaeed2010/AdminLTE 2015-03-05 23:03:45 -05:00
Abdullah Almsaeed
c285b41223 Merge pull request #278 from Acris/master
Update demo.js
2015-03-05 23:03:30 -05:00
Abdullah Almsaeed
b11c60a6f8 Updated docs 2015-03-05 22:47:23 -05:00
Acris
5051f21522 Update demo.js
update href='#' to href='javascript:void(0);'
2015-03-05 16:07:32 +08:00
Abdullah Almsaeed
5121f708f7 Update README.md 2015-03-04 11:12:30 -05:00
Abdullah Almsaeed
ebf6b8b937 Update package.json 2015-03-04 11:11:25 -05:00
Abdullah Almsaeed
aec621eb77 Update bower.json 2015-03-04 11:10:56 -05:00
Abdullah Almsaeed
66491416c8 Merge pull request #276 from albelop/patch-1
Change AdminLTE.js to app.js in bower.json
2015-03-04 11:10:20 -05:00
albelop
c6aedd60d3 Fixed .js filename. 2015-03-04 10:34:13 +01:00
Abdullah Almsaeed
b2baf6e74f Fixed typo 2015-03-04 00:01:02 -05:00
Abdullah Almsaeed
41dbb2f9c1 Fixed indentation issue with code examples 2015-03-04 00:00:28 -05:00
24 changed files with 2372 additions and 2255 deletions

View File

@@ -29,7 +29,7 @@ Download from Github or [visit Almsaeed Studio](http://almsaeedstudio.com) and d
- Fork the repository ([here is the guide](https://help.github.com/articles/fork-a-repo/)).
- Clone to your machine
```
git clone https://github.com/YOUR_USERNAME/AdminLTE.git"
git clone https://github.com/YOUR_USERNAME/AdminLTE.git
```
**Bower**
@@ -62,7 +62,7 @@ Contribution
Contribution are always **welcome and recommended**! Here is how:
- Fork the repository ([here is the guide](https://help.github.com/articles/fork-a-repo/)).
- Clone to your machine ```git clone https://github.com/YOUR_USERNAME/AdminLTE.git"
- Clone to your machine ```git clone https://github.com/YOUR_USERNAME/AdminLTE.git```
- Make your changes
- Create a pull request
@@ -92,13 +92,16 @@ AdminLTE 1.x can be easily upgraded to 2.x using [this guide](http://almsaeedstu
Change log
----------
**v2.0.4:**
- Fixed bower.json to pick up newest release.
-
**v2.0.3**
- Bug fixes
- Fixed extra page when printing issue #264
- Updated documentation and fixed links scrolling issue
- Created print.less file (this makes it easier if you want to create a seperate CSS file for printing)
- Fixed sidebar stretching issue #275
- Fixed checkbox out of bounds issue in WYISHTML5 editor.
- Fixed checkbox out of bounds issue in WYSIHTML5 editor.
**v2.0.2:**
- Solved issue with hidden arrow in select inputs.

View File

@@ -1,6 +1,6 @@
{
"name": "AdminLTE",
"version": "2.0.2",
"version": "2.0.3",
"homepage": "http://almsaeedstudio.com",
"authors": [
"Abdullah Almsaeed <almasaeed2010@gmail.com>"
@@ -9,7 +9,7 @@
"main": [
"index2.html",
"dist/css/AdminLTE.css",
"dist/js/AdminLTE.js",
"dist/js/app.js",
"build/less/AdminLTE.less"
],
"keywords": [

View File

@@ -1,5 +1,5 @@
/*!
* AdminLTE v2.0.3
* AdminLTE v2.0.4
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* License: Open source - MIT

View File

@@ -1,11 +1,14 @@
CHANGE LOG:
v2.0.4:
- Fixed bower.json to pick up newest release.
v2.0.3:
- Bug fixes
- Fixed extra page when printing issue #264
- Updated documentation and fixed links scrolling issue
- Created print.less file (this makes it easier if you want to create a seperate CSS file for printing)
- Fixed sidebar stretching issue #275
- Fixed checkbox out of bounds issue in WYISHTML5 editor.
- Fixed checkbox out of bounds issue in WYSIHTML5 editor.
v2.0.2:
- Solved issue with hidden arrow in select inputs.

View File

@@ -1,6 +1,6 @@
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);
/*!
* AdminLTE v2.0.3
* AdminLTE v2.0.4
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* License: Open source - MIT

View File

@@ -1,5 +1,5 @@
@import url(//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic);/*!
* AdminLTE v2.0.3
* AdminLTE v2.0.4
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* License: Open source - MIT

2
dist/js/app.js vendored
View File

@@ -7,7 +7,7 @@
* @Author Almsaeed Studio
* @Support <http://www.almsaeedstudio.com>
* @Email <support@almsaeedstudio.com>
* @version 2.0.3
* @version 2.0.4
* @license MIT <http://opensource.org/licenses/MIT>
*/

2
dist/js/app.min.js vendored

File diff suppressed because one or more lines are too long

14
dist/js/demo.js vendored
View File

@@ -59,7 +59,7 @@ $(function () {
var skins_list = $("<ul />", {"class": 'list-unstyled'});
var skin_blue =
$("<li />", {style: "float:left; width: 50%; padding: 5px;"})
.append("<a href='#' onclick='change_skin(\"skin-blue\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
.append("<a href='javascript:void(0);' onclick='change_skin(\"skin-blue\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
+ "<div><span style='display:block; width: 20%; float: left; height: 10px; background: #367fa9;'></span><span class='bg-light-blue' style='display:block; width: 80%; float: left; height: 10px;'></span></div>"
+ "<div><span style='display:block; width: 20%; float: left; height: 40px; background: #222d32;'></span><span style='display:block; width: 80%; float: left; height: 40px; background: #f4f5f7;'></span></div>"
+ "<p class='text-center'>Skin Blue</p>"
@@ -67,7 +67,7 @@ $(function () {
skins_list.append(skin_blue);
var skin_black =
$("<li />", {style: "float:left; width: 50%; padding: 5px;"})
.append("<a href='#' onclick='change_skin(\"skin-black\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
.append("<a href='javascript:void(0);' onclick='change_skin(\"skin-black\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
+ "<div style='box-shadow: 0 0 2px rgba(0,0,0,0.1)' class='clearfix'><span style='display:block; width: 20%; float: left; height: 10px; background: #fefefe;'></span><span style='display:block; width: 80%; float: left; height: 10px; background: #fefefe;'></span></div>"
+ "<div><span style='display:block; width: 20%; float: left; height: 40px; background: #222;'></span><span style='display:block; width: 80%; float: left; height: 40px; background: #f4f5f7;'></span></div>"
+ "<p class='text-center'>Skin Black</p>"
@@ -75,7 +75,7 @@ $(function () {
skins_list.append(skin_black);
var skin_purple =
$("<li />", {style: "float:left; width: 50%; padding: 5px;"})
.append("<a href='#' onclick='change_skin(\"skin-purple\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
.append("<a href='javascript:void(0);' onclick='change_skin(\"skin-purple\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
+ "<div><span style='display:block; width: 20%; float: left; height: 10px;' class='bg-purple-active'></span><span class='bg-purple' style='display:block; width: 80%; float: left; height: 10px;'></span></div>"
+ "<div><span style='display:block; width: 20%; float: left; height: 40px; background: #222d32;'></span><span style='display:block; width: 80%; float: left; height: 40px; background: #f4f5f7;'></span></div>"
+ "<p class='text-center'>Skin Purple</p>"
@@ -83,7 +83,7 @@ $(function () {
skins_list.append(skin_purple);
var skin_green =
$("<li />", {style: "float:left; width: 50%; padding: 5px;"})
.append("<a href='#' onclick='change_skin(\"skin-green\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
.append("<a href='javascript:void(0);' onclick='change_skin(\"skin-green\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
+ "<div><span style='display:block; width: 20%; float: left; height: 10px;' class='bg-green-active'></span><span class='bg-green' style='display:block; width: 80%; float: left; height: 10px;'></span></div>"
+ "<div><span style='display:block; width: 20%; float: left; height: 40px; background: #222d32;'></span><span style='display:block; width: 80%; float: left; height: 40px; background: #f4f5f7;'></span></div>"
+ "<p class='text-center'>Skin Green</p>"
@@ -91,7 +91,7 @@ $(function () {
skins_list.append(skin_green);
var skin_red =
$("<li />", {style: "float:left; width: 50%; padding: 5px;"})
.append("<a href='#' onclick='change_skin(\"skin-red\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
.append("<a href='javascript:void(0);' onclick='change_skin(\"skin-red\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
+ "<div><span style='display:block; width: 20%; float: left; height: 10px;' class='bg-red-active'></span><span class='bg-red' style='display:block; width: 80%; float: left; height: 10px;'></span></div>"
+ "<div><span style='display:block; width: 20%; float: left; height: 40px; background: #222d32;'></span><span style='display:block; width: 80%; float: left; height: 40px; background: #f4f5f7;'></span></div>"
+ "<p class='text-center'>Skin Red</p>"
@@ -99,7 +99,7 @@ $(function () {
skins_list.append(skin_red);
var skin_yellow =
$("<li />", {style: "float:left; width: 50%; padding: 5px;"})
.append("<a href='#' onclick='change_skin(\"skin-yellow\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
.append("<a href='javascript:void(0);' onclick='change_skin(\"skin-yellow\")' style='display: block; box-shadow: -1px 1px 2px rgba(0,0,0,0.0);' class='clearfix full-opacity-hover'>"
+ "<div><span style='display:block; width: 20%; float: left; height: 10px;' class='bg-yellow-active'></span><span class='bg-yellow' style='display:block; width: 80%; float: left; height: 10px;'></span></div>"
+ "<div><span style='display:block; width: 20%; float: left; height: 40px; background: #222d32;'></span><span style='display:block; width: 80%; float: left; height: 40px; background: #f4f5f7;'></span></div>"
+ "<p class='text-center'>Skin Yellow</p>"
@@ -159,4 +159,4 @@ function setup() {
var tmp = get('skin');
if (tmp && $.inArray(tmp, my_skins))
change_skin(tmp);
}
}

View File

@@ -1,5 +1,5 @@
<section id='advice'>
<h2 class='page-header'><span>A Word of Advice</span></h2>
<h2 class='page-header'><a href="#advice">A Word of Advice</a></h2>
<p class='lead'>
Before you go to see your new awesome theme, here are few tips on how to familiarize yourself with it:
</p>

View File

@@ -1,12 +1,12 @@
<section id='browsers'>
<h2 class='page-header'><span>Browser Support</span></h2>
<p class="lead">AdminLTE supports the following browsers:</p>
<ul>
<li>IE9+</li>
<li>FireFox (latest)</li>
<li>Safari (latest)</li>
<li>Chrome (latest)</li>
<li>Opera (latest)</li>
</ul>
<p><b>Note:</b> IE9 does not support transitions or animations. The template will function properly but it won't use animations/transitions on IE9.</p>
</section>
<h2 class='page-header'><a href="#browsers">Browser Support</a></h2>
<p class="lead">AdminLTE supports the following browsers:</p>
<ul>
<li>IE9+</li>
<li>FireFox (latest)</li>
<li>Safari (latest)</li>
<li>Chrome (latest)</li>
<li>Opera (latest)</li>
</ul>
<p><b>Note:</b> IE9 does not support transitions or animations. The template will function properly but it won't use animations/transitions on IE9.</p>
</section>

View File

@@ -1,5 +1,5 @@
<section id='components' data-spy="scroll" data-target="#scrollspy-components">
<h2 class='page-header'><span>Components</span></h2>
<h2 class='page-header'><a href="#components">Components</a></h2>
<div class='callout callout-info lead'>
<h4>Reminder!</h4>
<p>
@@ -406,8 +406,7 @@
&LT;/div>&LT;!-- /.navbar-collapse -->
&LT;/div>&LT;!-- /.container-fluid -->
&LT;/nav>
&LT;/header>
</pre>
&LT;/header></pre>
<!-- ----------------------------------------------------------- -->
@@ -1363,9 +1362,9 @@
&LT;/div>&LT;!-- /.box-footer-->
&LT;/div>&LT;!--/.direct-chat -->
</code></pre>
<p>Of course you can use direct chat with a solid box by adding the class <code>solid-box</code> to the box. Here are a couple of examples:</p>
<!-- Direct Chat With Solid Boxes -->
<div class="row">
<div class="col-md-6">

View File

@@ -1,5 +1,5 @@
<section id="dependencies">
<h2 class="page-header"><span>Dependencies</span></h2>
<h2 class="page-header"><a href="#dependencies">Dependencies</a></h2>
<p class="lead">AdminLTE depends on two main frameworks.
The downloadable package contains both of these libraries, so you don't have to manually download them.</p>
<ul>

View File

@@ -1,5 +1,5 @@
<section id='download'>
<h2 class='page-header'><span>Download</span></h2>
<h2 class='page-header'><a href="#download">Download</a></h2>
<p class='lead'>
AdminLTE can be downloaded in two different versions, each appealing to different
skill levels and use case.

View File

@@ -1,5 +1,5 @@
<section id='faq'>
<h2 class='page-header'><span>FAQ</span></h2>
<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>

View File

@@ -1,5 +1,5 @@
<section id='introduction'>
<h2 class='page-header'><span>Introduction</span></h2>
<h2 class='page-header'><a href="#introduction">Introduction</a></h2>
<p class='lead'>
<b>AdminLTE</b> is a popular open source WebApp template for admin dashboards and control panels.
It is a responsive HTML template that is based on the CSS framework Bootstrap 3.

View File

@@ -1,5 +1,5 @@
<section id='layout'>
<h2 class='page-header'><span>Layout</span></h2>
<h2 class='page-header'><a href="#layout">Layout</a></h2>
<p class='lead'>The layout consists of four major parts:</p>
<ul>
<li>Wrapper <code>.wrapper</code>. A div that wraps the whole site.</li>

View File

@@ -1,5 +1,5 @@
<section id="license">
<h1 class="page-header"><span>License</span></h1>
<h1 class="page-header"><a href="#license">License</a></h1>
<h3>AdminLTE</h3>
<p class="lead">AdminLTE is an open source project that is licensed under the <a href="http://opensource.org/licenses/MIT">MIT license</a>.
This allows you to do pretty much anything you want as long as you include the copyright in "all copies or substantial portions of the Software."

View File

@@ -1,5 +1,5 @@
<section id='plugins'>
<h2 class='page-header'><span>Plugins</span></h2>
<h2 class='page-header'><a href="#plugins">Plugins</a></h2>
<p class="lead">AdminLTE makes use of the following plugins. For documentation, updates or license information, please visit the provided links.</p>
<div class='row'>
<div class='col-sm-3'>

View File

@@ -1,5 +1,5 @@
<section id='upgrade'>
<h2 class='page-header'><span>Upgrade Guide</span></h2>
<h2 class='page-header'><a href="#upgrade">Upgrade Guide</a></h2>
<p class="lead">To upgrade from version 1.x to the lateset version, follow this guide.</p>
<h3>New Files</h3>
<p>Make sure you update all CSS and JS files that are related to AdminLTE. Otherwise, the layout will not

View File

@@ -52,7 +52,7 @@
<!-- sidebar menu: : style can be found in sidebar.less -->
<ul class="nav sidebar-menu">
<li class="header">TABLE OF CONTENTS</li>
<li class='active'><a href="#introduction"><i class='fa fa-circle-o'></i> Introduction</a></li>
<li><a href="#introduction"><i class='fa fa-circle-o'></i> Introduction</a></li>
<li><a href="#download"><i class='fa fa-circle-o'></i> Download</a></li>
<li><a href="#dependencies"><i class='fa fa-circle-o'></i> Dependencies</a></li>
<li><a href="#advice"><i class='fa fa-circle-o'></i> Advice</a></li>
@@ -97,47 +97,47 @@
<h4>Warning!</h4>
This documentation is under development. Some information may change as the progress of creating the documentation continues.
</div>
include "introduction.html"
include "introduction.html"
<!-- ============================================================= -->
include "download.html"
include "download.html"
<!-- ============================================================= -->
include "dependencies.html"
include "dependencies.html"
<!-- ============================================================= -->
include "advice.html"
include "advice.html"
<!-- ============================================================= -->
include "layout.html"
include "layout.html"
<!-- ============================================================= -->
include "components.html"
include "components.html"
<!-- ============================================================= -->
include "plugins.html"
include "plugins.html"
<!-- ============================================================= -->
include "browsers.html"
include "browsers.html"
<!-- ============================================================= -->
include "upgrade.html"
include "upgrade.html"
<!-- ============================================================= -->
include "faq.html"
include "faq.html"
<!-- ============================================================= -->
include "license.html"
include "license.html"
</div><!-- /.content -->
</div><!-- /.content-wrapper -->

File diff suppressed because it is too large Load Diff

View File

@@ -15,6 +15,9 @@
font-size: 20px;
color: #000;
}
ul {
margin-bottom: 20px;
}
.page-header {
/*border-bottom: 1px solid #ddd; */
margin: 20px 0 20px 0;
@@ -27,6 +30,7 @@
z-index: 5;
display: block;
background-color: #ecf0f5;
color: #000;
}
.page-header span::before,
.page-header a::before {
@@ -77,40 +81,7 @@
pre {
border: none;
}
/* desert scheme ported from vim to google prettify */
pre.prettyprint {display: block; background-color: #333; max-height: 300px; border: none!important; margin-bottom: 20px;}
pre .nocode { background-color: none; color: #000 }
pre .str { color: #ffa0a0;} /* string - pink */
pre .kwd { color: #f0e68c; font-weight: bold }
pre .com { color: #87ceeb } /* comment - skyblue */
pre .typ { color: #98fb98 } /* type - lightgreen */
pre .lit { color: #cd5c5c } /* literal - darkred */
pre .pun { color: #fff } /* punctuation */
pre .pln { color: #fff } /* plaintext */
pre .tag { color: #f0e68c; font-weight: bold } /* html/xml tag - lightyellow */
pre .atn { color: #bdb76b; font-weight: bold } /* attribute name - khaki */
pre .atv { color: #ffa0a0 } /* attribute value - pink */
pre .dec { color: #98fb98 } /* decimal - lightgreen */
/* Specify class=linenums on a pre to get line numbering */
ol.linenums { margin-top: 0; margin-bottom: 0; color: #AEAEAE } /* IE indents via margin-left */
li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8 { list-style-type: none }
/* Alternate shading for lines */
li.L1,li.L3,li.L5,li.L7,li.L9 { }
@media print {
pre.prettyprint { background-color: none }
pre .str, code .str { color: #060 }
pre .kwd, code .kwd { color: #006; font-weight: bold }
pre .com, code .com { color: #600; font-style: italic }
pre .typ, code .typ { color: #404; font-weight: bold }
pre .lit, code .lit { color: #044 }
pre .pun, code .pun { color: #440 }
pre .pln, code .pln { color: #000 }
pre .tag, code .tag { color: #006; font-weight: bold }
pre .atn, code .atn { color: #404 }
pre .atv, code .atv { color: #060 }
}
.sidebar {
margin-top: 0;
padding-top: 0!important;
@@ -125,4 +96,146 @@ li.L1,li.L3,li.L5,li.L7,li.L9 { }
}
p {
padding: 0!important;
}
/* Hemisu Light */
/* Original theme - http://noahfrederick.com/vim-color-scheme-hemisu/ */
.prettyprint {
background: white;
font-family: Menlo, 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', Monaco, Consolas, monospace;
font-size: 12px;
line-height: 1.5;
border: 1px solid #dedede!important;
padding: 10px;
max-height: 300px;
}
.pln {
color: #111111;
}
@media screen {
.str {
color: #739200;
}
.kwd {
color: #739200;
}
.com {
color: #999999;
}
.typ {
color: #ff0055;
}
.lit {
color: #538192;
}
.pun {
color: #111111;
}
.opn {
color: #111111;
}
.clo {
color: #111111;
}
.tag {
color: #111111;
}
.atn {
color: #739200;
}
.atv {
color: #ff0055;
}
.dec {
color: #111111;
}
.var {
color: #111111;
}
.fun {
color: #538192;
}
}
@media print, projection {
.str {
color: #006600;
}
.kwd {
color: #006;
font-weight: bold;
}
.com {
color: #600;
font-style: italic;
}
.typ {
color: #404;
font-weight: bold;
}
.lit {
color: #004444;
}
.pun, .opn, .clo {
color: #444400;
}
.tag {
color: #006;
font-weight: bold;
}
.atn {
color: #440044;
}
.atv {
color: #006600;
}
}
/* Specify class=linenums on a pre to get line numbering */
ol.linenums {
margin-top: 0;
margin-bottom: 0;
}
/* IE indents via margin-left */
li.L0,
li.L1,
li.L2,
li.L3,
li.L4,
li.L5,
li.L6,
li.L7,
li.L8,
li.L9 {
/* */
}
/* Alternate shading for lines */
li.L1,
li.L3,
li.L5,
li.L7,
li.L9 {
/* */
}

View File

@@ -1,6 +1,6 @@
{
"name": "AdminLTE",
"version": "2.0.0",
"version": "2.0.3",
"devDependencies": {
"grunt": "~0.4.5",
"grunt-contrib-less": "^0.12.0",