From 20b84fdc48ef88558f4fab4937d22451b3afa160 Mon Sep 17 00:00:00 2001 From: Andrew Martin Date: Thu, 26 Jan 2017 17:42:49 +0000 Subject: [PATCH] Final pre-1.0 hotfix --- .DS_Store | Bin 6148 -> 6148 bytes .gitignore | 3 +- src/GlobalPollenProject.WebUI/.DS_Store | Bin 10244 -> 8196 bytes .../Services/Concrete/ReferenceService.cs | 1 + .../Styles/Components/_TaxonGrid.scss | 1 + src/GlobalPollenProject.WebUI/project.json | 62 +++++++++--------- .../wwwroot/css/main.css | 7 +- 7 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.DS_Store b/.DS_Store index cfe7dcabf52cd594b7bd3f78b0873527e044f1fe..b347e534a9913420ecb65ab5cbb6fd295c5fb7a5 100644 GIT binary patch delta 317 zcmZoMXfc=|#>B)qu~2NHo}wrd0|Nsi1A_oVaY0f}eiD%PC8=Oz;c~{w1|lpe%nZd0 zMGVPF<;b!*nZ+dr1~(X)m|0la*f}`4xH-8v`8i{QGxE!WOA<>;i=7gSqCvcX#FC7p z#G-fsnc&QnR3IxnGo>UWBsI@9C$%g!&%ekgu_Se}9II13RGyPV*&$f~=m-V|P7cm^ z0rBc;GjmHF1#_cX9ffLha|0a(6JxX5T22m0b>pD8tj4}sv*#>bwtU4QupS0RpjW^^ z5K6`q%OT7n|trv~+ zbNBncM(1gg7p>Mev9elOyK+@ZS(7(vuX?9?+$+Ljly}163)4#mapdfMt<#@&7(Gwo z@lpNOW1SUYlEuTB@Rx^4Hqhga9%X~v)Y%J*Q{+~wRarf%Hzt$z&i$rp?`%z*YO=lE zYN~tft?5+C^*fsnyT@nm-cLSEKYlXQk-%1JM8pnS#Vw*Z%m74aIn=AK_EH-x zF~~iJ{Ry}XF3Sy_EGN7NLeee=G2WA$2G=y6R%?aKYbERI8-r*sowk9EJ&d1p+ zuPFBsWtxrGMAxawxC&H5M|w=~Wuxh+Kq!dfqL>S~#~;+FkBxXxz1v)&bE=?W5A%xy zl!w)%E7)0hP27a1N~K{;3$pD$!>KVlj$vOd`3Kh(Ns+|#umB4HlS>K_sh8z;-Y XuhmG3Fe6F}&0XV0|37W;zWVeDL_enB 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;