diff --git a/django/website/media/css/styles.css b/django/website/media/css/styles.css
index c68d5f9f456bf89e3e9d8675bb2c6efb65ed9ad1..391772749eabb14004e237f50c5e6b60900b42e3 100644
--- a/django/website/media/css/styles.css
+++ b/django/website/media/css/styles.css
@@ -1078,7 +1078,7 @@ html {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
body {
- font-family: "Source Sans Pro", Calibri, Candara, Arial, sans-serif;
+ font-family: "Helvetica Neue", Arial, Helvetica, sans, sans-serif;
font-size: 15px;
line-height: 1.42857143;
color: #282625;
@@ -1180,7 +1180,7 @@ h6,
.h4,
.h5,
.h6 {
- font-family: "Source Sans Pro", Calibri, Candara, Arial, sans-serif;
+ font-family: "Helvetica Neue", Arial, Helvetica, sans, sans-serif;
font-weight: 300;
line-height: 1.1;
color: inherit;
@@ -4509,7 +4509,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
background-color: transparent;
}
.navbar-inverse .navbar-toggle {
- border-color: transparent;
+ border-color: #0b5087;
}
.navbar-inverse .navbar-toggle:hover,
.navbar-inverse .navbar-toggle:focus {
@@ -5817,7 +5817,7 @@ button.close {
position: absolute;
z-index: 1070;
display: block;
- font-family: "Source Sans Pro", Calibri, Candara, Arial, sans-serif;
+ font-family: "Helvetica Neue", Arial, Helvetica, sans, sans-serif;
font-size: 13px;
font-weight: normal;
line-height: 1.4;
@@ -5924,7 +5924,7 @@ button.close {
display: none;
max-width: 276px;
padding: 1px;
- font-family: "Source Sans Pro", Calibri, Candara, Arial, sans-serif;
+ font-family: "Helvetica Neue", Arial, Helvetica, sans, sans-serif;
font-size: 15px;
font-weight: normal;
line-height: 1.42857143;
@@ -6472,19 +6472,11 @@ button.close {
}
body {
background-color: #ffffff;
+ min-width: 480px;
}
#wrapper {
width: 100%;
}
-#page-wrapper {
- padding: 30px 15px;
- min-height: 1000px;
- background-color: #edecec;
- -webkit-box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
- -moz-box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
- -o-box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
- box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
-}
.page-header {
margin-top: 0;
}
@@ -6493,6 +6485,12 @@ body {
position: inherit;
margin: 0 0 0 250px;
padding: 30px;
+ min-height: 1000px;
+ background-color: #edecec;
+ -webkit-box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
+ -moz-box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
+ -o-box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
+ box-shadow: inset 0px 0px 10px rgba(51, 51, 51, 0.38);
}
}
.navbar-brand {
@@ -6501,34 +6499,25 @@ body {
.subtitle {
display: block;
float: right;
- width: 15em;
+ width: 150px;
}
.subtitle {
font-size: 12px;
line-height: 1em;
padding-left: 1em;
}
-.site-info {
- bottom: 0;
- width: 250px;
- position: fixed;
-}
-.site-info {
- color: #78716e;
- font-size: 13px;
- text-align: center;
- padding: 10px;
- background-color: #edecec;
-}
-.site-info a {
- color: #78716e;
-}
.navbar-static-top {
- position: fixed;
+ position: absolute;
width: 100%;
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
border: none;
+ top: 0;
+}
+@media (min-width: 768px) {
+ .navbar-static-top {
+ position: fixed;
+ }
}
.navbar-top-links {
margin-right: 0;
@@ -6536,8 +6525,10 @@ body {
.navbar-top-links li {
display: inline-block;
}
-.navbar-top-links li:last-child {
- margin-right: 15px;
+@media (min-width: 768px) {
+ .navbar-top-links li:last-child {
+ margin-right: 15px;
+ }
}
.navbar-top-links li a {
padding: 15px;
@@ -6628,10 +6619,46 @@ body {
margin-left: auto;
}
}
+@media (max-width: 480px) {
+ .featured-image > img {
+ width: 100%;
+ }
+}
.nav.nav-tabs.navbar-right {
padding-top: 43px;
margin-right: 10px;
}
+.project-info {
+ position: fixed;
+ bottom: 30px;
+ text-align: center;
+ width: 250px;
+ font-size: 12.5px;
+ margin: 0;
+}
+.project-info > a {
+ width: 120px;
+ display: inline-block;
+}
+.project-info > a > img {
+ width: 100%;
+}
+.site-info {
+ border-top: 1px solid #f5f5f5;
+}
+.site-info {
+ font-size: 12.5px;
+ color: #78716e;
+ margin: 0;
+ text-align: right;
+ padding: 15px 15px 0 15px;
+}
+.site-info p {
+ margin: 0;
+}
+.site-info a {
+ color: #78716e;
+}
.btn-outline {
color: inherit;
background-color: transparent;
@@ -6662,6 +6689,22 @@ body {
.btn-primary > .fa {
color: #ffffff;
}
+.footer {
+ bottom: 0;
+ width: 100%;
+ position: fixed;
+ height: 100px;
+}
+.footer {
+ color: #78716e;
+ font-size: 13px;
+ text-align: center;
+ padding: 10px;
+ background-color: #edecec;
+}
+.footer a {
+ color: #78716e;
+}
.login-panel {
margin-top: 25%;
}
diff --git a/django/website/media/images/rsz_a-project-of-internews.png b/django/website/media/images/rsz_a-project-of-internews.png
new file mode 100644
index 0000000000000000000000000000000000000000..5208d284d03f59687692af9a164d2fed9a4be5dc
Binary files /dev/null and b/django/website/media/images/rsz_a-project-of-internews.png differ
diff --git a/django/website/media/less/internews-variables.less b/django/website/media/less/internews-variables.less
index 601b1d10fd11c6748a2907667e4e60de551a6ff4..a5856166a43b98be69394671291378b24f1945fb 100644
--- a/django/website/media/less/internews-variables.less
+++ b/django/website/media/less/internews-variables.less
@@ -45,7 +45,7 @@
//
//## Font, line-height, and color for body text, headings, and more.
-@font-family-sans-serif: "Source Sans Pro", Calibri, Candara, Arial, sans-serif;
+@font-family-sans-serif: "Helvetica Neue", Arial, Helvetica, sans, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@@ -413,7 +413,7 @@
// Inverted navbar toggle
@navbar-inverse-toggle-hover-bg: @navbar-inverse-link-hover-bg;
@navbar-inverse-toggle-icon-bar-bg: #fff;
-@navbar-inverse-toggle-border-color: transparent;
+@navbar-inverse-toggle-border-color: darken(@brand-primary, 10%);
//== Navs
diff --git a/django/website/media/less/internews.less b/django/website/media/less/internews.less
index 082f354c5240e7b24da9b1626f1e4c4a0f9efa3c..c27cff736313c18fb9389191fd1aaab8e4188a2c 100644
--- a/django/website/media/less/internews.less
+++ b/django/website/media/less/internews.less
@@ -2,20 +2,16 @@
body {
background-color: @gray-lightest;
+ min-width:480px;
}
+
// Wrappers
#wrapper {
width: 100%;
}
-#page-wrapper {
- padding: 30px 15px;
- min-height: 1000px;
- background-color: @gray-lighter;
- .box-shadow-inset(inset, 0px, 0px);
-}
.page-header {
margin-top:0;
@@ -26,6 +22,9 @@ body {
position: inherit;
margin: 0 0 0 250px;
padding: 30px;
+ min-height: 1000px;
+ background-color: @gray-lighter;
+ .box-shadow-inset(inset, 0px, 0px);
}
}
@@ -38,7 +37,7 @@ body {
.subtitle {
display: block;
float: right;
- width: 15em;
+ width: 150px;
}
.subtitle {
@@ -47,31 +46,20 @@ body {
padding-left: 1em;
}
-.site-info {
- bottom: 0;
- width:250px;
- position: fixed;
-
-}
-
-.site-info {
- color: #78716e;
- font-size: 13px;
- text-align: center;
- padding:@padding-base-vertical;
- background-color:@gray-lighter;
- a {
- color:@gray;
- }
-}
-
// Navigation
.navbar-static-top {
- position:fixed;
+ position:absolute;
width:100%;
.box-shadow(0 1px 4px rgba(0, 0, 0, 0.3));
border:none;
+ top:0;
+}
+
+@media(min-width:768px) {
+ .navbar-static-top {
+ position:fixed;
+ }
}
@@ -83,10 +71,11 @@ body {
display: inline-block;
}
-.navbar-top-links li:last-child {
- margin-right: 15px;
+@media(min-width:768px){
+ .navbar-top-links li:last-child {
+ margin-right: 15px;
+ }
}
-
.navbar-top-links li a {
padding: 15px;
min-height: 50px;
@@ -201,6 +190,12 @@ body {
}
}
+@media(max-width:480px) {
+ .featured-image > img {
+ width:100%;
+ }
+ }
+
// --Nav Tabs next to page header
.nav.nav-tabs.navbar-right {
@@ -208,6 +203,47 @@ body {
margin-right:@padding-small-horizontal;
}
+//Project info
+
+.project-info {
+ position: fixed;
+ bottom: 30px;
+ text-align: center;
+ width: 250px;
+ font-size:12.5px;
+ margin:0;
+}
+
+.project-info > a {
+ width:120px;
+ display:inline-block;
+}
+.project-info > a > img {
+ width:100%;
+}
+
+//Site info
+
+.site-info {
+ border-top:1px solid #f5f5f5;
+
+}
+
+.site-info {
+ font-size:12.5px;
+ color:@gray;
+ margin:0;
+ text-align:right;
+ padding:15px 15px 0 15px;
+ & p{
+ margin:0;
+ }
+ & a{
+ color:@gray;
+ }
+}
+
+
// Buttons
.btn-outline {
@@ -248,6 +284,27 @@ body {
color:@body-bg;
}
+//footer
+
+.footer {
+ bottom: 0;
+ width:100%;
+ position: fixed;
+ height:100px;
+
+}
+
+.footer {
+ color: #78716e;
+ font-size: 13px;
+ text-align: center;
+ padding:@padding-base-vertical;
+ background-color:@gray-lighter;
+ a {
+ color:@gray;
+ }
+}
+
// Login Page
@@ -409,6 +466,4 @@ body {
.fa-fw {
color:@gray-base;
margin-right:5px;
-}
-
-
+}
\ No newline at end of file
diff --git a/django/website/templates/base_side.html b/django/website/templates/base_side.html
index 1eb36a2990eccf285897e0ad4084665a4fc6e85e..010618bd382687e630f39d970804b326678d631d 100644
--- a/django/website/templates/base_side.html
+++ b/django/website/templates/base_side.html
@@ -6,31 +6,30 @@
<div class="featured-image">
<img class="img-responsive" src="{{ STATIC_URL }}images/rsz_west-african-girl.jpg" alt="West African girl" />
</div>
- <nav class="sidebar-nav navbar-collapse">
+ <nav class="sidebar-nav navbar-collapse collapse">
<ul class="nav" id="side-menu">
<li><a class="active" href="{% url "dashboard" %}"><span class="fa fa-dashboard fa-fw"></span> Dashboard</a></li>
<li><a href="{% url "sources" %}"><span class="fa fa-download fa-fw"></span> Sources</a></li>
<li><a href="{% url "data-view" %}"><span class="fa fa-pencil fa-fw"></span> View & Edit</a></li>
</ul>
</nav>
- <div class="site-info">
- <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>
<!-- /.sidebar -->
<nav class="navbar navbar-inverse navbar-static-top" role="navigation" style="margin-bottom: 0">
<div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
- <span class="sr-only">Toggle navigation</span>
- </button>
- <a class="navbar-brand pull-left" href="/">{% trans "HID " %}<span class="subtitle">{% trans "Humanitarian Information Dashboard" %}</span></a>
- </div>
+ <button title="show/hide menu" data-target=".navbar-collapse" data-toggle="collapse" class="navbar-toggle" type="button">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand pull-left" href="/">{% trans "HID " %}<span class="subtitle">{% trans "Humanitarian Information Dashboard" %}</span></a>
+ </div>
<!-- /.navbar-header -->
{% if request.user.is_authenticated %}
<ul class="nav navbar-top-links navbar-right">
- <li class="dropdown">
+ <li class="dropdown pull-right">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<span class="fa fa-user fa-fw"></span> {{ request.user }} <span class="fa fa-caret-down"> </span>
</a>
@@ -68,9 +67,18 @@
</div>
{% block maincontent %}
{% endblock maincontent %}
+ <div class="row site-info">
+ <div class="col-lg-12">
+ <p>developed by<a href="http://www.aptivate.org" title="Aptivate website"> Aptivate</a></p>
+ </div>
+ </div>
</div>
</div>
</div>
+
+ <div class="project-info">
+ <a href="http://www.internews.org" title="a project of Internews"><img src="{{ STATIC_URL }}images/rsz_a-project-of-internews.png" alt="a project of Internews"></a>
+ </div>
<!-- /Main Content -->
{% endblock content %}