Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up modal CSS styles

Browse Source
This commit is contained in:
Hillel Coren 2017-03-26 11:45:17 +03:00
parent eb8d164b37
commit e938919473
17 changed files with 82 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/built.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/css/built.css.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/css/style.css vendored
View File

@ -426,6 +426,10 @@ canvas {
border-radius: 3px; border-radius: 3px;
} }
.modal .panel-default {
margin-bottom: 2px;
}
.navbar .active > a { .navbar .active > a {
background-color: #09334f !important; background-color: #09334f !important;
background-image: none; background-image: none;

4
resources/views/accounts/client_portal.blade.php
View File

@ -338,7 +338,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<p>{{ trans('texts.iframe_url_help1') }}</p> <p>{{ trans('texts.iframe_url_help1') }}</p>
<pre>&lt;center&gt; <pre>&lt;center&gt;
@ -355,7 +355,7 @@ iframe.src = '{{ rtrim(SITE_URL ,'/') }}/view/'
</div> </div>
</div> </div>
<div class="modal-footer" style="margin-top: 2px"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button> <button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button>
</div> </div>

18
resources/views/accounts/customize_design.blade.php
View File

@ -218,16 +218,20 @@
<h4 class="modal-title" id="helpModalLabel">{{ trans('texts.help') }}</h4> <h4 class="modal-title" id="helpModalLabel">{{ trans('texts.help') }}</h4>
</div> </div>
<div class="panel-body" style="background-color: #fff"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
{!! trans('texts.customize_help') !!}<br/> <div class="panel panel-default">
<div class="panel-body">
{!! trans('texts.customize_help') !!}<br/>
<pre id="sampleData" style="display:none;height:200px;padding-top:16px;"></pre> <pre id="sampleData" style="display:none;height:200px;padding-top:16px;"></pre>
@if (empty($sampleInvoice)) @if (empty($sampleInvoice))
<div class="help-block">{{ trans('texts.create_invoice_for_sample') }}</div> <div class="help-block">{{ trans('texts.create_invoice_for_sample') }}</div>
@endif @endif
</div> </div>
</div>
</div>
<div class="modal-footer" style="margin-top: 2px"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button>
</div> </div>

4
resources/views/accounts/email_settings.blade.php
View File

@ -107,7 +107,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div class="row" style="text-align:center"> <div class="row" style="text-align:center">
<div class="col-md-4"> <div class="col-md-4">
@ -127,7 +127,7 @@
</div> </div>
</div> </div>
<div class="modal-footer" style="margin-top: 2px"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button> <button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button>
</div> </div>

4
resources/views/accounts/invoice_settings.blade.php
View File

@ -344,7 +344,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<p>{{ trans('texts.pattern_help_1') }}</p> <p>{{ trans('texts.pattern_help_1') }}</p>
<p>{{ trans('texts.pattern_help_2') }}</p> <p>{{ trans('texts.pattern_help_2') }}</p>
@ -365,7 +365,7 @@
</div> </div>
</div> </div>
<div class="modal-footer" style="margin-top: 2px"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button> <button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button>
</div> </div>

4
resources/views/accounts/management.blade.php
View File

@ -105,7 +105,7 @@
</h4> </h4>
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
@if ($planDetails && $planDetails['active']) @if ($planDetails && $planDetails['active'])
@ -141,7 +141,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer" style="margin-top: 2px"> <div class="modal-footer">
@if (Utils::isPro()) @if (Utils::isPro())
<div class="pull-left" style="padding-top: 8px;color:#888888"> <div class="pull-left" style="padding-top: 8px;color:#888888">
{{ trans('texts.changes_take_effect_immediately') }} {{ trans('texts.changes_take_effect_immediately') }}

5
resources/views/accounts/payments.blade.php
View File

@ -35,6 +35,7 @@
{!! Former::actions( Button::success(trans('texts.save'))->withAttributes(['id' => 'formSave'])->submit()->appendIcon(Icon::create('floppy-disk')) ) !!} {!! Former::actions( Button::success(trans('texts.save'))->withAttributes(['id' => 'formSave'])->submit()->appendIcon(Icon::create('floppy-disk')) ) !!}
</div> </div>
</div> </div>
{!! Former::close() !!} {!! Former::close() !!}
@if ($showAdd) @if ($showAdd)
@ -73,7 +74,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 2px !important"> <div class="container" style="width: 100%; padding-bottom: 2px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div role="tabpanel"> <div role="tabpanel">
<ul class="nav nav-tabs" role="tablist" style="border: none"> <ul class="nav nav-tabs" role="tablist" style="border: none">
@ -186,7 +187,7 @@
</div> </div>
</div> </div>
<div class="modal-footer" style="margin-top: 0px"> <div class="modal-footer">
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
data-dismiss="modal">{{ trans('texts.cancel') }}</button> data-dismiss="modal">{{ trans('texts.cancel') }}</button>
<button type="submit" class="btn btn-primary" id="modalSave">{{ trans('texts.save') }}</button> <button type="submit" class="btn btn-primary" id="modalSave">{{ trans('texts.save') }}</button>

18
resources/views/accounts/templates_and_reminders.blade.php
View File

@ -93,11 +93,15 @@
<h4 class="modal-title" id="templatePreviewModalLabel">{{ trans('texts.preview') }}</h4> <h4 class="modal-title" id="templatePreviewModalLabel">{{ trans('texts.preview') }}</h4>
</div> </div>
<div class="modal-body"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default">
<div class="panel-body">
<iframe id="server-preview" style="background-color:#FFFFFF" frameborder="1" width="100%" height="500px"/></iframe> <iframe id="server-preview" style="background-color:#FFFFFF" frameborder="1" width="100%" height="500px"/></iframe>
</div> </div>
</div>
</div>
<div class="modal-footer" style="margin-top: 0px"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button> <button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button>
</div> </div>
</div> </div>
@ -112,11 +116,15 @@
<h4 class="modal-title" id="rawModalLabel">{{ trans('texts.raw_html') }}</h4> <h4 class="modal-title" id="rawModalLabel">{{ trans('texts.raw_html') }}</h4>
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default">
<div class="modal-body"> <div class="modal-body">
<textarea id="raw-textarea" rows="20" style="width:100%"></textarea> <textarea id="raw-textarea" rows="20" style="width:100%"></textarea>
</div> </div>
</div>
</div>
<div class="modal-footer" style="margin-top: 0px"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.close') }}</button>
<button type="button" onclick="updateRaw()" class="btn btn-success" data-dismiss="modal">{{ trans('texts.update') }}</button> <button type="button" onclick="updateRaw()" class="btn btn-success" data-dismiss="modal">{{ trans('texts.update') }}</button>
</div> </div>
@ -133,7 +141,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<p>{{ trans('texts.template_help_1') }}</p> <p>{{ trans('texts.template_help_1') }}</p>
<ul> <ul>
@ -187,7 +195,7 @@
</div> </div>
</div> </div>
<div class="modal-footer" style="margin-top: 0px"> <div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button> <button type="button" class="btn btn-primary" data-dismiss="modal">{{ trans('texts.close') }}</button>
</div> </div>

58
resources/views/accounts/user_details.blade.php
View File

@ -104,38 +104,44 @@
<h4 class="modal-title" id="passwordModalLabel">{{ trans('texts.change_password') }}</h4> <h4 class="modal-title" id="passwordModalLabel">{{ trans('texts.change_password') }}</h4>
</div> </div>
<div style="background-color: #fff" id="changePasswordDiv" onkeyup="validateChangePassword()" onclick="validateChangePassword()" onkeydown="checkForEnter(event)"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
&nbsp; <div class="panel panel-default">
<div class="panel-body">
{!! Former::password('current_password')->style('width:300px') !!} <div style="background-color: #fff" id="changePasswordDiv" onkeyup="validateChangePassword()" onclick="validateChangePassword()" onkeydown="checkForEnter(event)">
{!! Former::password('newer_password')->style('width:300px')->label(trans('texts.new_password')) !!} &nbsp;
{!! Former::password('confirm_password')->style('width:300px') !!}
&nbsp; {!! Former::password('current_password')->style('width:300px') !!}
<br/> {!! Former::password('newer_password')->style('width:300px')->label(trans('texts.new_password')) !!}
<center> {!! Former::password('confirm_password')->style('width:300px') !!}
<div id="changePasswordError"></div>
</center>
<br/>
</div>
<div style="padding-left:40px;padding-right:40px;display:none;min-height:130px" id="working"> &nbsp;
<h3>{{ trans('texts.working') }}...</h3> <br/>
<div class="progress progress-striped active"> <center>
<div class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div> <div id="changePasswordError"></div>
</center>
<br/>
</div> </div>
<div style="padding-left:40px;padding-right:40px;display:none;min-height:130px" id="working">
<h3>{{ trans('texts.working') }}...</h3>
<div class="progress progress-striped active">
<div class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
</div>
</div>
<div style="background-color: #fff; padding-right:20px;padding-left:20px; display:none" id="successDiv">
<br/>
<h3>{{ trans('texts.success') }}</h3>
{{ trans('texts.updated_password') }}
<br/>
</div>
</div>
</div>
</div> </div>
<div style="background-color: #fff; padding-right:20px;padding-left:20px; display:none" id="successDiv"> <div class="modal-footer" id="changePasswordFooter">
<br/>
<h3>{{ trans('texts.success') }}</h3>
{{ trans('texts.updated_password') }}
<br/>
&nbsp;
<br/>
</div>
<div class="modal-footer" style="margin-top: 0px" id="changePasswordFooter">
<button type="button" class="btn btn-default" id="cancelChangePasswordButton" data-dismiss="modal"> <button type="button" class="btn btn-default" id="cancelChangePasswordButton" data-dismiss="modal">
{{ trans('texts.cancel') }} {{ trans('texts.cancel') }}
<i class="glyphicon glyphicon-remove-circle"></i> <i class="glyphicon glyphicon-remove-circle"></i>

2
resources/views/invoices/edit.blade.php
View File

@ -748,7 +748,7 @@
</div> </div>
</div> </div>
<div class="modal-footer" style="margin-top: 0px; padding-top:0px; padding-right:20px"> <div class="modal-footer">
<span class="error-block" id="emailError" style="display:none;float:left;font-weight:bold">{{ trans('texts.provide_name_or_email') }}</span><span>&nbsp;</span> <span class="error-block" id="emailError" style="display:none;float:left;font-weight:bold">{{ trans('texts.provide_name_or_email') }}</span><span>&nbsp;</span>
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.cancel') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('texts.cancel') }}</button>
<button type="button" class="btn btn-default" data-bind="click: $root.showMoreFields, text: $root.showMore() ? '{{ trans('texts.less_fields') }}' : '{{ trans('texts.more_fields') }}'"></button> <button type="button" class="btn btn-default" data-bind="click: $root.showMoreFields, text: $root.showMore() ? '{{ trans('texts.less_fields') }}' : '{{ trans('texts.more_fields') }}'"></button>

2
resources/views/invoices/email.blade.php
View File

@ -8,7 +8,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
{!! Former::plaintext('recipients') {!! Former::plaintext('recipients')

2
resources/views/partials/bluevine_promo.blade.php
View File

@ -15,7 +15,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
{!! Former::open('/bluevine/signup')->id('bluevineSignup') !!} {!! Former::open('/bluevine/signup')->id('bluevineSignup') !!}
{!! trans('texts.bluevine_modal_text') !!}<br/> {!! trans('texts.bluevine_modal_text') !!}<br/>

2
resources/views/partials/contact_us.blade.php
View File

@ -15,7 +15,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div class="input-div"> <div class="input-div">
{!! Former::plaintext('contact_us_from') {!! Former::plaintext('contact_us_from')

2
resources/views/partials/refund_payment.blade.php
View File

@ -7,7 +7,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 0px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"> <div class="form-group">

4
resources/views/partials/sign_up.blade.php
View File

@ -156,7 +156,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 2px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<div id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)"> <div id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)">
@ -282,7 +282,7 @@
</div> </div>
<div class="container" style="width: 100%; padding-bottom: 0px !important"> <div class="container" style="width: 100%; padding-bottom: 0px !important">
<div class="panel panel-default" style="margin-bottom: 2px"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
<h3>{{ trans('texts.are_you_sure') }}</h3><br/> <h3>{{ trans('texts.are_you_sure') }}</h3><br/>
<p>{{ trans('texts.erase_data') }}</p> <p>{{ trans('texts.erase_data') }}</p>