-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into experimental-cs-ui
- Loading branch information
Showing
21 changed files
with
187 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,26 @@ | ||
| left-nav-bar, right-nav-bar { | ||
| ul.nav-pills > li { | ||
| & > a, & > button { | ||
| padding: 5px 10px; | ||
| padding: 5px (1em/4); // approximately 1 standard space's width | ||
| text-align: left; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| right-nav-bar { | ||
| a>.fa, a>.glyphicon { | ||
| a .fa, a>.glyphicon { | ||
| color: $text-color; | ||
| } | ||
| } | ||
|
|
||
| left-nav-bar { | ||
| .tooltip-wide { | ||
| width: 200px; | ||
| } | ||
|
|
||
| @for $i from 0 through 4 { | ||
| .indentation-#{$i} { | ||
| $step: ($i * 10%); | ||
| width: 100% - $step; | ||
| margin-left: $step !important; | ||
| font-size: 100% - ($step / 2); | ||
| width: calc(100% - #{1em * $i}); | ||
| margin-left: (1em * $i) !important; | ||
| font-size: 100% - ($i * 3%); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # WARNING: MONKEYPATCH FROM HELL | ||
|
|
||
| *ULTRA DODGY* | ||
|
|
||
| See https://github.com/QutBioacoustics/baw-client/issues/292 |
40 changes: 40 additions & 0 deletions
40
src/components/directives/angular-tags/angular-tags-0.3.1-tpls.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /** | ||
| * Overriding the standard template because of this bug: | ||
| * https://github.com/QutBioacoustics/baw-client/issues/292 | ||
| */ | ||
| angular | ||
| .module("angular-tags.templates.monkeypatch", []) | ||
| .run(["$templateCache", function ($templateCache) { | ||
| $templateCache.put("templates/tags.html", ` | ||
| <div class="decipher-tags" data-ng-mousedown="selectArea()"> | ||
| <div class="decipher-tags-taglist"> | ||
| <span data-ng-repeat="tag in tags|orderBy:orderBy" | ||
| data-ng-mousedown="$event.stopPropagation()"> | ||
| <span class="decipher-tags-tag" data-ng-class="getClasses(tag)">{{tag.name}} | ||
| <i class="icon-remove" data-ng-click="remove(tag)"></i> | ||
| </span> | ||
| </span> | ||
| </div> | ||
| <span class="container-fluid" data-ng-show="toggles.inputActive"> | ||
| <input ng-if="!srcTags.length" type="text" data-ng-model="inputTag" | ||
| class="decipher-tags-input"/> | ||
| <!-- may want to fiddle with limitTo here, but it was inhibiting my results | ||
| so perhaps there is another way --> | ||
| <!-- THIS MONKEYPATCH WORKS! --> | ||
| <input ng-if="srcTags.length" type="text" data-ng-model="inputTag" | ||
| class="decipher-tags-input" | ||
| uib-typeahead="stag as stag.name for stag in srcTags|filter:$viewValue|orderBy:orderBy" | ||
| data-typeahead-input-formatter="typeaheadOptions.inputFormatter" | ||
| data-typeahead-loading="typeaheadOptions.loading" | ||
| data-typeahead-min-length="typeaheadOptions.minLength" | ||
| data-typeahead-template-url="{{typeaheadOptions.templateUrl}}" | ||
| data-typeahead-wait-ms="typeaheadOptions.waitMs" | ||
| data-typeahead-editable="typeaheadOptions.allowsEditable" | ||
| data-typeahead-on-select="add($item) && selectArea() && typeaheadOptions.onSelect()"/> | ||
| </span> | ||
| </div> | ||
| `); | ||
| }]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.