Merge pull request #130 from ezraroi/121-fix-layout-of-team-icons-in-…

…different-views 121 fix layout of team icons in different views
ezraroi · Sep 18, 2024 · cd33104 · cd33104
2 parents ca97e14 + 0ecaff6
commit cd33104
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 18 deletions.
diff --git a/Mundialito/Client/css/Site.css b/Mundialito/Client/css/Site.css
@@ -82,4 +82,14 @@ input.ng-invalid.ng-dirty, textarea.ng-invalid.ng-dirty, select.ng-invalid.ng-di
 
 .label-as-badge {
     border-radius: 1em;
+}
+
+.team-icon {
+    width: 28px; 
+    height: 28px;
+}
+
+.logo-margin {
+    margin-left: 3px; 
+    margin-right: 3px;
 }
diff --git a/Mundialito/Client/src/General/teamFlagDirective.js b/Mundialito/Client/src/General/teamFlagDirective.js
@@ -2,7 +2,8 @@
 angular.module('mundialitoApp').directive('teamFlag', ['$rootScope', ($rootScope) => ({
     restrict: 'E',
     scope: {
-        team: '='
+        team: '=',
+        style: '='
     },
     templateUrl: 'App/General/teamFlagTemplate.html',
     link: (scope) => {

diff --git a/Mundialito/Client/src/General/teamFlagTemplate.html b/Mundialito/Client/src/General/teamFlagTemplate.html
@@ -1,2 +1,2 @@
-<img ng-if="useFlagsCss !== 'true'" ng-src="{{::team.Flag}}" style="width: 28px; height: 28px; margin-left: 3px; margin-right: 3px;" class="img-reponsive img-rounded" />
-<i ng-if="useFlagsCss === 'true'" ng-class="['flag','flag-fifa-{{team.ShortName | lowercase}}']" tooltip="{{team.Name}}" style="margin-left: 3px; margin-right: 3px;"></i>
+<img alt="{{::team.Name}}" ng-if="useFlagsCss !== 'true'" ng-src="{{::team.Flag}}" ng-style="{{style}}" class="img-reponsive img-rounded team-icon" />
+<i ng-if="useFlagsCss === 'true'" ng-class="['flag','flag-fifa-{{team.ShortName | lowercase}}']" ng-style="{{style}}" tooltip="{{team.Name}}"></i>
diff --git a/Mundialito/Views/Home/Index.cshtml b/Mundialito/Views/Home/Index.cshtml
@@ -145,11 +145,11 @@
         @if (env.IsProduction())
         {
             <script src="lib/lib-min-2d5e40df8764ea1d842fca768d139b58.js"></script>
-            <script src="js/app-min-eb8d027ceaca1adaf5298c9ee868b9c5.js"></script>
+            <script src="js/app-min-edab6c6f8348e96ec77828311e34fb09.js"></script>
         }
         else {
             <script src="lib/lib-77990d6df268e8d3d432fb52597000f9.js"></script>
-            <script src="js/app-f1ca643234fe743ef96cc67e8374c645.js"></script>
+            <script src="js/app-3aca63029d88fd16639d2f211875992c.js"></script>
         }
     </div>
 </body>

diff --git a/Mundialito/appsettings.Development.json b/Mundialito/appsettings.Development.json
@@ -13,6 +13,7 @@
     "AdminEmail": "[email protected]",
     "PrivateKeyProtection": true,
     "FromAddress": "[email protected]",
-    "LinkAddress": "http://localhost:5150"
-  } 
+    "LinkAddress": "http://localhost:5150",
+    "TournamentDBCreatorName": "Euro2024"
+  }
 }
diff --git a/Mundialito/wwwroot/App/General/teamFlagTemplate.html b/Mundialito/wwwroot/App/General/teamFlagTemplate.html
@@ -1,2 +1,2 @@
-<img ng-if="useFlagsCss !== 'true'" ng-src="{{::team.Flag}}" style="width: 28px; height: 28px; margin-left: 3px; margin-right: 3px;" class="img-reponsive img-rounded" />
-<i ng-if="useFlagsCss === 'true'" ng-class="['flag','flag-fifa-{{team.ShortName | lowercase}}']" tooltip="{{team.Name}}" style="margin-left: 3px; margin-right: 3px;"></i>
+<img alt="{{::team.Name}}" ng-if="useFlagsCss !== 'true'" ng-src="{{::team.Flag}}" ng-style="{{style}}" class="img-reponsive img-rounded team-icon" />
+<i ng-if="useFlagsCss === 'true'" ng-class="['flag','flag-fifa-{{team.ShortName | lowercase}}']" ng-style="{{style}}" tooltip="{{team.Name}}"></i>
diff --git a/Mundialito/wwwroot/css/app-cerulean.css b/Mundialito/wwwroot/css/app-cerulean.css
diff --git a/Mundialito/wwwroot/css/app-space-lab.css b/Mundialito/wwwroot/css/app-space-lab.css
diff --git a/...s/app-f1ca643234fe743ef96cc67e8374c645.js → ...s/app-3aca63029d88fd16639d2f211875992c.js b/...s/app-f1ca643234fe743ef96cc67e8374c645.js → ...s/app-3aca63029d88fd16639d2f211875992c.js
@@ -1583,7 +1583,8 @@ angular.module('mundialitoApp').directive('mundialitoToggleText', [function () {
 angular.module('mundialitoApp').directive('teamFlag', ['$rootScope', ($rootScope) => ({
     restrict: 'E',
     scope: {
-        team: '='
+        team: '=',
+        style: '='
     },
     templateUrl: 'App/General/teamFlagTemplate.html',
     link: (scope) => {

diff --git a/...p-min-eb8d027ceaca1adaf5298c9ee868b9c5.js → ...p-min-edab6c6f8348e96ec77828311e34fb09.js b/...p-min-eb8d027ceaca1adaf5298c9ee868b9c5.js → ...p-min-edab6c6f8348e96ec77828311e34fb09.js