diff --git a/django/website/media/css/styles.css b/django/website/media/css/styles.css index 1c1c9cd618d2d995d0a44c456ce354b37faa5388..f30eb66733386a45b7aaa8ff0e45af9b6ad1855b 100644 --- a/django/website/media/css/styles.css +++ b/django/website/media/css/styles.css @@ -6480,10 +6480,10 @@ body { padding: 30px 15px; min-height: 1000px; background-color: #edecec; - -webkit-box-shadow: inset 5px 0px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 5px 0px 10px rgba(0, 0, 0, 0.2); - -o-box-shadow: inset 5px 0px 10px rgba(0, 0, 0, 0.2); - box-shadow: inset 5px 0px 10px rgba(0, 0, 0, 0.2); + -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); } @media (min-width: 768px) { #page-wrapper { diff --git a/django/website/media/less/internews-mixins.less b/django/website/media/less/internews-mixins.less index c003ca73ec3a981f0432634beafe069530927f7c..15177fac210914d0cb0080bde2d7588cd0edda2b 100644 --- a/django/website/media/less/internews-mixins.less +++ b/django/website/media/less/internews-mixins.less @@ -6,9 +6,9 @@ box-shadow:@arguments; } -.box-shadow-inset(@position:inset, @horizontal:5, @vertical:0, @spread:10px, @color: rgba(0,0,0,0.2)) { +.box-shadow-inset(@position:inset, @horizontal:0, @vertical:0, @spread:10px, @color: rgba(51,51,51,0.38)) { -webkit-box-shadow:@arguments; -moz-box-shadow:@arguments; -o-box-shadow:@arguments; box-shadow:@arguments; -} +} \ No newline at end of file diff --git a/django/website/media/less/internews.less b/django/website/media/less/internews.less index f69850a666e7816e277129e5eb141e5baea90653..705f82730441fcc5de6d2c113e4a2dcf55379783 100644 --- a/django/website/media/less/internews.less +++ b/django/website/media/less/internews.less @@ -14,7 +14,7 @@ body { padding: 30px 15px; min-height: 1000px; background-color: @gray-lighter; - .box-shadow-inset(inset, 5px, 0px); + .box-shadow-inset(inset, 0px, 0px); } @media(min-width:768px) { diff --git a/django/website/templates/Copy of base_side.html b/django/website/templates/Copy of base_side.html new file mode 100644 index 0000000000000000000000000000000000000000..89d7fcc404f0ad8abd39a0604c12865b71469dac --- /dev/null +++ b/django/website/templates/Copy of base_side.html @@ -0,0 +1,67 @@ +{% extends "base.html" %} +{% load i18n %} +{% block content %} +<!-- Navigation --> + <div class="navbar-default sidebar" role="navigation"> + <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"> + <ul class="nav" id="side-menu"> + <li><a 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> + </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> + <!-- /.navbar-header --> + {% if request.user.is_authenticated %} + <ul class="nav navbar-top-links navbar-right"> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" href="#"> + <i class="fa fa-user fa-fw"></i> {{ request.user }} <i class="fa fa-caret-down"> </i> + </a> + <ul class="dropdown-menu dropdown-user"> + <li><a href="#"><i class="fa fa-gear fa-fw"></i> Settings</a></li> + <li><a href="{% url "logout" %}?next={% url 'login' %}" class=""><i class="fa fa-sign-out fa-fw"></i>{% trans "Log out" %}</a></li> + </ul> + <!-- /.dropdown-user --> + </li> + </ul> + {% endif %} + <!-- /.navbar-top-links --> + </nav> + <!-- /Navigation --> + <!-- Main Content --> + <div id="page-wrapper"> + <div class="row"> + <div class="col-lg-12"> + <div class="row messages-box"> + {% if messages %} + <ul class="list-unstyled"> + {% for message in messages %} + <li{% if message.tags %} class="alert {{ message.tags }} {% if message.tags == "error" %}bg-danger{% else %}bg-success{% endif %}"{% endif %}>{{ message }}</li> + {% endfor %} + </ul> + {% endif %} + </div> + {% block maincontent %} + {% endblock maincontent %} + </div> + </div> + </div> + <!-- /Main Content --> +{% endblock content %}