From 4db6c5c717730c798506f862d64d31d7c86729a3 Mon Sep 17 00:00:00 2001
From: Jay Alvarez <jaya@aptivate.org>
Date: Mon, 13 Jul 2015 13:05:18 +0100
Subject: [PATCH] various small interface changes
-- changing icon on basic-text-widget
-- adding active state bg-color to sidebar
---
.../dashboard/templates/dashboard/basic-text-widget.html | 2 +-
django/website/media/css/styles.css | 5 ++++-
django/website/media/less/internews.less | 2 +-
django/website/media/less/navigation.less | 4 ++++
django/website/templates/base_side.html | 6 +++---
5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/django/website/dashboard/templates/dashboard/basic-text-widget.html b/django/website/dashboard/templates/dashboard/basic-text-widget.html
index 09b9c281..4deb28b1 100644
--- a/django/website/dashboard/templates/dashboard/basic-text-widget.html
+++ b/django/website/dashboard/templates/dashboard/basic-text-widget.html
@@ -1,6 +1,6 @@
<div class='panel panel-default'>
<div class='panel-heading'>
- <i class='fa fa-bar-chart-o fa-fw'></i>
+ <i class='fa fa-align-justify fa-fw'></i>
{{ title }}
</div>
<div class='panel-body'>
diff --git a/django/website/media/css/styles.css b/django/website/media/css/styles.css
index f30eb667..9f021980 100644
--- a/django/website/media/css/styles.css
+++ b/django/website/media/css/styles.css
@@ -6594,7 +6594,7 @@ body {
padding: 15px;
}
.sidebar ul li a.active {
- background-color: #ffffff;
+ background-color: #edecec;
}
.sidebar .arrow {
float: right;
@@ -7028,6 +7028,9 @@ th.delete > label {
background-color: rgba(0, 0, 0, 0.05);
padding: 14px 18px;
}
+#side-menu {
+ padding-top: 14.5px;
+}
.clearfix:before,
.clearfix:after,
.dl-horizontal dd:before,
diff --git a/django/website/media/less/internews.less b/django/website/media/less/internews.less
index 705f8273..910df0ba 100644
--- a/django/website/media/less/internews.less
+++ b/django/website/media/less/internews.less
@@ -157,7 +157,7 @@ body {
.sidebar ul li {
a {
&.active {
- background-color: @gray-lightest;
+ background-color: @gray-lighter;
}
}
}
diff --git a/django/website/media/less/navigation.less b/django/website/media/less/navigation.less
index c8c07bf7..7648071f 100644
--- a/django/website/media/less/navigation.less
+++ b/django/website/media/less/navigation.less
@@ -9,3 +9,7 @@
background-color:rgba(0,0,0,0.05);
padding:14px 18px;
}
+
+#side-menu {
+ padding-top:@navbar-padding-vertical;
+}
diff --git a/django/website/templates/base_side.html b/django/website/templates/base_side.html
index 89d7fcc4..9dfe6f0a 100644
--- a/django/website/templates/base_side.html
+++ b/django/website/templates/base_side.html
@@ -8,14 +8,14 @@
</div>
<nav class="sidebar-nav navbar-collapse">
<ul class="nav" id="side-menu">
- <li><a href="{% url "dashboard" %}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
+ <li><a class="active" href="{% url "dashboard" %}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a></li>
<li><a href="{% url "sources" %}"><i class="fa fa-download fa-fw"></i> Sources</a></li>
<li><a href="{% url "data-view" %}"><i class="fa fa-pencil fa-fw"></i> View & Edit</a></li>
</ul>
</nav>
<div class="site-info">
- <p>An <a href="http://www.internews.org" title="Internews website">Internews project</a><br />
- Site by<a href="http://www.aptivate.org" title="Aptivate website"> Aptivate</a></p>
+ <p>A project of <a href="http://www.internews.org" title="Internews website">Internews</a><br />
+ Developed by<a href="http://www.aptivate.org" title="Aptivate website"> Aptivate</a></p>
</div>
<!-- /.sidebar-collapse -->
</div>
--
GitLab