diff --git a/LICENSE b/LICENSE index dd4fe11..2e00685 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License Copyright (c) 2020 Mateusz Drwal +Portions Copyright (c) 2020 Łukasz Pończocha Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/templates/home.html b/templates/home.html index 097a483..b51ca4b 100644 --- a/templates/home.html +++ b/templates/home.html @@ -18,6 +18,42 @@ .navbar-brand { font-size: 1rem } + + {% if admin %} + #mergeSpan, + #mergeModalOpen { + display: none; + } + + .merging #mergeSpan, + .merging #mergeModalOpen { + display: block; + } + + .mergingOnOffLabel { + color: #fff; + margin-bottom: 0; + } + + #mergingOnOff { + height: 15px; + width: 15px; + } + + #mergeConfirmModalRequestList .btn, + #mergeConfirmModalTargetRequest .btn, + #mergeModalRequestList .request .btn { + cursor: default; + } + + #mergeConfirmModalRequestList .listSymbol { + width: 1rem; + } + + #mergeConfirmModalTargetRequest { + border-bottom: 1px solid black; + } + {% endif %} } @@ -36,8 +72,20 @@