Skip to content

Bulk Uploader Styling #1803

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

Merged
ctaylo37 merged 3 commits into from
Nov 19, 2014
Merged

Bulk Uploader Styling #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0508b4b
Bulk Uploader Styling
Nov 19, 2014
2fbe6f4
Made pagination styling global
Nov 19, 2014
4017c80
Removed pagination styling from moderation.css
Nov 19, 2014
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
2 changes: 1 addition & 1 deletion opentreemap/importer/templates/importer/partials/import_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<table class="table table-striped">
<table class="table table-hover">
<thead>
<tr>
<th>Import Event</th>
Expand Down
5 changes: 3 additions & 2 deletions opentreemap/importer/templates/importer/partials/row_status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load i18n %}

{% block main %}
<ul class="nav nav-pills">
<ul class="nav nav-tabs">
{% for panel in panels %}
<li{% if panel.name == active_panel_name %} class="active"{% endif %}>
<a href="#import-panel-{{ panel.name }}" data-toggle="tab">
Expand All @@ -23,7 +23,8 @@
{% endblock main %}

{% block extra_buttons %}
<a data-action="commit" class="btn btn-success btn-large" href="{{ commit_url }}">
<a data-action="commit" class="btn btn-info btn-large" href="{{ commit_url }}">
<i class="icon-plus-circled"></i>
{% trans "Add to Tree Map" %}
</a>
{% endblock extra_buttons %}
3 changes: 2 additions & 1 deletion opentreemap/importer/templates/importer/partials/status.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ <h2>{% trans "Import Status" %}</h2>
{% block extra_buttons %}
{% endblock extra_buttons %}

<a class="btn btn-success btn-large" data-action="back"
<a class="btn btn-info btn-large pull-left" data-action="back"
href="{% url 'importer:list_imports' instance_url_name=request.instance.url_name %}">
<i class="icon-left-open"></i>
{% trans "Back to Uploads" %}
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions opentreemap/importer/templates/importer/partials/status_table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load i18n %}

<div style="overflow-x: scroll;">
<table class="table table-striped">
<div class="tab-contents">
<table class="table table-hover">
<thead>
<tr>
{% for name in panel.field_names %}
Expand Down
71 changes: 71 additions & 0 deletions opentreemap/treemap/css/sass/partials/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,77 @@ body {
z-index: 10;
position: relative;
}

.pagination {
display: inline-block;
padding-left: 0;

> li {
display: inline; // Remove list-style and block-level defaults
> a,
> span {
position: relative;
float: left;
padding: 6px 12px;
line-height: 1.42857143;
text-decoration: none;
color: #8aaa3e;
background-color: #fff;
border: 1px solid #eeeeee;
margin-left: 2px;
border-radius: 24px;

}
&:first-child {
> a,
> span {
margin-left: 0;
}
}
&:last-child {
> a,
> span {
}
}
}

> li > a,
> li > span {
&:hover,
&:focus {
color: #fff;
background-color: #8aaa3e;
border-color: #8aaa3e;
}
}

> .active > a,
> .active > span {
&,
&:hover,
&:focus {
z-index: 2;
color: #fff;
background-color: #8aaa3e;
border-color: #8aaa3e;
cursor: default;
}
}

> .disabled {
> span,
> span:hover,
> span:focus,
> a,
> a:hover,
> a:focus {
color: #eeeeee;
background-color: #f7f7f7;
border-color: #f7f7f7;
cursor: not-allowed;
}
}
}
}

.alert {
Expand Down
13 changes: 12 additions & 1 deletion opentreemap/treemap/css/sass/partials/pages/_importer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

td.warning {
background-color: #fdef8d;
background-color: #fef4ad;
}

input {
Expand All @@ -27,4 +27,15 @@
.tab-pane {
min-height: auto;
}

.tab-contents{
overflow-x: scroll;
border-left: solid 1px #dddddd;
border-right: solid 1px #dddddd;
border-bottom: solid 1px #dddddd;
}

.btn-info{
margin-right: 12px;
}
}
71 changes: 0 additions & 71 deletions opentreemap/treemap/css/sass/partials/pages/_moderation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,75 +152,4 @@
}
}

.pagination {
display: inline-block;
padding-left: 0;

> li {
display: inline; // Remove list-style and block-level defaults
> a,
> span {
position: relative;
float: left;
padding: 6px 12px;
line-height: 1.42857143;
text-decoration: none;
color: #8aaa3e;
background-color: #fff;
border: 1px solid #eeeeee;
margin-left: 2px;
border-radius: 24px;

}
&:first-child {
> a,
> span {
margin-left: 0;
}
}
&:last-child {
> a,
> span {
}
}
}

> li > a,
> li > span {
&:hover,
&:focus {
color: #fff;
background-color: #8aaa3e;
border-color: #8aaa3e;
}
}

> .active > a,
> .active > span {
&,
&:hover,
&:focus {
z-index: 2;
color: #fff;
background-color: #8aaa3e;
border-color: #8aaa3e;
cursor: default;
}
}

> .disabled {
> span,
> span:hover,
> span:focus,
> a,
> a:hover,
> a:focus {
color: #eeeeee;
background-color: #f7f7f7;
border-color: #f7f7f7;
cursor: not-allowed;
}
}
}

}