Skip to content

Commit

Permalink
Merge pull request #107 from ezraroi/106-display-logo-instead-of-flag
Browse files Browse the repository at this point in the history
added option to use logos and not css flags
  • Loading branch information
ezraroi authored Sep 11, 2024
2 parents ddad56f + 91a9fd1 commit 8f15779
Show file tree
Hide file tree
Showing 29 changed files with 550 additions and 374 deletions.
8 changes: 7 additions & 1 deletion Mundialito/Client/css/Site.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,10 @@ input.ng-invalid.ng-dirty, textarea.ng-invalid.ng-dirty, select.ng-invalid.ng-di
color: #153ff0;
}

.multiselect-container{position:absolute;list-style-type:none;margin:0;padding:0}.multiselect-container .input-group{margin:5px}.multiselect-container>li{padding:0}.multiselect-container>li>a.multiselect-all label{font-weight:bold}.multiselect-container>li>label.multiselect-group{margin:0;padding:3px 20px 3px 10px;height:100%;font-weight:bold;}.multiselect-container>li>a>label{margin:0;height:100%;cursor:pointer;font-weight:normal}.multiselect-container>li>a>label.radio,.multiselect-container>li>a>label.checkbox{margin:0}.multiselect-container>li>a>label>input[type="checkbox"]{margin-bottom:5px}.btn-group>.btn-group:nth-child(2)>.multiselect.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}
.multiselect-container{position:absolute;list-style-type:none;margin:0;padding:0}.multiselect-container .input-group{margin:5px}.multiselect-container>li{padding:0}.multiselect-container>li>a.multiselect-all label{font-weight:bold}.multiselect-container>li>label.multiselect-group{margin:0;padding:3px 20px 3px 10px;height:100%;font-weight:bold;}.multiselect-container>li>a>label{margin:0;height:100%;cursor:pointer;font-weight:normal}.multiselect-container>li>a>label.radio,.multiselect-container>li>a>label.checkbox{margin:0}.multiselect-container>li>a>label>input[type="checkbox"]{margin-bottom:5px}.btn-group>.btn-group:nth-child(2)>.multiselect.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}


.big-logo {
width: 40px;
height: 40px;
}
33 changes: 17 additions & 16 deletions Mundialito/Client/src/Accounts/Login.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ <h2>Login</h2>
<div class="alert alert-info">
<p>Use your Google account to login.</p>
</div>
<div id="buttonDiv"></div>
<div id="buttonDiv"></div>
</div>
<div class="row" ng-show="mundialitoApp.GoogleClientId == ''">
<div class="col-md-6 col-md-offset-3">
<h2>Login</h2>
<form name="loginForm" ng-submit="login()">
<auto:fields fields="schema" data="user"></auto:fields>
<button type="submit" class="btn btn-success btn-lg btn-block" ng-disabled="loginForm.$invalid"
tabindex="100"><i class="fa fa-sign-in"></i> Login</button>
</form>
<p class="text-muted gutter-top text-center">Don't have an account? <a href="/join">Register now!</a>
</p>
<p class="text-muted gutter-top text-center">Forgot your password? <a href="/forgot">Reset your password
now!</a></p>
<hr />
</div>
</div>
<div class="row" ng-show="mundialitoApp.GoogleClientId == ''">
<div class="col-md-6 col-md-offset-3">
<h2>Login</h2>
<form name="loginForm" ng-submit="login()">
<auto:fields fields="schema" data="user"></auto:fields>
<button type="submit" class="btn btn-success btn-lg btn-block" ng-disabled="loginForm.$invalid"
tabindex="100"><i class="fa fa-sign-in"></i> Login</button>
</form>
<p class="text-muted gutter-top text-center">Don't have an account? <a href="/join">Register now!</a>
</p>
<p class="text-muted gutter-top text-center">Forgot your password? <a href="/forgot">Reset your password
now!</a></p>
<hr />
</div>
</div>
</div>
</div>
6 changes: 4 additions & 2 deletions Mundialito/Client/src/Bets/BetsCenter.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
<ng-form name="betFromIn">
<td class="text-center">
<a href="{{game.getUrl()}}">
<i ng-class="['flag','flag-fifa-{{game.HomeTeam.ShortName | lowercase}}']" tooltip="{{game.HomeTeam.Name}}"></i>{{game.HomeTeam.ShortName}} -
<i ng-class="['flag','flag-fifa-{{game.AwayTeam.ShortName | lowercase}}']" tooltip="{{game.AwayTeam.Name}}"></i>{{game.AwayTeam.ShortName}}
<team-flag team="game.HomeTeam"></team-flag>
{{game.HomeTeam.ShortName}}
<team-flag team="game.AwayTeam"></team-flag>
{{game.AwayTeam.ShortName}}
</a>
</td>
<td>
Expand Down
Loading

0 comments on commit 8f15779

Please sign in to comment.