Skip to content

Commit

Permalink
fix(general): Minor stylstic changes
Browse files Browse the repository at this point in the history
- Index gets extra padding to set it further away from the footer
- Ribbon building wording slightly altered
- Enhanced secondary navigation identation based on user feedback (more
idented, though font-size step down remains unchanged)
- Cleaned up home.tpl.html
- Removed unused attributions.tpl.html
  • Loading branch information
atruskie committed Dec 1, 2016
1 parent df23dc9 commit 077ce43
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 97 deletions.
63 changes: 0 additions & 63 deletions src/app/attributions.tpl.html

This file was deleted.

37 changes: 6 additions & 31 deletions src/app/home/home.tpl.html
Original file line number Diff line number Diff line change
@@ -1,36 +1,11 @@
<div id="content" style="position:relative;">
<p>
Welcome to a place where you can listen, learn, share your discoveries and help out the environment!
The Bioacoustic Workbench is a repository for audio recordings of the environment and tools that aid in
analysing the sounds.
We gather recordings from a wide range of environments, find practical ways to annotate
the sounds with information about what's going on in them, and then enable that
information to be put to use by ecologists and other parties interested in conservation.
</p>

<p ng-show="loggedIn">
Welcome back to the Bioacoustic Workbench, <span>{{$root.userData.userName}}</span>! We're glad you're
here.
</p>
<div id="content">
<h1>Client application home page</h1>

<p ng-hide="loggedIn" ng-controller="LoginCtrl">
Time to get started! You can <a href ng-click="login()">sign in</a> using an account you already have!
<p class="alert alert-warning" role="alert">
<strong>This page is currently unused.</strong>
If you have been sent here it was likely by mistake.
Please <a baw-href="api.links.contactUs">report this bug</a> to us.
</p>
<!--<a ng-click="populateProjectMarkers()">Show all Projects</a>
<div ui-map-info-window="myInfoWindow">
<h3>{{currentMarkerTitle}}</h3>
<p>Location: {{currentMarkerLat}}, {{currentMarkerLng}}</p>
<p><a ng-href="/projects/{{currentMarkerId}}">Go to Project</a></p>
</div>
<!-- this is the confusing part. we have to point the map marker directive at an existing google.maps.Marker object, so it can hook up events
<div ng-repeat="marker in myMarkers" baw-map-marker="myMarkers[$index]"
ui-event="{'map-click': 'openMarkerInfo(marker)', 'map-once-idle': 'loadProjects()'}"></div>
<div id="map_canvas" baw-map="projectMap" style="height: 500px; width: 100%;" ui-options="mapOptions"></div>-->




Expand Down
4 changes: 2 additions & 2 deletions src/app/navigation/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ right-nav-bar {
left-nav-bar {
@for $i from 0 through 4 {
.indentation-#{$i} {
$step: ($i * 5%);
$step: ($i * 10%);
width: 100% - $step;
margin-left: $step !important;
font-size: 100% - $step;
font-size: 100% - ($step / 2);
}
}
}
2 changes: 1 addition & 1 deletion src/app/uiHints/ribbon.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ angular
case "building":
this.class = "building";
this.text = "\xa0";
this.tooltip = "This feature is still being built and is not available";
this.tooltip = "This feature is still being built and is not yet available";
break;
default:
this.class = this.type;
Expand Down
3 changes: 3 additions & 0 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@



</div>
<div class=".row">
&nbsp;<!-- padding -->
</div>
</div>

Expand Down

0 comments on commit 077ce43

Please sign in to comment.