diff --git a/src/app/components/sidebar/_sidebar.scss b/src/app/components/sidebar/_sidebar.scss index 1701c0f..785587d 100644 --- a/src/app/components/sidebar/_sidebar.scss +++ b/src/app/components/sidebar/_sidebar.scss @@ -27,7 +27,7 @@ a.collapse-menu-link { color: #fff; width: 18px; position: absolute; - top: 52px; + top: 47px; right: -18px; padding: 0; @@ -49,7 +49,7 @@ a.collapse-menu-link { .al-sidebar-list-block { position: absolute; height: 100%; - top: 52px; + top: 88px; left: 0; width: 100%; padding-bottom: 10px; @@ -116,6 +116,46 @@ a.al-sidebar-list-link { } } +.sidebar-overlap { + background: rgba(0, 0, 0, .75); + @extend .sidebar-full-width; +} + +.slimScrollBar, .slimScrollRail { + border-radius: 0px !important; + width: 4px !important; +} + +.search { + position: absolute; + left: 18px; + top: 54px; + text-shadow: none; + color: #fff; + font-size: 13px; + line-height: 25px; + transition: all 0.5s ease; + white-space: nowrap; + overflow: hidden; + width: 162px; + label { + cursor: pointer; + } + i { + margin-right: 18px; + width: 16px; + display: inline-block; + } + input { + background: none; + border: none; + outline: none; + width: 120px; + padding: 0; + margin: 0 0 0 -3px; + } +} + @mixin default-sublist() { margin: 0; padding: 0; @@ -182,9 +222,9 @@ a.al-sidebar-list-link { width: 52px; .al-logo { - padding-left: 18px; + padding-left: 16px; span { - padding-left: 18px; + padding-left: 20px; } } @@ -228,6 +268,10 @@ a.al-sidebar-list-link { .sidebar-hover-elem, .sidebar-select-elem { left: 48px; } + + .search { + width: 32px; + } } } @@ -303,14 +347,8 @@ a.al-sidebar-list-link { .sidebar-hover-elem, .sidebar-select-elem { left: $sidebar-width - 4; } -} -.sidebar-overlap { - background: rgba(0, 0, 0, .75); - @extend .sidebar-full-width; -} - -.slimScrollBar, .slimScrollRail { - border-radius: 0px !important; - width: 4px !important; + .search { + width: 162px; + } } \ No newline at end of file diff --git a/src/app/components/sidebar/sidebar.html b/src/app/components/sidebar/sidebar.html index f2f1986..93f064d 100644 --- a/src/app/components/sidebar/sidebar.html +++ b/src/app/components/sidebar/sidebar.html @@ -7,6 +7,12 @@ + +
+
+
\ No newline at end of file diff --git a/src/app/pages/profile/profileModal/profileModal.js b/src/app/pages/profile/profileModal/profileModal.js index 0f22577..538d473 100644 --- a/src/app/pages/profile/profileModal/profileModal.js +++ b/src/app/pages/profile/profileModal/profileModal.js @@ -4,7 +4,11 @@ blurAdminApp.directive('profileModal', [function () { return { restrict: 'EA', replace: true, - link: function (scope, elem, attr) { + link: function ($scope) { + $scope.link = ""; + $scope.bindProfile = function(){ + $scope.link = ""; + }; }, templateUrl: 'app/pages/profile/profileModal/profileModal.html' }; diff --git a/src/assets/css/_layout.scss b/src/assets/css/_layout.scss index c402aa2..151ef86 100644 --- a/src/assets/css/_layout.scss +++ b/src/assets/css/_layout.scss @@ -36,14 +36,13 @@ a { a.al-logo { color: #ffffff; text-decoration: none; - padding: 10px 18px 8px 17px; + padding: 10px 18px 8px 16px; display: block; font: 100 24px/34px $font-family; text-decoration: none; white-space: nowrap; text-shadow: 0 0 2px; overflow: hidden; - position: fixed; top: 0; left: 0; &:hover {