提交 2f72188c 编写于 作者: A Abdullah Almsaeed

Merge master

......@@ -20,4 +20,4 @@
"fallback-colors": false,
"vendor-prefix": false,
"import": false
}
\ No newline at end of file
}
......@@ -167,7 +167,7 @@
&:hover,
&:focus {
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,
&:focus,
......
......@@ -111,12 +111,12 @@ body {
}
}
body.hold-transition {
.content-wrapper,
.right-side,
.main-footer,
.main-sidebar,
.left-side,
body.hold-transition {
.content-wrapper,
.right-side,
.main-footer,
.main-sidebar,
.left-side,
.main-header > .navbar,
.main-header .logo {
/* Fix for IE */
......
......@@ -98,7 +98,7 @@
color: #444444;
overflow: hidden;
text-overflow: ellipsis;
padding: 10px;
padding: 10px;
// Icons inside the menu
> .glyphicon,
> .fa,
......
......@@ -282,7 +282,7 @@
> .list-group-item {
border-left: 0;
border-right: 0;
border-radius: 0;
border-radius: 0;
padding-left: 0;
padding-right: 0;
}
......
......@@ -215,7 +215,7 @@
.pagination {
> li > a {
background: #fafafa;
color: #666;
color: #666;
}
&.pagination-flat {
> li > a {
......
......@@ -18,7 +18,7 @@
.content-wrapper,
.right-side,
.main-footer {
margin-left: 0!important;
margin-left: 0!important;
min-height: 0!important;
.translate(0,0)!important;
}
......
......@@ -75,4 +75,4 @@
float: left;
}
}
}
\ No newline at end of file
}
......@@ -7,4 +7,4 @@
<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>
</ul>
</section>
\ No newline at end of file
</section>
......@@ -182,6 +182,7 @@ AdminLTE/
</ul>
</section>
<!-- ============================================================= -->
<section id="advice">
......
......@@ -152,4 +152,4 @@
</section><!-- /.content -->
</div><!-- ./wrapper -->
</body>
</html>
\ No newline at end of file
</html>
......@@ -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
fixed layout. -->
</body>
</html>
\ No newline at end of file
</html>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册