Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

slight changes to css styling in top nav #3216

Merged
merged 1 commit into from
Mar 10, 2015
Merged

slight changes to css styling in top nav #3216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions kalite/distributed/static/css/distributed/bootstrap-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,16 @@ input[type="submit"] {
-o-transition: all 80ms ease-out;
transition: all 80ms ease-out;
}
.top-nav li.active a:hover,
.top-nav li.active a,
.top-nav li a:hover,
.top-nav li a,
.top-nav li.active a,
.top-nav li a:active {
border-left: 2px solid #5AA685;
border-top: 2px solid #5AA685;
border-right: 2px solid #5AA685;
}
.navbar ul li.dropdown {
padding-right: 0;
}
Expand Down
1 change: 0 additions & 1 deletion kalite/distributed/static/css/distributed/khan-lite.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ a:hover {
-moz-transition: all 115ms ease-out;
-o-transition: all 115ms ease-out;
transition: all 115ms ease-out;

}
.teach-nav li div {
position: relative;
Expand Down
4 changes: 2 additions & 2 deletions kalite/distributed/templates/distributed/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
</div>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right nav-tabs ka-nav" role="tablist">
<ul class="nav navbar-nav navbar-right nav-tabs top-nav" role="tablist">
<div class="visible-xs">
<li id="search_input">
<form class="navbar-form " action="{% url 'search' %}" method="get" role="search">
Expand Down Expand Up @@ -197,7 +197,7 @@

<!-- For logged in admins -->
{% if request.is_admin and is_config_package_nalanda and not request.session.facility_user.facility %}
{# Teach for admins => assigning playlists #}
{# Teach for admins => assigning playlists for Nalanda #}
<li class="{% block teach_active_admins-nalanda %}{% endblock teach_active_admins-nalanda %}">
<a href="{% url 'assign_playlists' %}" id="nav_coachreports" class="admin-only">
{% trans "Teach" %}
Expand Down