Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Barbara/update #181

Merged
merged 7 commits into from
Jan 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
shinydashboard 0.5.3.9000
=========================

* Updated to AdminLTE 2.3.11. ([#181](https://github.com/rstudio/shinydashboard/pull/181))

shinydashboard 0.5.3
=========================

Expand Down
73 changes: 55 additions & 18 deletions inst/AdminLTE/AdminLTE.css
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@
local('SourceSansPro-SemiboldIt'),
url('fonts/Source_Sans_Pro_600italic.ttf') format('truetype');
}

/*!
* AdminLTE v2.3.2
* AdminLTE v2.3.11
* Author: Almsaeed Studio
* Website: Almsaeed Studio <http://almsaeedstudio.com>
* License: Open source - MIT
Expand All @@ -74,25 +75,24 @@
*/
html,
body {
min-height: 100%;
height: 100%;
}
.layout-boxed html,
.layout-boxed body {
height: 100%;
}
body {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-weight: 400;
overflow-x: hidden;
overflow-y: auto;
}
/* Layout */
.wrapper {
min-height: 100%;
height: 100%;
position: relative;
overflow: hidden;
overflow-x: hidden;
overflow-y: auto;
}
.wrapper:before,
.wrapper:after {
Expand Down Expand Up @@ -196,7 +196,7 @@ body.hold-transition .right-side,
body.hold-transition .main-footer,
body.hold-transition .main-sidebar,
body.hold-transition .left-side,
body.hold-transition .main-header > .navbar,
body.hold-transition .main-header .navbar,
body.hold-transition .main-header .logo {
/* Fix for IE */
-webkit-transition: none;
Expand Down Expand Up @@ -257,7 +257,7 @@ a:focus {
max-height: 100px;
z-index: 1030;
}
.main-header > .navbar {
.main-header .navbar {
-webkit-transition: margin-left 0.3s ease-in-out;
-o-transition: margin-left 0.3s ease-in-out;
transition: margin-left 0.3s ease-in-out;
Expand All @@ -267,7 +267,7 @@ a:focus {
min-height: 50px;
border-radius: 0;
}
.layout-top-nav .main-header > .navbar {
.layout-top-nav .main-header .navbar {
margin-left: 0;
}
.main-header #navbar-search-input.form-control {
Expand Down Expand Up @@ -589,21 +589,30 @@ a:focus {
}
.sidebar-menu > li .label,
.sidebar-menu > li .badge {
margin-top: 3px;
margin-right: 5px;
}
.sidebar-menu > li .badge {
margin-top: 3px;
}
.sidebar-menu li.header {
padding: 10px 25px 10px 15px;
font-size: 12px;
}
.sidebar-menu li > a > .fa-angle-left {
.sidebar-menu li > a > .fa-angle-left,
.sidebar-menu li > a > .pull-right-container > .fa-angle-left {
width: auto;
height: auto;
padding: 0;
margin-right: 10px;
margin-top: 3px;
}
.sidebar-menu li.active > a > .fa-angle-left {
.sidebar-menu li > a > .fa-angle-left {
position: absolute;
top: 50%;
right: 10px;
margin-top: -8px;
}
.sidebar-menu li.active > a > .fa-angle-left,
.sidebar-menu li.active > a > .pull-right-container > .fa-angle-left {
-webkit-transform: rotate(-90deg);
-ms-transform: rotate(-90deg);
-o-transform: rotate(-90deg);
Expand Down Expand Up @@ -635,6 +644,8 @@ a:focus {
.sidebar-menu .treeview-menu > li > a > .ion {
width: 20px;
}
.sidebar-menu .treeview-menu > li > a > .pull-right-container > .fa-angle-left,
.sidebar-menu .treeview-menu > li > a > .pull-right-container > .fa-angle-down,
.sidebar-menu .treeview-menu > li > a > .fa-angle-left,
.sidebar-menu .treeview-menu > li > a > .fa-angle-down {
width: auto;
Expand Down Expand Up @@ -687,6 +698,17 @@ a:focus {
padding: 12px 5px 12px 20px;
background-color: inherit;
}
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container {
position: relative!important;
float: right;
width: auto!important;
left: 180px !important;
top: -22px !important;
z-index: 900;
}
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > a > .pull-right-container > .label:not(:first-of-type) {
display: none;
}
.sidebar-mini.sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
top: 44px;
margin-left: 0;
Expand Down Expand Up @@ -733,7 +755,7 @@ a:focus {
.sidebar-menu li > a {
position: relative;
}
.sidebar-menu li > a > .pull-right {
.sidebar-menu li > a > .pull-right-container {
position: absolute;
right: 10px;
top: 50%;
Expand Down Expand Up @@ -1318,24 +1340,36 @@ a:focus {
.form-group.has-success label {
color: #00a65a;
}
.form-group.has-success .form-control {
.form-group.has-success .form-control,
.form-group.has-success .input-group-addon {
border-color: #00a65a;
box-shadow: none;
}
.form-group.has-success .help-block {
color: #00a65a;
}
.form-group.has-warning label {
color: #f39c12;
}
.form-group.has-warning .form-control {
.form-group.has-warning .form-control,
.form-group.has-warning .input-group-addon {
border-color: #f39c12;
box-shadow: none;
}
.form-group.has-warning .help-block {
color: #f39c12;
}
.form-group.has-error label {
color: #dd4b39;
}
.form-group.has-error .form-control {
.form-group.has-error .form-control,
.form-group.has-error .input-group-addon {
border-color: #dd4b39;
box-shadow: none;
}
.form-group.has-error .help-block {
color: #dd4b39;
}
/* Input group */
.input-group .input-group-addon {
border-radius: 0;
Expand Down Expand Up @@ -1542,7 +1576,7 @@ a:focus {
}
.small-box h3,
.small-box p {
z-index: 5px;
z-index: 5;
}
.small-box .icon {
-webkit-transition: all 0.3s linear;
Expand Down Expand Up @@ -1806,6 +1840,9 @@ a:focus {
right: 0;
left: auto;
}
.box-header > .box-tools .dropdown-menu > li > a {
color: #444!important;
}
.btn-box-tool {
padding: 5px;
font-size: 12px;
Expand Down
4 changes: 2 additions & 2 deletions inst/AdminLTE/AdminLTE.min.css

Large diffs are not rendered by default.

Loading