github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge master

pull/672/merge
Abdullah Almsaeed 2015-09-07 13:29:42 -04:00
parent 9e93fa988e dc84e46552
commit 2f72188c28
12 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/less/.csslintrc
View File

@ -20,4 +20,4 @@
"fallback-colors": false, "fallback-colors": false,
"vendor-prefix": false, "vendor-prefix": false,
"import": false "import": false
} }

2
build/less/control-sidebar.less
View File

@ -167,7 +167,7 @@
&:hover, &:hover,
&:focus { &:focus {
border-left-color: darken(@sidebar-dark-bg, 7%); border-left-color: darken(@sidebar-dark-bg, 7%);
border-bottom-color: darken(@sidebar-dark-bg, 7%); border-bottom-color: darken(@sidebar-dark-bg, 7%);
} }
&:hover, &:hover,
&:focus, &:focus,

12
build/less/core.less
View File

@ -111,12 +111,12 @@ body {
} }
} }
body.hold-transition { body.hold-transition {
.content-wrapper, .content-wrapper,
.right-side, .right-side,
.main-footer, .main-footer,
.main-sidebar, .main-sidebar,
.left-side, .left-side,
.main-header > .navbar, .main-header > .navbar,
.main-header .logo { .main-header .logo {
/* Fix for IE */ /* Fix for IE */

2
build/less/dropdown.less
View File

@ -98,7 +98,7 @@
color: #444444; color: #444444;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
padding: 10px; padding: 10px;
// Icons inside the menu // Icons inside the menu
> .glyphicon, > .glyphicon,
> .fa, > .fa,

2
build/less/miscellaneous.less
View File

@ -282,7 +282,7 @@
> .list-group-item { > .list-group-item {
border-left: 0; border-left: 0;
border-right: 0; border-right: 0;
border-radius: 0; border-radius: 0;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
} }

2
build/less/navs.less
View File

@ -215,7 +215,7 @@
.pagination { .pagination {
> li > a { > li > a {
background: #fafafa; background: #fafafa;
color: #666; color: #666;
} }
&.pagination-flat { &.pagination-flat {
> li > a { > li > a {

2
build/less/print.less
View File

@ -18,7 +18,7 @@
.content-wrapper, .content-wrapper,
.right-side, .right-side,
.main-footer { .main-footer {
margin-left: 0!important; margin-left: 0!important;
min-height: 0!important; min-height: 0!important;
.translate(0,0)!important; .translate(0,0)!important;
} }

2
build/less/social-widgets.less
View File

@ -75,4 +75,4 @@
float: left; float: left;
} }
} }
} }

2
documentation/build/include/dependencies.html
View File

@ -7,4 +7,4 @@
<li><a href="http://jquery.com/" target="_blank">jQuery 1.11+</a></li> <li><a href="http://jquery.com/" target="_blank">jQuery 1.11+</a></li>
<li><a href="#plugins">All other plugins are listed below</a></li> <li><a href="#plugins">All other plugins are listed below</a></li>
</ul> </ul>
</section> </section>

1
documentation/index.html
View File

@ -182,6 +182,7 @@ AdminLTE/
</ul> </ul>
</section> </section>
<!-- ============================================================= --> <!-- ============================================================= -->
<section id="advice"> <section id="advice">

2
pages/examples/invoice-print.html
View File

@ -152,4 +152,4 @@
</section><!-- /.content --> </section><!-- /.content -->
</div><!-- ./wrapper --> </div><!-- ./wrapper -->
</body> </body>
</html> </html>

2
starter.html
View File

@ -372,4 +372,4 @@ scratch. This page gets rid of all links and provides the needed markup only.
user experience. Slimscroll is required when using the user experience. Slimscroll is required when using the
fixed layout. --> fixed layout. -->
</body> </body>
</html> </html>