tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #21942 from abpframework/Account.cshtml

pull/22022/head
maliming 2 years ago
committed by GitHub
parent
6271f56333 a9f43779c5
commit
6e1a7c7d06
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 44 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
  2. 24
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css
  3. 17
      modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg

4
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/Layouts/Account.cshtml
View File

@ -57,6 +57,10 @@
<div class="@containerClass">
<abp-row>
<abp-column class="col mx-auto" style="max-width: 440px">
<div class="brand-container">
<img class="brand-logo" src="@(BrandingProvider.LogoUrl ?? Url.Content("~/themes/basic/logo.svg"))" alt="@BrandingProvider.AppName"/>
<h2 class="brand-text">@BrandingProvider.AppName</h2>
</div>
@if (MultiTenancyOptions.Value.IsEnabled &&
(TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(CookieTenantResolveContributor.ContributorName) == true ||
TenantResolveResultAccessor.Result?.AppliedResolvers?.Contains(QueryStringTenantResolveContributor.ContributorName) == true))

24
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/layout.css
View File

@ -1,4 +1,6 @@
@import url('https://fonts.googleapis.com/css2?family=Lexend:wght@100..900&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
#main-navbar-tools a.dropdown-toggle {
text-decoration: none;
color: #fff;
@ -97,4 +99,24 @@ div.dataTables_wrapper div.dataTables_length label {
}
.rtl table.dataTable thead th, table.dataTable thead td, table.dataTable tfoot th, table.dataTable tfoot td {
text-align: right;
}
.brand-container{
text-align: center;
margin-top: 8rem;
}
.brand-logo {
height: 50px;
}
.brand-text {
color: #292D33;
font-family: Lexend;
font-size: 30px;
font-style: normal;
font-weight: 500;
line-height: 34px;
margin-top: 5px;
margin-bottom: 15px;
}

17
modules/basic-theme/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/wwwroot/themes/basic/logo.svg
View File

@ -0,0 +1,17 @@
<svg width="147" height="50" viewBox="0 0 147 50" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_7065_14314)">
<path d="M25.8749 28.9393C28.1779 28.9393 30.0448 27.0724 30.0448 24.7695C30.0448 22.4665 28.1779 20.5996 25.8749 20.5996C23.572 20.5996 21.7051 22.4665 21.7051 24.7695C21.7051 27.0724 23.572 28.9393 25.8749 28.9393Z" fill="#B84297"/>
<path d="M74.2393 11.0308C72.0441 11.0115 69.8776 11.5309 67.9297 12.5435C65.9819 13.5561 64.3121 15.031 63.0668 16.8389C61.8215 18.6469 61.0386 20.7327 60.7868 22.9135C60.535 25.0944 60.822 27.3037 61.6225 29.3479C62.4231 31.392 63.7128 33.2087 65.3786 34.6385C67.0445 36.0684 69.0356 37.0678 71.1775 37.5492C73.3194 38.0307 75.5467 37.9794 77.6642 37.3999C79.7816 36.8204 81.7247 35.7304 83.3229 34.2255V36.6566H87.5314V25.0904C87.5421 24.8417 87.5485 24.5908 87.5464 24.3379C87.5047 20.8216 86.0893 17.4611 83.6027 14.9745C81.1161 12.4879 77.7556 11.0725 74.2393 11.0308ZM74.2972 33.7002C72.4534 33.7349 70.6413 33.2176 69.0937 32.2148C67.546 31.2119 66.3335 29.7693 65.6119 28.0722C64.8902 26.3751 64.6924 24.5011 65.0439 22.6907C65.3953 20.8804 66.2799 19.2164 67.584 17.9125C68.8882 16.6087 70.5524 15.7245 72.3628 15.3735C74.1732 15.0225 76.0473 15.2207 77.7442 15.9428C79.4411 16.6648 80.8835 17.8777 81.8859 19.4255C82.8884 20.9734 83.4053 22.7856 83.3701 24.6294C83.3701 24.7216 83.3701 24.8117 83.3572 24.9017H83.3251V25.3541C83.0966 27.6071 82.0527 29.699 80.3896 31.2361C78.7266 32.7732 76.5591 33.6495 74.2951 33.7002H74.2972Z" fill="#292D33"/>
<path d="M103.56 11.0306C100.084 10.9953 96.7302 12.3148 94.2102 14.7095V3.00391H90.0039V24.9015H90.0275C90.1154 27.5308 90.974 30.0762 92.4965 32.2215C94.0191 34.3669 96.1385 36.0175 98.5914 36.9684C101.044 37.9192 103.722 38.1283 106.293 37.5697C108.864 37.011 111.214 35.7093 113.051 33.8263C114.888 31.9432 116.131 29.5619 116.626 26.9781C117.121 24.3944 116.846 21.7222 115.835 19.2936C114.823 16.865 113.121 14.787 110.938 13.318C108.756 11.8489 106.19 11.0535 103.56 11.0306V11.0306ZM103.611 33.7C101.207 33.7458 98.8805 32.8537 97.1236 31.2128C95.3666 29.5719 94.3178 27.3112 94.1995 24.9101V24.9101V23.9689C94.2942 22.1709 94.9117 20.4396 95.9764 18.9876C97.041 17.5356 98.5065 16.426 100.193 15.795C101.879 15.164 103.713 15.0391 105.469 15.4355C107.226 15.832 108.828 16.7326 110.08 18.0268C111.331 19.3211 112.178 20.9526 112.516 22.7212C112.853 24.4897 112.667 26.3184 111.98 27.9828C111.294 29.6471 110.136 31.0747 108.649 32.0903C107.162 33.1059 105.411 33.6654 103.611 33.7V33.7Z" fill="#292D33"/>
<path d="M132.882 11.0312C131.099 11.0155 129.332 11.3549 127.682 12.0298C126.032 12.7046 124.534 13.7012 123.273 14.9615C122.013 16.2219 121.016 17.7206 120.341 19.3703C119.667 21.02 119.327 22.7875 119.343 24.5698C119.343 24.6813 119.343 24.7842 119.343 24.9021H119.319V46.8019H123.526V34.1744C125.112 35.6781 127.042 36.7713 129.148 37.359C131.253 37.9466 133.471 38.0108 135.607 37.5461C137.743 37.0813 139.733 36.1017 141.404 34.6924C143.075 33.2831 144.376 31.4868 145.195 29.4598C146.013 27.4328 146.324 25.2365 146.1 23.062C145.876 20.8875 145.124 18.8007 143.91 16.983C142.696 15.1654 141.055 13.672 139.132 12.6328C137.209 11.5937 135.061 11.0402 132.875 11.0205L132.882 11.0312ZM132.942 33.7006C130.543 33.7462 128.221 32.858 126.465 31.2235C124.71 29.589 123.658 27.3362 123.532 24.9407V24.9021C123.532 24.6878 123.517 24.4884 123.532 24.2783C123.569 22.4648 124.137 20.7021 125.168 19.2095C126.199 17.7169 127.645 16.5602 129.328 15.8835C131.011 15.2067 132.856 15.0397 134.633 15.4033C136.41 15.7669 138.041 16.6449 139.322 17.9282C140.604 19.2115 141.48 20.8434 141.842 22.6208C142.204 24.3983 142.034 26.2428 141.356 27.9248C140.677 29.6069 139.519 31.0523 138.025 32.0812C136.531 33.11 134.768 33.6769 132.954 33.7114L132.942 33.7006Z" fill="#292D33"/>
<path d="M25.8762 0.00294068C22.0878 -0.00061638 18.3485 0.859427 14.9424 2.51771V7.88814C17.9771 5.95077 21.472 4.85417 25.0695 4.71047C28.6671 4.56676 32.2383 5.38111 35.4179 7.07025C38.5975 8.75938 41.2714 11.2627 43.1662 14.3242C45.0611 17.3856 46.1088 20.8954 46.2023 24.4946V24.4946V39.6004C48.8844 35.8623 50.4836 31.4569 50.824 26.8687C51.1645 22.2805 50.2329 17.6873 48.1319 13.5943C46.0309 9.50126 42.8417 6.06695 38.9152 3.66907C34.9887 1.27119 30.477 0.00264244 25.8762 0.00294068V0.00294068Z" fill="#292D33"/>
<path d="M25.8756 45.3391C20.6536 45.3389 15.6321 43.3283 11.8531 39.7245C8.07398 36.1207 5.82741 31.2002 5.57948 25.9841H5.5559V10.4346C1.90165 15.5416 0.302109 21.8363 1.07501 28.0683C1.84791 34.3002 4.9367 40.0135 9.7278 44.0731C14.5189 48.1327 20.6617 50.2416 26.936 49.9808C33.2104 49.7201 39.157 47.1088 43.5948 42.6657V34.9692C41.8282 38.1154 39.2555 40.7343 36.1414 42.5569C33.0272 44.3794 29.4839 45.3397 25.8756 45.3391Z" fill="#292D33"/>
<path d="M25.875 31.4199C24.3641 31.4213 22.8965 30.9155 21.7073 29.9835V34.7644C23.8753 35.6561 26.2725 35.8274 28.5452 35.2531C30.818 34.6788 32.846 33.3892 34.3301 31.5746C35.8142 29.7599 36.6757 27.5164 36.7877 25.1748C36.8997 22.8333 36.2562 20.5178 34.952 18.5698C33.6479 16.6219 31.7522 15.1446 29.5446 14.356C27.337 13.5674 24.9344 13.5092 22.6912 14.1899C20.448 14.8707 18.483 16.2544 17.0861 18.1369C15.6891 20.0194 14.9342 22.3011 14.9326 24.6453V38.7027C16.2039 39.7036 17.6061 40.5259 19.1003 41.1467V24.6388C19.1003 23.2989 19.4977 21.9891 20.2421 20.875C20.9865 19.761 22.0445 18.8926 23.2824 18.3799C24.5203 17.8671 25.8825 17.733 27.1967 17.9944C28.5108 18.2558 29.7179 18.901 30.6654 19.8484C31.6129 20.7959 32.2581 22.003 32.5195 23.3172C32.7809 24.6313 32.6467 25.9935 32.134 27.2314C31.6212 28.4693 30.7529 29.5274 29.6388 30.2718C28.5247 31.0162 27.2149 31.4135 25.875 31.4135V31.4199Z" fill="#292D33"/>
<path d="M12.3286 36.1851V24.7689C12.3299 21.9102 13.2359 19.1252 14.9166 16.8127C16.5974 14.5003 18.9668 12.779 21.6856 11.8954C24.4044 11.0118 27.333 11.0112 30.0521 11.8937C32.7713 12.7762 35.1414 14.4965 36.8231 16.8082C38.5049 19.12 39.4119 21.9046 39.4144 24.7633C39.4169 27.6221 38.5147 30.4083 36.837 32.723C35.1593 35.0377 32.7922 36.7621 30.0746 37.6493C27.3571 38.5366 24.4284 38.5411 21.7081 37.6622V41.9929C24.7756 42.7356 27.9858 42.6456 31.0068 41.732C34.0278 40.8185 36.75 39.1146 38.8919 36.7966C41.0338 34.4786 42.5178 31.6305 43.1903 28.5469C43.8628 25.4633 43.6994 22.256 42.7172 19.2566C41.7349 16.2572 39.9693 13.5747 37.603 11.4862C35.2367 9.39778 32.3555 7.97928 29.2573 7.37737C26.1591 6.77546 22.9564 7.01198 19.9802 8.06249C17.004 9.113 14.3625 10.9394 12.3286 13.3528V7.56428V3.98828C10.8199 4.95977 9.4198 6.09035 8.15234 7.36061V25.3006C8.27063 29.2972 9.74319 33.1351 12.3286 36.1851V36.1851Z" fill="#292D33"/>
</g>
<defs>
<clipPath id="clip0_7065_14314">
<rect width="145.226" height="50" fill="white" transform="translate(0.886719)"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.6 KiB

Write Preview
Loading…
Cancel
Save