aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortomasz1986 <twilczynski@naver.com>2023-09-01 08:18:30 +0200
committerGitHub <noreply@github.com>2023-09-01 08:18:30 +0200
commit2abba1dfb0f3337dd1e77c6584e7d12bdba284b9 (patch)
treea9af56c52c65e31add11f967d833963add5d6444
parent325b3b114fbbc4bc04c6a6672025f598286c3d65 (diff)
downloadsyncthing-2abba1dfb0f3337dd1e77c6584e7d12bdba284b9.tar.gz
syncthing-2abba1dfb0f3337dd1e77c6584e7d12bdba284b9.zip
gui: Remove footer and move links to header (fixes #5607) (#9067)
* gui: Remove footer and move links to header (fixes #5607) Currently, the footer is always present and takes space at the bottom of the GUI. However, the links listed there are not part of everyday user interaction, and as such, they unnecessarily clutter the page, reducing the usable screen space. Thus, transform the current Help link in the header into a Help dropdown menu, and move the links from the footer into it. Also apply the following tweaks: 1. Move the About dialog from Actions to Help. 2. Add an Introduction (to the GUI) link to Help. 3. Change the Support icon from a question mark to a group of people. 4. Change the Changelog and About icons to a filled version to match the other icons better. 5. Use a source code icon for Source Code instead of a wrench icon, and move the wrench icon to Logs. This is done to prevent Changelog and Logs from using the same icon. 6. Update all dropdown icons' Fork Awesome styles to "fa fa-fw <icon>". Signed-off-by: Tomasz Wilczyński <twilczynski@naver.com> * a few more Fork Awesome style updates --------- Signed-off-by: Tomasz Wilczyński <twilczynski@naver.com>
-rw-r--r--gui/default/assets/css/overrides.css28
-rw-r--r--gui/default/index.html61
2 files changed, 27 insertions, 62 deletions
diff --git a/gui/default/assets/css/overrides.css b/gui/default/assets/css/overrides.css
index 6bce15004..62abbbec6 100644
--- a/gui/default/assets/css/overrides.css
+++ b/gui/default/assets/css/overrides.css
@@ -8,7 +8,6 @@
*/
body {
- padding-bottom: 70px;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
overflow-y: scroll;
}
@@ -398,25 +397,6 @@ ul.three-columns li, ul.two-columns li {
width: 100%;
}
-/** Footer nav on small devices **/
-@media (max-width: 1199px) {
- /* Stay at the end of the page, with space reserved for the footer
- usually taking up two rows. */
-
- html {
- position: relative;
- min-height: 100%;
- }
-
- body {
- padding-bottom: 60px;
- }
-
- .navbar-fixed-bottom {
- position: absolute;
- }
-}
-
@media (max-width: 768px) {
/* Layout after the normal contents, as this is when the footer switches
to a vertical layout. */
@@ -429,10 +409,6 @@ ul.three-columns li, ul.two-columns li {
margin: 3.25px -15px;
}
- .navbar-fixed-bottom {
- position: relative;
- }
-
.navbar-nav .open .dropdown-menu {
position: absolute;
left: auto;
@@ -476,10 +452,6 @@ ul.three-columns li, ul.two-columns li {
.navbar-nav .open .dropdown-menu > li > a {
padding: 12px 15px 12px 25px;
}
-
- .navbar-fixed-bottom li {
- width: 100%;
- }
}
.tab-content {
diff --git a/gui/default/index.html b/gui/default/index.html
index dff6ee5e4..83cd43f79 100644
--- a/gui/default/index.html
+++ b/gui/default/index.html
@@ -87,36 +87,45 @@
</button>
</li>
<li class="dropdown" language-select></li>
- <li>
- <a class="navbar-link" href="{{docsURL('intro/gui')}}" target="_blank">
- <span class="fas fa-question-circle"></span>
+ <li class="dropdown action-menu">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+ <span class="fa fa-question-circle"></span>
<span class="hidden-xs" translate>Help</span>
+ <span class="caret"></span>
</a>
+ <ul class="dropdown-menu">
+ <li><a class="navbar-link" href="{{docsURL('intro/gui')}}" target="_blank"><span class="fa fa-fw fa-info-circle"></span>&nbsp;<span translate>Introduction</span></a></li>
+ <li class="divider" aria-hidden="true"></li>
+ <li><a class="navbar-link" href="https://syncthing.net/" target="_blank"><span class="fa fa-fw fa-home"></span>&nbsp;<span translate>Home page</span></a></li>
+ <li><a class="navbar-link" href="{{docsURL()}}" target="_blank"><span class="fa fa-fw fa-book"></span>&nbsp;<span translate>Documentation</span></a></li>
+ <li><a class="navbar-link" href="https://forum.syncthing.net" target="_blank"><span class="fa fa-fw fa-users"></span>&nbsp;<span translate>Support</span></a></li>
+ <li class="divider" aria-hidden="true"></li>
+ <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/releases" target="_blank"><span class="fa fa-fw fa-file-text"></span>&nbsp;<span translate>Changelog</span></a></li>
+ <li><a class="navbar-link" href="https://data.syncthing.net/" target="_blank"><span class="fa fa-fw fa-bar-chart"></span>&nbsp;<span translate>Statistics</span></a></li>
+ <li class="divider" aria-hidden="true"></li>
+ <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/issues" target="_blank"><span class="fa fa-fw fa-bug"></span>&nbsp;<span translate>Bugs</span></a></li>
+ <li><a class="navbar-link" href="https://github.com/syncthing/syncthing" target="_blank"><span class="fa fa-fw fa-file-code-o"></span>&nbsp;<span translate>Source Code</span></a></li>
+ <li class="divider" aria-hidden="true"></li>
+ <li><a href="" ng-click="about.show()"><span class="fa fa-fw fa-heart"></span>&nbsp;<span translate>About</span></a></li>
+ </ul>
</li>
<li class="dropdown action-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <span class="fas fa-cog"></span>
+ <span class="fa fa-cog"></span>
<span class="hidden-xs" translate>Actions</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
- <li><a href="" ng-click="showSettings()"><span class="fas fa-fw fa-cog"></span>&nbsp;<span translate>Settings</span></a></li>
- <li><a href="" ng-click="showDeviceIdentification(thisDevice())"><span class="fas fa-fw fa-qrcode"></span>&nbsp;<span translate>Show ID</span></a></li>
- <li class="divider" aria-hidden="true"></li>
- <li><a href="" ng-click="shutdown()"><span class="fas fa-fw fa-power-off"></span>&nbsp;<span translate>Shutdown</span></a></li>
- <li><a href="" ng-click="restart()"><span class="fas fa-fw fa-refresh"></span>&nbsp;<span translate>Restart</span></a></li>
+ <li><a href="" ng-click="showSettings()"><span class="fa fa-fw fa-cog"></span>&nbsp;<span translate>Settings</span></a></li>
+ <li><a href="" ng-click="showDeviceIdentification(thisDevice())"><span class="fa fa-fw fa-qrcode"></span>&nbsp;<span translate>Show ID</span></a></li>
<li class="divider" aria-hidden="true"></li>
- <li class="visible-xs">
- <a href="{{docsURL('intro/gui')}}" target="_blank">
- <span class="fas fa-fw fa-question-circle"></span>&nbsp;<span translate>Help</span>
- </a>
- </li>
- <li><a href="" ng-click="about.show()"><span class="far fa-fw fa-heart"></span>&nbsp;<span translate>About</span></a></li>
+ <li><a href="" ng-click="shutdown()"><span class="fa fa-fw fa-power-off"></span>&nbsp;<span translate>Shutdown</span></a></li>
+ <li><a href="" ng-click="restart()"><span class="fa fa-fw fa-refresh"></span>&nbsp;<span translate>Restart</span></a></li>
<li class="divider" aria-hidden="true"></li>
- <li><a href="" ng-click="advanced()"><span class="fas fa-fw fa-cogs"></span>&nbsp;<span translate>Advanced</span></a></li>
- <li><a href="" ng-click="logging.show()"><span class="far fa-fw fa-file-alt"></span>&nbsp;<span translate>Logs</span></a></li>
+ <li><a href="" ng-click="advanced()"><span class="fa fa-fw fa-cogs"></span>&nbsp;<span translate>Advanced</span></a></li>
+ <li><a href="" ng-click="logging.show()"><span class="fa fa-fw fa-wrench"></span>&nbsp;<span translate>Logs</span></a></li>
<li class="divider" aria-hidden="true" ng-if="config.gui.debugging"></li>
- <li><a href="/rest/debug/support" target="_blank" ng-if="config.gui.debugging"><span class="fa fa-user-md"></span>&nbsp;<span translate>Support Bundle</span></a></li>
+ <li><a href="/rest/debug/support" target="_blank" ng-if="config.gui.debugging"><span class="fa fa-fw fa-user-md"></span>&nbsp;<span translate>Support Bundle</span></a></li>
</ul>
</li>
</ul>
@@ -957,22 +966,6 @@
</div> <!-- /container -->
</div> <!-- /ng-cloak -->
- <!-- Bottom bar -->
-
- <nav class="navbar navbar-default navbar-fixed-bottom">
- <div class="container">
- <ul class="nav navbar-nav">
- <li><a class="navbar-link" href="https://syncthing.net/" target="_blank"><span class="fas fa-home"></span>&nbsp;<span translate>Home page</span></a></li>
- <li><a class="navbar-link" href="{{docsURL()}}" target="_blank"><span class="fas fa-book"></span>&nbsp;<span translate>Documentation</span></a></li>
- <li><a class="navbar-link" href="https://forum.syncthing.net" target="_blank"><span class="fas fa-question-circle"></span>&nbsp;<span translate>Support</span></a></li>
- <li><a class="navbar-link" href="https://data.syncthing.net/" target="_blank"><span class="fas fa-bar-chart"></span>&nbsp;<span translate>Statistics</span></a></li>
- <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/releases" target="_blank"><span class="far fa-file-alt"></span>&nbsp;<span translate>Changelog</span></a></li>
- <li><a class="navbar-link" href="https://github.com/syncthing/syncthing/issues" target="_blank"><span class="fas fa-bug"></span>&nbsp;<span translate>Bugs</span></a></li>
- <li><a class="navbar-link" href="https://github.com/syncthing/syncthing" target="_blank"><span class="fas fa-wrench"></span>&nbsp;<span translate>Source Code</span></a></li>
- </ul>
- </div>
- </nav>
-
<ng-include src="'syncthing/core/networkErrorDialogView.html'"></ng-include>
<ng-include src="'syncthing/core/httpErrorDialogView.html'"></ng-include>
<ng-include src="'syncthing/core/restartingDialogView.html'"></ng-include>