Merge 90d3cfb into 6190505

Azure · Sep 25, 2018 · 5e17cb7 · 5e17cb7
2 parents 6190505 + 90d3cfb
commit 5e17cb7
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 4 deletions.
diff --git a/client/src/app/function/function-new/function-new.component.html b/client/src/app/function/function-new/function-new.component.html
@@ -120,7 +120,8 @@ <h2>{{ 'functionNew_chooseTemplate' | translate }}</h2>
                          [ariaLabel]="'Create Function'"
                          [animate]="true"
                          [closeOnClickBackdrop]="false"
-                         [showBackdrop]="true">
+                         [showBackdrop]="true"
+                         >
 
         <extension-checker *ngIf="sidePanelOpened"
                         [functionCard]="createFunctionCard"

diff --git a/client/src/app/function/function-new/function-new.component.scss b/client/src/app/function/function-new/function-new.component.scss
@@ -4,6 +4,10 @@ h2{
     display: inline;
 }
 
+:host /deep/ .ng-sidebar__backdrop { 
+    background-color: $sidebar-backdrop-color-light !important;
+}
+
 .newfunc-container{
     padding: 20px;
 }
@@ -170,6 +174,9 @@ drop-down{
             box-shadow: $card-box-shadow-hover-dark;
         }
     }
+    :host /deep/ .ng-sidebar__backdrop { 
+        background-color: $sidebar-backdrop-color-dark !important;
+    }
 }
 
 .search-and-sort{

diff --git a/...p/site/deployment-center/provider-dashboards/kudu-dashboard/kudu-dashboard.component.scss b/...p/site/deployment-center/provider-dashboards/kudu-dashboard/kudu-dashboard.component.scss
@@ -5,6 +5,10 @@
     padding: 10px 20px 12px 20px;
 }
 
+:host /deep/ .ng-sidebar__backdrop { 
+    background-color: $sidebar-backdrop-color-light
+}
+
 .essentials-col {
     min-width: 175px;
     display: inline-block;
@@ -55,4 +59,13 @@
 
 .time-column {
     width: 5%; 
+}
+
+
+#app-root[theme=dark]{
+
+    :host /deep/ .ng-sidebar__backdrop { 
+        background-color: $sidebar-backdrop-color-dark;
+    }
+
 }
diff --git a/client/src/sass/common/_variables.scss b/client/src/sass/common/_variables.scss
@@ -222,3 +222,10 @@ $card-footer-border-color: rgba(204, 204, 204, 0.5);
 
 // Card dark mode
 $card-box-shadow-hover-dark: 0px 4px 8px rgba(255, 255, 255, .14);
+
+
+//sidebar
+$sidebar-backdrop-color-light: rgba(255, 255, 255, 0.80);
+$sidebar-backdrop-color-dark: rgba(0, 0, 0, 0.80);
+$sidebar-flyout-border-shadow-light: rgba(0, 0, 0, 0.16) 0px 8px 16px 0px;
+$sidebar-flyout-border-shadow-dark: rgba(255, 255, 255, 0.16) 0px 8px 16px 0px;
diff --git a/client/src/sass/pages/_sidebar.scss b/client/src/sass/pages/_sidebar.scss
@@ -8,6 +8,10 @@
     &.ng-sidebar--opened.ng-sidebar--push {
         border-left: $border;
     }
+    &.ng-sidebar--opened.ng-sidebar--over {
+        box-shadow: $sidebar-flyout-border-shadow-light;
+    }
+
 }
 
 .sidebar-ftp-dashboard {
@@ -19,6 +23,9 @@
 .sidebar-new-function {
     background-color: $body-bg-color;
     z-index: 11 !important;
+    &.ng-sidebar--opened.ng-sidebar--over {
+        box-shadow: $sidebar-flyout-border-shadow-light;
+    }
 }
 
 .sidebar-new-function {
@@ -55,6 +62,9 @@
 #app-root[theme=dark]{
     .sidebar{
         background-color: $body-bg-color-dark;
+        &.ng-sidebar--opened.ng-sidebar--over {
+            box-shadow: $sidebar-flyout-border-shadow-dark;
+        }
     }
 
     .sidebar-ftp-dashboard {
@@ -63,6 +73,9 @@
 
     .sidebar-new-function {
         background-color: $body-bg-color-dark;
+        &.ng-sidebar--opened.ng-sidebar--over {
+            box-shadow: $sidebar-flyout-border-shadow-dark;
+        }
     }
     .sidebar-monitor-details {
         background-color: $body-bg-color-dark;

diff --git a/server/Resources/Resources.resx b/server/Resources/Resources.resx
@@ -3944,13 +3944,13 @@ Set to "External URL" to use an API definition that is hosted elsewhere.</value>
     <value>Description</value>
   </data>
   <data name="no_vsts_repos" xml:space="preserve">
-    <value>You don not own any VSTS Repositories</value>
+    <value>You do not own any VSTS Repositories</value>
   </data>
   <data name="no_vsts_accounts" xml:space="preserve">
-    <value>You don not have any valid VSTS Accounts</value>
+    <value>You do not have any valid VSTS Accounts</value>
   </data>
   <data name="no_vsts_accounts_kudu" xml:space="preserve">
-    <value>You don not have any valid VSTS Accounts. App Service Kudu Build also requires you to be account owner</value>
+    <value>You do not have any valid VSTS Accounts. App Service Kudu Build also requires you to be account owner</value>
   </data>
   <data name="create_one" xml:space="preserve">
     <value>Create one now</value>