Skip to content

Commit

Permalink
customized front-end for Psiphon
Browse files Browse the repository at this point in the history
  • Loading branch information
geebee committed May 2, 2018
1 parent 844bdc5 commit 13ff1cf
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 41 deletions.
4 changes: 2 additions & 2 deletions public/app/core/components/sidemenu/sidemenu.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a class="sidemenu__logo" ng-click="ctrl.toggleSideMenu()">
<img src="public/img/grafana_icon.svg"></img>
<img src="public/img/psiphon-logo-512x512.png"></img>
</a>

<a class="sidemenu__logo_small_breakpoint" ng-click="ctrl.toggleSideMenuSmallBreakpoint()">
Expand Down Expand Up @@ -78,4 +78,4 @@
</li>
</ul>
</div>
</div>
</div>
3 changes: 1 addition & 2 deletions public/app/partials/login.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<div class="login container">
<div class="login-content">
<div class="login-branding">
<img class="logo-icon" src="public/img/grafana_icon.svg" alt="Grafana" />
<i class="icon-gf icon-gf-grafana_wordmark"></i>
<img class="logo-icon" src="public/img/psiphon-logo-512x512.png" alt="Psiphon" />
</div>
<div class="login-inner-box">
<form name="loginForm" class="login-form-group gf-form-group" ng-hide="disableLoginForm">
Expand Down
Binary file added public/img/grafana-psiphon-login.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/img/psiphon-logo-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/sass/_variables.dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,15 @@ $text-shadow-strong: 1px 1px 4px $black;
$text-shadow-faint: 1px 1px 4px rgb(45, 45, 45);

// gradients
$brand-gradient: linear-gradient(to right, #171819, #282b47, #643063, #aa2658, #d43f27);
/*
$brand-gradient: linear-gradient(
to right,
rgba(255, 213, 0, 0.7) 0%,
rgba(255, 68, 0, 0.7) 99%,
rgba(255, 68, 0, 0.7) 100%
);
*/
$page-gradient: linear-gradient(180deg, #222426 10px, rgb(22, 23, 25) 100px);

// Links
Expand Down
3 changes: 3 additions & 0 deletions public/sass/_variables.light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ $text-shadow-faint: none;
$textShadow: none;

// gradients
$brand-gradient: linear-gradient(to right, #52545c, #675577, #954b7b, #c13a5f, #d43f27);
/*
$brand-gradient: linear-gradient(to right, rgba(255, 213, 0, 1) 0%, rgba(255, 68, 0, 1) 99%, rgba(255, 68, 0, 1) 100%);
*/
$page-gradient: linear-gradient(-60deg, $gray-7, #f5f6f9 70%, $gray-7 98%);

// Links
Expand Down
2 changes: 1 addition & 1 deletion public/sass/pages/_login.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $login-border: #8daac5;
display: flex;
align-items: center;
justify-content: center;
background-image: url(../img/heatmap_bg_test.svg);
background-image: url(../img/grafana-psiphon-login.png);
background-size: cover;
}

Expand Down
36 changes: 0 additions & 36 deletions public/views/index.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,42 +42,6 @@
<div class="main-view">
<div class="scroll-canvas" page-scrollbar>
<div ng-view></div>

<footer class="footer">
<div class="text-center">
<ul>
<li>
<a href="http://docs.grafana.org" target="_blank">
<i class="fa fa-file-code-o"></i>
Docs
</a>
</li>
<li>
<a href="https://grafana.com/services/support" target="_blank">
<i class="fa fa-support"></i>
Support Plans
</a>
</li>
<li>
<a href="https://community.grafana.com/" target="_blank">
<i class="fa fa-comments-o"></i>
Community
</a>
</li>
<li>
<a href="https://grafana.com" target="_blank">Grafana</a>
<span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
</li>
[[if .NewGrafanaVersionExists]]
<li>
<a href="https://grafana.com/get" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
New version available!
</a>
</li>
[[end]]
</ul>
</div>
</footer>
</div>
</div>
</grafana-app>
Expand Down

0 comments on commit 13ff1cf

Please sign in to comment.