diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-02-02 14:19:23 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-02-02 14:24:19 +0100 |
| commit | e2ee565f05a43bb5fa461df3fd857dc27c8d9b67 (patch) | |
| tree | e2be892db46d442091a2798fc9089461f8667dd3 /view | |
| parent | 23303391e070120851d505a2ec8f3b9b696329e2 (diff) | |
| download | volse-hubzilla-e2ee565f05a43bb5fa461df3fd857dc27c8d9b67.tar.gz volse-hubzilla-e2ee565f05a43bb5fa461df3fd857dc27c8d9b67.tar.bz2 volse-hubzilla-e2ee565f05a43bb5fa461df3fd857dc27c8d9b67.zip | |
cherry-pick nav-login changes
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_home.css | 11 | ||||
| -rw-r--r-- | view/css/mod_login.css | 22 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 17 | ||||
| -rwxr-xr-x | view/tpl/login.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 12 |
5 files changed, 15 insertions, 53 deletions
diff --git a/view/css/mod_home.css b/view/css/mod_home.css index d4cf37253..b6112eb38 100644 --- a/view/css/mod_home.css +++ b/view/css/mod_home.css @@ -1,15 +1,10 @@ .home-welcome { text-align: center; -} - -.generic-content-wrapper-styled { - margin-left: auto; - margin-right: auto; - max-width: 420px; - font-size: 1.1em; + margin-bottom: 50px; } #login-main { max-width: 400px; - margin-top: 50px; + margin-left: auto; + margin-right: auto; } diff --git a/view/css/mod_login.css b/view/css/mod_login.css index a086c50df..53ba9cb1d 100644 --- a/view/css/mod_login.css +++ b/view/css/mod_login.css @@ -1,23 +1,5 @@ -.generic-content-wrapper-styled { - margin-left: auto; - margin-right: auto; - max-width: 420px; - font-size: 1.1em; -} - #login-main { max-width: 400px; - margin-top: 50px; -} - -@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; - } + margin-left: auto; + margin-right: auto; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 77b969712..fd41b4c89 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2107,19 +2107,6 @@ dl.bb-dl > dd > li { } #nav-login { - display: none; - width: 200px; - border: 1px solid #ccc; - border-radius: $radiuspx; - -} - -.login-dropdown-menu { - padding: 8px; - background-color: #eee; + padding: 10px; + min-width: 300px; } - -.rmagic-button { - margin: 15px 0 5px; - -}
\ No newline at end of file diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl index 1c2841adf..3d3faa41c 100755 --- a/view/tpl/login.tpl +++ b/view/tpl/login.tpl @@ -1,6 +1,3 @@ -{{if $login_page}} -<div class="generic-content-wrapper-styled"> -{{/if}} <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> <div id="login-main"> @@ -20,6 +17,5 @@ {{/foreach}} </form> {{if $login_page}} -</div> <script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script> -{{/if}}
\ No newline at end of file +{{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index bda833b94..d83f493ff 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -155,11 +155,13 @@ {{/if}} {{if $nav.login && !$userinfo}} - <li class="nav-login hidden-xs"> - <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> - <div id="nav-login" class="login-dropdown-menu" style="display:none; width:150%;"> - {{$nav.login}} - {{$nav.remote_login}} + <li class=""> + <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="dropdown-menu"> + <div class="form-group"> + {{$nav.login}} + </div> + {{$nav.remote_login}} </div> </li> {{/if}} |