fix scroll bars

DSchougaard · Nov 18, 2015 · 23183f4 · 23183f4
1 parent 262b564
commit 23183f4
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/src/app/components/backTop/backTop.js b/src/app/components/backTop/backTop.js
@@ -6,7 +6,7 @@ blurAdminApp.directive('backTop', function () {
     controller: [function () {
       $('#backTop').backTop({
         'position': 200,
-        'speed': 500
+        'speed': 100
       });
     }],
     templateUrl: 'app/components/backTop/backTop.html'

diff --git a/src/app/components/blurPanel/_blurPanel.scss b/src/app/components/blurPanel/_blurPanel.scss
@@ -38,5 +38,4 @@
 
 .panel-body {
   padding: 16px 22px;
-  @include scrollbars(.5em, #ccc, #fff);
 }
diff --git a/src/app/components/pageTop/pageTop.html b/src/app/components/pageTop/pageTop.html
@@ -10,7 +10,7 @@
   <div class="user-profile clearfix">
     <div class="al-user-profile dropdown">
       <a href class="dropdown-toggle" data-toggle="dropdown">
-        <img src="img/pic-profile-small.png">
+        <img src="img/Nasta.png">
       </a>
       <div class="dropdown-menu top-dropdown-menu profile-dropdown">
         <i class="dropdown-arr"></i>

diff --git a/src/app/pages/dashboard/widgets/calendar/_calendar.scss b/src/app/pages/dashboard/widgets/calendar/_calendar.scss
@@ -1,7 +1,3 @@
-#calendar {
-  @include scrollbars(.5em, #ccc, #fff);
-}
-
 .fc {
   direction: ltr;
   text-align: left;
@@ -308,12 +304,13 @@
 }
 
 .fc-scroller {
-  overflow-y: scroll;
-  overflow-x: hidden;
+  //overflow-y: scroll;
+  //overflow-x: hidden;
   & > * {
-    position: relative;
-    width: 100%;
-    overflow: hidden;
+    //position: relative;
+    //width: 100%;
+    //overflow: hidden;
+    //height: 100%;
   }
 }
 

diff --git a/src/assets/css/_layout.scss b/src/assets/css/_layout.scss
@@ -1,6 +1,6 @@
 $left-space: 180px;
 
-@include scrollbars(.5em, #f4f4f4, #142840);
+@include scrollbars(.5em, #d9d9d9, rgba(0,0,0,0));
 
 html {
   position: relative;

diff --git a/src/assets/css/_mixins.scss b/src/assets/css/_mixins.scss
@@ -6,6 +6,7 @@
 
   ::-webkit-scrollbar-thumb {
     background: $foreground-color;
+    border-radius: 5px;
   }
 
   ::-webkit-scrollbar-track {

diff --git a/src/assets/pictures/pic-profile-small.png b/src/assets/pictures/pic-profile-small.png