diff --git a/.DS_Store b/.DS_Store index cfe7dca..b347e53 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 63e00e3..dfdc902 100644 --- a/.gitignore +++ b/.gitignore @@ -216,4 +216,5 @@ ModelManifest.xml /src/GlobalPollenProject.WebUI/wwwroot/lib /src/GlobalPollenProject.WebUI/Properties/PublishProfiles /src/GlobalPollenProject.WebUI/wwwroot/testdata -/src/GlobalPollenProject.WebUI/wwwroot/css \ No newline at end of file +/src/GlobalPollenProject.WebUI/wwwroot/css +.DS_Store \ No newline at end of file diff --git a/src/GlobalPollenProject.WebUI/.DS_Store b/src/GlobalPollenProject.WebUI/.DS_Store index a491c13..1b64fe4 100644 Binary files a/src/GlobalPollenProject.WebUI/.DS_Store and b/src/GlobalPollenProject.WebUI/.DS_Store differ diff --git a/src/GlobalPollenProject.WebUI/Services/Concrete/ReferenceService.cs b/src/GlobalPollenProject.WebUI/Services/Concrete/ReferenceService.cs index 560d0cc..1cece54 100644 --- a/src/GlobalPollenProject.WebUI/Services/Concrete/ReferenceService.cs +++ b/src/GlobalPollenProject.WebUI/Services/Concrete/ReferenceService.cs @@ -95,6 +95,7 @@ private string FirstCharToLower(string input) public List ListCollections() { + return _uow.RefCollectionRepository.GetAll().ToList(); } } diff --git a/src/GlobalPollenProject.WebUI/Styles/Components/_TaxonGrid.scss b/src/GlobalPollenProject.WebUI/Styles/Components/_TaxonGrid.scss index 0a4fc5c..bf13319 100644 --- a/src/GlobalPollenProject.WebUI/Styles/Components/_TaxonGrid.scss +++ b/src/GlobalPollenProject.WebUI/Styles/Components/_TaxonGrid.scss @@ -11,6 +11,7 @@ .taxon-toggle { display: inline-block; + float:right; width: 4em; height: 6em; vertical-align: top; diff --git a/src/GlobalPollenProject.WebUI/project.json b/src/GlobalPollenProject.WebUI/project.json index 5713743..e9c06ff 100644 --- a/src/GlobalPollenProject.WebUI/project.json +++ b/src/GlobalPollenProject.WebUI/project.json @@ -1,46 +1,46 @@ { - "version": "1.1.0-*", + "version": "1.0.0-*", "description": "Global Pollen Project reference library", "authors": [ "AndrewIOM" ], "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0", + "version": "1.0.0", "type": "platform" }, - "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0", - "Microsoft.AspNetCore.Authentication.Facebook": "1.1.0", - "Microsoft.AspNetCore.Authentication.Google": "1.1.0", - "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.1.0", - "Microsoft.AspNetCore.Authentication.Twitter": "1.1.0", - "Microsoft.AspNetCore.Cors": "1.1.0", - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Identity": "1.1.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0", - "Microsoft.AspNetCore.Mvc": "1.1.0", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.EntityFrameworkCore": "1.1.0", - "Microsoft.EntityFrameworkCore.Sqlite": "1.1.0", + "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", + "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0", + "Microsoft.AspNetCore.Authentication.Google": "1.0.0", + "Microsoft.AspNetCore.Authentication.MicrosoftAccount": "1.0.0", + "Microsoft.AspNetCore.Authentication.Twitter": "1.0.0", + "Microsoft.AspNetCore.Cors": "1.0.0", + "Microsoft.AspNetCore.Diagnostics": "1.0.0", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", + "Microsoft.AspNetCore.Identity": "1.0.0", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", + "Microsoft.AspNetCore.Mvc": "1.0.0", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0", + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.StaticFiles": "1.0.0", + "Microsoft.EntityFrameworkCore": "1.0.0", + "Microsoft.EntityFrameworkCore.Sqlite": "1.0.0", "Microsoft.EntityFrameworkCore.Tools": { "version": "1.0.0-preview2-final", "type": "build" }, - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Microsoft.Extensions.Caching.Abstractions": "1.1.0", - "Microsoft.Extensions.Caching.Memory": "1.1.0", - "Microsoft.Extensions.Configuration.Abstractions": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.Extensions.PlatformAbstractions": "1.1.0", + "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0", + "Microsoft.Extensions.Caching.Abstractions": "1.0.0", + "Microsoft.Extensions.Caching.Memory": "1.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "1.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", + "Microsoft.Extensions.Configuration.Json": "1.0.0", + "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", + "Microsoft.Extensions.Logging": "1.0.0", + "Microsoft.Extensions.Logging.Console": "1.0.0", + "Microsoft.Extensions.Logging.Debug": "1.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0", + "Microsoft.Extensions.PlatformAbstractions": "1.0.0", "SendGrid.NetCore": "1.0.0-rtm-00002", "WindowsAzure.Storage":"7.2.0", "ImageProcessorCore": "1.0.0-alpha1047" diff --git a/src/GlobalPollenProject.WebUI/wwwroot/css/main.css b/src/GlobalPollenProject.WebUI/wwwroot/css/main.css index c47e9e9..631036c 100644 --- a/src/GlobalPollenProject.WebUI/wwwroot/css/main.css +++ b/src/GlobalPollenProject.WebUI/wwwroot/css/main.css @@ -1,9 +1,9 @@ /* Global Pollen Project Styles - Copyright Andrew Martin, University of Oxford 2015 + Andrew Martin, University of Oxford 2015 */ /* Global Pollen Project: Colour Palette */ -/* Bootstrap Customisations for the GPP */ +/* Bootstrap Customisations for GPP */ body { padding-top: 70px; line-height: 1.8em; } @@ -255,7 +255,6 @@ h1 { .img-thumbnail { list-style: none; - margin-bottom: 4em !important; display: inline; } div.img-thumbnail img { @@ -730,8 +729,8 @@ footer ul { border-color: #dddddd; } .taxon-toggle { - float: right; display: inline-block; + float: right; width: 4em; height: 6em; vertical-align: top;