Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cherry-pick nav-login changes

Browse source
This commit is contained in:
Mario Vavti 2017-02-02 14:19:23 +01:00
parent 23303391e0
commit e2ee565f05
5 changed files with 15 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
view/css/mod_home.css
View file

@ -1,15 +1,10 @@
.home-welcome { .home-welcome {
text-align: center; text-align: center;
} margin-bottom: 50px;
.generic-content-wrapper-styled {
margin-left: auto;
margin-right: auto;
max-width: 420px;
font-size: 1.1em;
} }
#login-main { #login-main {
max-width: 400px; max-width: 400px;
margin-top: 50px; margin-left: auto;
margin-right: auto;
} }

22
view/css/mod_login.css
View file

@ -1,23 +1,5 @@
.generic-content-wrapper-styled {
margin-left: auto;
margin-right: auto;
max-width: 420px;
font-size: 1.1em;
}
#login-main { #login-main {
max-width: 400px; max-width: 400px;
margin-top: 50px; margin-left: auto;
} margin-right: auto;
@media (min-width: 768px) and (max-width: 991px) {
#region_1 {
display: none !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
#region_3 {
display: table-cell !important;
}
} }

17
view/theme/redbasic/css/style.css
View file

@ -2107,19 +2107,6 @@ dl.bb-dl > dd > li {
} }
#nav-login { #nav-login {
display: none; padding: 10px;
width: 200px; min-width: 300px;
border: 1px solid #ccc;
border-radius: $radiuspx;
}
.login-dropdown-menu {
padding: 8px;
background-color: #eee;
}
.rmagic-button {
margin: 15px 0 5px;
} }

4
view/tpl/login.tpl
View file

@ -1,6 +1,3 @@
{{if $login_page}}
<div class="generic-content-wrapper-styled">
{{/if}}
<form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
<input type="hidden" name="auth-params" value="login" /> <input type="hidden" name="auth-params" value="login" />
<div id="login-main"> <div id="login-main">
@ -20,6 +17,5 @@
{{/foreach}} {{/foreach}}
</form> </form>
{{if $login_page}} {{if $login_page}}
</div>
<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
{{/if}} {{/if}}

8
view/tpl/nav.tpl
View file

@ -155,10 +155,12 @@
{{/if}} {{/if}}
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
<li class="nav-login hidden-xs"> <li class="">
<a onclick="openClose('nav-login'); return false;" href="#" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a> <a href="#" class="dropdown-toggle" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}" data-toggle="dropdown">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
<div id="nav-login" class="login-dropdown-menu" style="display:none; width:150%;"> <div id="nav-login" class="dropdown-menu">
<div class="form-group">
{{$nav.login}} {{$nav.login}}
</div>
{{$nav.remote_login}} {{$nav.remote_login}}
</div> </div>
</li> </li>