moved time range selector for MFE

Author: GurinderRawala

packages/grafana-data/src/themes/createShape.ts

@@ -19,7 +19,7 @@ export interface ThemeShapeInput {
 }
 
 export function createShape(options: ThemeShapeInput): ThemeShape {
-  const baseBorderRadius = options.borderRadius ?? 6;
+  const baseBorderRadius = options.borderRadius ?? 2;
 
   const radius = {
     default: '6px',

public/app/features/dashboard/containers/DashboardPage.tsx

@@ -439,9 +439,7 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
         >
           {showToolbar && (
             <header data-testid={selectors.pages.Dashboard.DashNav.navV2}>
-              {FNDashboard ? (
-                FNTimeRange
-              ) : (
+              {!FNDashboard && (
                 <DashNav
                   dashboard={dashboard}
                   title={dashboard.title}
@@ -456,7 +454,19 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
           )}
           {!FNDashboard && <DashboardPrompt dashboard={dashboard} />}
           {initError && <DashboardFailed />}
-          {showSubMenu && (
+          {FNDashboard && (
+            <div className="flex flex-col-reverse md:flex-row md:items-center md:justify-between w-full gap-y-2">
+              <div className="flex items-center w-full">
+                {showSubMenu && (
+                  <section aria-label={selectors.pages.Dashboard.SubMenu.submenu}>
+                    <SubMenu dashboard={dashboard} annotations={dashboard.annotations.list} links={dashboard.links} />
+                  </section>
+                )}
+              </div>
+              <div className="flex items-center w-full justify-end">{FNTimeRange}</div>
+            </div>
+          )}
+          {showSubMenu && !FNDashboard && (
             <section aria-label={selectors.pages.Dashboard.SubMenu.submenu}>
               <SubMenu dashboard={dashboard} annotations={dashboard.annotations.list} links={dashboard.links} />
             </section>

public/microfrontends/fn_dashboard/index.html

@@ -10,16 +10,16 @@
 <script nonce="">
   window.fnData = {
     themePaths: {
-      light: '../../../public/build/grafana.light.d1baf6b4c2f22c6b8525.css',
-      dark: '../../../public/build/grafana.dark.a820d2e71e70786204b8.css',
+      light: '../../../public/build/grafana.light.09c2de7e51f2c7f6964a.css',
+      dark: '../../../public/build/grafana.dark.7abe54bda23464aa7893.css',
     }
   };
 </script>
 
 
     <script nonce="" src="../../../public/build/runtime~fn_dashboard.551314fa089c5f51c211.js" type="text/javascript"></script>
 
-    <script nonce="" src="../../../public/build/fn_dashboard.3ae54ae0db10ee2ec059.js" type="text/javascript"></script>
+    <script nonce="" src="../../../public/build/fn_dashboard.3d2843b4e80cc008ca4a.js" type="text/javascript"></script>
 
   </body>
 </html>

public/sass/_variables.generated.scss

@@ -133,7 +133,7 @@ $headings-line-height: 1.5 !default;
 $border-width: 1px !default;
 
 $border-radius: 6px !default;
-$border-radius-lg: 18px !default;
+$border-radius-lg: 6px !default;
 $border-radius-sm: 6px !default;
 
 // Page