Fix navigation when not signed up and browser is narrower

This commit is contained in:
Hillel Coren 2016-03-14 23:37:13 +02:00
parent c49f5fb52c
commit 25b0957a7f
4 changed files with 41 additions and 7 deletions

20
public/css/built.css vendored
View File

@ -2910,8 +2910,24 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2);
.large-dialog {
width: 960px;
}
.hide-desktop
{
.hide-desktop {
display: none;
}
}
/* Style to fix navigation by show icon instead of name */
@media only screen and (min-width : 1200px) {
.nav-account-icon {
display: none;
}
}
@media only screen and (max-width : 992px) {
.nav-account-icon {
display: none;
}
}
@media only screen and (max-width : 1200px) and (min-width: 992px) {
.nav-account-name {
display: none;
}
}

20
public/css/style.css vendored
View File

@ -783,8 +783,24 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2);
.large-dialog {
width: 960px;
}
.hide-desktop
{
.hide-desktop {
display: none;
}
}
/* Style to fix navigation by show icon instead of name */
@media only screen and (min-width : 1200px) {
.nav-account-icon {
display: none;
}
}
@media only screen and (max-width : 992px) {
.nav-account-icon {
display: none;
}
}
@media only screen and (max-width : 1200px) and (min-width: 992px) {
.nav-account-name {
display: none;
}
}

View File

@ -427,14 +427,16 @@
<div class="btn-group user-dropdown">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
<div id="myAccountButton" class="ellipsis" style="max-width:{{ Utils::isPro() && ! Utils::isTrial() ? '130' : '100' }}px">
<div id="myAccountButton" class="ellipsis nav-account-name" style="max-width:{{ Utils::isPro() && ! Utils::isTrial() ? '130' : '100' }}px;">
@if (session(SESSION_USER_ACCOUNTS) && count(session(SESSION_USER_ACCOUNTS)))
{{ Auth::user()->account->getDisplayName() }}
@else
{{ Auth::user()->getDisplayName() }}
@endif
<span class="caret"></span>
</div>
</div>
<span class="glyphicon glyphicon-user nav-account-icon" style="padding-left:0px"
title="{{ Auth::user()->account->getDisplayName() }}"/>
</button>
<ul class="dropdown-menu user-accounts">
@if (session(SESSION_USER_ACCOUNTS))

View File

@ -87,7 +87,7 @@
<div data-bind="with: client" class="invoice-contact">
<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; (contacts()[0].email() || contacts()[0].first_name()), foreach: contacts">
<div class="col-lg-8 col-lg-offset-4">
<div class="col-lg-8 col-lg-offset-4 col-sm-offset-4">
<label class="checkbox" data-bind="attr: {for: $index() + '_check'}" onclick="refreshPDF(true)">
<input type="hidden" value="0" data-bind="attr: {name: 'client[contacts][' + $index() + '][send_invoice]'}">
<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check', name: 'client[contacts][' + $index() + '][send_invoice]'}">