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

Hiding elements for beta #298

Merged
merged 2 commits into from
Jul 1, 2016
Merged

Hiding elements for beta #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d66080b
Hiding elements for beta
Jun 30, 2016
f42d192
Merge branch 'master' into bug/beta-hidelist
wonderchook Jun 30, 2016
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
29 changes: 20 additions & 9 deletions cadasta/core/static/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cadasta/core/static/css/main.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions cadasta/core/static/css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ header {
}
.dropdown-menu {
min-width: 224px;
min-width: 160px; // beta
}
.caret {
margin-left: 14px;
Expand All @@ -285,6 +286,7 @@ header {
.btn-user { // user profile links
border-radius: 0;
min-width: 224px;
min-width: 160px; // beta
height: $header-height;
border: none;
font-size: 13px;
Expand All @@ -302,6 +304,7 @@ header {
margin-bottom: 0;
margin-right: 14px;
background-color: transparent;
display: none; // beta
}
}
.open .btn-user { // menu is open
Expand Down Expand Up @@ -728,6 +731,7 @@ header {
.btn {
min-width: 120px;
margin-right: 20px;
margin-bottom: 10px;
&:last-child {
margin-right: 0;
}
Expand Down
4 changes: 4 additions & 0 deletions cadasta/core/static/css/single.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
z-index: 990;
padding: 0;
overflow: hidden;
overflow-y: auto;
background-color: $brand-darkblue;
color: $brand-lightblue;
text-align: center;
Expand Down Expand Up @@ -78,16 +79,19 @@
}
}
li.reports {
display: none; //beta
.icon {
background-image: url('/static/img/icon-reports.png');
}
}
li.activity {
display: none; // beta
.icon {
background-image: url('/static/img/icon-activity.png');
}
}
li.projects {
display: none; // beta
.icon {
background-image: url('/static/img/icon-projects.png');
}
Expand Down
58 changes: 0 additions & 58 deletions cadasta/core/static/css/subnav.scss
View file
Open in desktop

This file was deleted.

15 changes: 8 additions & 7 deletions cadasta/templates/organization/project_wrapper.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,16 @@ <h1>
<a class="btn btn-primary" href="{% url 'locations:add' object.organization.slug object.slug %}">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Add location" %}
</a>
<!-- <button type="button" class="btn btn-primary">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {% trans "Add location" %}
</button> -->
<button type="button" class="btn btn-primary btn-rt dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
<span class="sr-only">Toggle Add</span>
</button>
<ul class="dropdown-menu">
<li><a href="#">{% trans "Add party" %}</a></li>
<li><a href="#">{% trans "Add relationship" %}</a></li>
<li><a href="{% url 'resources:project_add_existing' object.organization.slug object.slug %}">{% trans "Add resource" %}</a></li>
<li role="separator" class="divider"></li>
<li><a class="edit" href="#">{% trans "Import data" %}</a></li>
<!--<li role="separator" class="divider"></li>
<li><a class="edit" href="#">{% trans "Import data" %}</a></li>-->
</ul>
</div>
<!-- Single add button for smaller screens-->
Expand All @@ -66,9 +65,11 @@ <h1>
</a>
<ul class="dropdown-menu" aria-labelledby="dLabel">
<li><a href="{% url 'locations:add' object.organization.slug object.slug %}">{% trans "Add location" %}</a></li>
<li><a href="#">{% trans "Add party" %}</a></li>
<li><a href="#">{% trans "Add relationship" %}</a></li>
<li><a href="{% url 'resources:project_add_existing' object.organization.slug object.slug %}">{% trans "Add resource" %}</a></li>
<li role="separator" class="divider"></li>
<li><a class="edit" href="#">{% trans "Import data" %}</a></li>
<!--<li role="separator" class="divider"></li>
<li><a class="edit" href="#">{% trans "Import data" %}</a></li>-->
</ul>
</div>
</div>
Expand Down