Merge branch 'mod-frontend' of oscarleiva/energylink into development

pkg/api/index.go

@@ -342,7 +342,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
 		HideFromMenu: true,
 		Children: []*dtos.NavLink{
 			{Text: "Keyboard shortcuts", Url: "/shortcuts", Icon: "fa fa-fw fa-keyboard-o", Target: "_self"},
-			// {Text: "Community site", Url: "http://community.grafana.com", Icon: "fa fa-fw fa-comment", Target: "_blank"},
+			{Text: "Get support", Url: "https://mercadoselectricos.com.sv/contacto", Icon: "fa fa-fw fa-comment", Target: "_blank"},
 			// {Text: "Documentation", Url: "http://docs.grafana.org", Icon: "fa fa-fw fa-file", Target: "_blank"},
 		},
 	})

public/app/core/components/Footer/Footer.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-import { Tooltip } from '@grafana/ui';
+//import { Tooltip } from '@grafana/ui';
 
 interface Props {
   appName: string;
@@ -16,37 +16,15 @@ export const Footer: FC<Props> = React.memo(
         <div className="text-center">
           <ul>
             <li>
-              <a href="http://docs.grafana.org" target="_blank" rel="noopener">
-                <i className="fa fa-file-code-o" /> Docs
+              <a href="https://www.mercadoselectricos.com.sv/contacto/" target="_blank" rel="noopener">
+                <i className="fa fa-support" /> Support Merelec
               </a>
             </li>
             <li>
-              <a href="https://grafana.com/services/support" target="_blank" rel="noopener">
-                <i className="fa fa-support" /> Support Plans
+              <a href="https://www.mercadoselectricos.com.sv/" target="_blank" rel="noopener">
+                <i className="fa fa-briefcase" /> Merelec Business
               </a>
             </li>
-            <li>
-              <a href="https://community.grafana.com/" target="_blank" rel="noopener">
-                <i className="fa fa-comments-o" /> Community
-              </a>
-            </li>
-            <li>
-              <a href="https://grafana.com" target="_blank" rel="noopener">
-                {appName}
-              </a>{' '}
-              <span>
-                v{buildVersion} (commit: {buildCommit})
-              </span>
-            </li>
-            {newGrafanaVersionExists && (
-              <li>
-                <Tooltip placement="auto" content={newGrafanaVersion}>
-                  <a href="https://grafana.com/get" target="_blank" rel="noopener">
-                    New version available!
-                  </a>
-                </Tooltip>
-              </li>
-            )}
           </ul>
         </div>
       </footer>

public/sass/components/_footer.scss

@@ -59,7 +59,7 @@
 @include media-breakpoint-up(sm) {
   .login-page {
     .footer {
-      padding: 70px 0 $space-md 0;
+      //padding: 70px 0 $space-md 0;
     }
   }
 }

public/sass/pages/_login.scss

@@ -10,8 +10,15 @@ $login-border: #fcb122;
   display: flex;
   align-items: center;
   justify-content: center;
-  background-image: url(../img/randomized_pattern_bg.svg);
-  background-size: cover;
+  background-image: url(../img/login-bg-circuit.png);
+  background-size: contain;
+  background-position: left center;
+
+  @media screen and (max-width: 800px) {
+    background-image: url(../img/login-bg-circuit-mobile.png);
+    background-size: cover;
+    background-position: right top;
+  }
   color: #d8d9da;
 
   & a {
@@ -54,9 +61,9 @@ select:-webkit-autofill:focus {
 .login-form-input {
   border: 1px solid $login-border;
   border-radius: 4px;
-  opacity: 0.6;
+  opacity: 0.8;
   background: $black;
-  color: #fbfbfb;
+  color: #fff;
 
   &:focus {
     border: 1px solid $login-border;