Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00
Code Issues Releases Activity

Minor bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-11-12 17:22:54 +02:00
parent d33009b839
commit 39f424fcfe
8 changed files with 452 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -55,10 +55,10 @@ module.exports = function(grunt) {
'public/vendor/typeahead.js/dist/typeahead.min.js',
'public/vendor/accounting/accounting.min.js',
'public/vendor/spectrum/spectrum.js',
'public/js/bootstrap-combobox.js',
'public/vendor/jspdf/dist/jspdf.min.js',
'public/vendor/lightbox2/js/lightbox.min.js',
'public/vendor/handsontable/dist/jquery.handsontable.full.min.js',
'public/js/lightbox.min.js',
'public/js/bootstrap-combobox.js',
'public/js/script.js',
],
dest: 'public/built.js',
@ -84,7 +84,7 @@ module.exports = function(grunt) {
'public/vendor/spectrum/spectrum.css',
'public/css/bootstrap-combobox.css',
'public/css/typeahead.js-bootstrap.css',
'public/vendor/lightbox2/css/lightbox.css',
'public/css/lightbox.css',
'public/vendor/handsontable/dist/jquery.handsontable.full.css',
'public/css/style.css',
],

14
app/views/header.blade.php
View File

@ -98,10 +98,10 @@
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
<span id="myAccountButton">
<div id="myAccountButton" class="ellipsis" style="max-width:120px">
{{ Auth::user()->getDisplayName() }}
</span>
<span class="caret"></span>
</div>
</button>
<ul class="dropdown-menu" role="menu">
<li>{{ link_to('company/details', uctrans('texts.company_details')) }}</li>
@ -123,8 +123,6 @@
</button>
@endif
</div>
@ -136,7 +134,13 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ trans('texts.history') }} <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@if (Session::get(SESSION_LOCALE) == 'en')
{{ trans('texts.history') }} <b class="caret"></b>
@else
<span class="glyphicon glyphicon-time" title="{{ trans('texts.history') }}"/>
@endif
</a>
<ul class="dropdown-menu">
@if (count(Session::get(RECENTLY_VIEWED)) == 0)
<li><a href="#">{{ trans('texts.no_items') }}</a></li>

1
bower.json
View File

@ -18,7 +18,6 @@
"accounting": "~0.*",
"spectrum": "~1.3.4",
"d3": "~3.4.11",
"lightbox2": "~2.7.1",
"handsontable": "*"
},
"resolutions": {

16
public/built.css
View File

@ -1775,7 +1775,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
}
/* Preload images */
body:after {
content: url(vendor/lightbox2/css/../images/lightbox/close.png) url(vendor/lightbox2/css/../images/lightbox/loading.gif) url(vendor/lightbox2/css/../images/lightbox/prev.png) url(vendor/lightbox2/css/../images/lightbox/next.png);
content: url(css/../images/lightbox/close.png) url(css/../images/lightbox/loading.gif) url(css/../images/lightbox/prev.png) url(css/../images/lightbox/next.png);
display: none;
}
@ -1854,7 +1854,7 @@ body:after {
width: 32px;
height: 32px;
margin: 0 auto;
background: url(vendor/lightbox2/css/../images/lightbox/loading.gif) no-repeat;
background: url(css/../images/lightbox/loading.gif) no-repeat;
}
.lb-nav {
@ -1885,7 +1885,7 @@ body:after {
width: 34%;
left: 0;
float: left;
background: url(vendor/lightbox2/css/../images/lightbox/prev.png) left 48% no-repeat;
background: url(css/../images/lightbox/prev.png) left 48% no-repeat;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
opacity: 0;
-webkit-transition: opacity 0.6s;
@ -1903,7 +1903,7 @@ body:after {
width: 64%;
right: 0;
float: right;
background: url(vendor/lightbox2/css/../images/lightbox/next.png) right 48% no-repeat;
background: url(css/../images/lightbox/next.png) right 48% no-repeat;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
opacity: 0;
-webkit-transition: opacity 0.6s;
@ -1967,7 +1967,7 @@ body:after {
float: right;
width: 30px;
height: 30px;
background: url(vendor/lightbox2/css/../images/lightbox/close.png) top right no-repeat;
background: url(css/../images/lightbox/close.png) top right no-repeat;
text-align: right;
outline: none;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
@ -3516,6 +3516,12 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2);
border: 1px solid #CCCCCC;
}
.ellipsis {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
@media screen and (min-width: 992px) {
.hide-desktop {display: none;}
}

406
public/built.js
View File

File diff suppressed because one or more lines are too long

210
public/css/lightbox.css Normal file
View File

@ -0,0 +1,210 @@
/* Preload images */
body:after {
content: url(../images/lightbox/close.png) url(../images/lightbox/loading.gif) url(../images/lightbox/prev.png) url(../images/lightbox/next.png);
display: none;
}
.lightboxOverlay {
position: absolute;
top: 0;
left: 0;
z-index: 9999;
background-color: black;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
opacity: 0.8;
display: none;
}
.lightbox {
position: absolute;
left: 0;
width: 100%;
z-index: 10000;
text-align: center;
line-height: 0;
font-weight: normal;
}
.lightbox .lb-image {
display: block;
height: auto;
max-width: inherit;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
}
.lightbox a img {
border: none;
}
.lb-outerContainer {
position: relative;
background-color: white;
*zoom: 1;
width: 250px;
height: 250px;
margin: 0 auto;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
-ms-border-radius: 4px;
-o-border-radius: 4px;
border-radius: 4px;
}
.lb-outerContainer:after {
content: "";
display: table;
clear: both;
}
.lb-container {
padding: 4px;
}
.lb-loader {
position: absolute;
top: 43%;
left: 0;
height: 25%;
width: 100%;
text-align: center;
line-height: 0;
}
.lb-cancel {
display: block;
width: 32px;
height: 32px;
margin: 0 auto;
background: url(../images/lightbox/loading.gif) no-repeat;
}
.lb-nav {
position: absolute;
top: 0;
left: 0;
height: 100%;
width: 100%;
z-index: 10;
}
.lb-container > .nav {
left: 0;
}
.lb-nav a {
outline: none;
background-image: url('data:image/gif;base64,R0lGODlhAQABAPAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==');
}
.lb-prev, .lb-next {
height: 100%;
cursor: pointer;
display: block;
}
.lb-nav a.lb-prev {
width: 34%;
left: 0;
float: left;
background: url(../images/lightbox/prev.png) left 48% no-repeat;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
opacity: 0;
-webkit-transition: opacity 0.6s;
-moz-transition: opacity 0.6s;
-o-transition: opacity 0.6s;
transition: opacity 0.6s;
}
.lb-nav a.lb-prev:hover {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
}
.lb-nav a.lb-next {
width: 64%;
right: 0;
float: right;
background: url(../images/lightbox/next.png) right 48% no-repeat;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
opacity: 0;
-webkit-transition: opacity 0.6s;
-moz-transition: opacity 0.6s;
-o-transition: opacity 0.6s;
transition: opacity 0.6s;
}
.lb-nav a.lb-next:hover {
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
}
.lb-dataContainer {
margin: 0 auto;
padding-top: 5px;
*zoom: 1;
width: 100%;
-moz-border-radius-bottomleft: 4px;
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomright: 4px;
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
}
.lb-dataContainer:after {
content: "";
display: table;
clear: both;
}
.lb-data {
padding: 0 4px;
color: #ccc;
}
.lb-data .lb-details {
width: 85%;
float: left;
text-align: left;
line-height: 1.1em;
}
.lb-data .lb-caption {
font-size: 13px;
font-weight: bold;
line-height: 1em;
}
.lb-data .lb-number {
display: block;
clear: left;
padding-bottom: 1em;
font-size: 12px;
color: #999999;
}
.lb-data .lb-close {
display: block;
float: right;
width: 30px;
height: 30px;
background: url(../images/lightbox/close.png) top right no-repeat;
text-align: right;
outline: none;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70);
opacity: 0.7;
-webkit-transition: opacity 0.2s;
-moz-transition: opacity 0.2s;
-o-transition: opacity 0.2s;
transition: opacity 0.2s;
}
.lb-data .lb-close:hover {
cursor: pointer;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
opacity: 1;
}

6
public/css/style.css
View File

@ -716,6 +716,12 @@ box-shadow: 0px 0px 15px 0px rgba(0, 5, 5, 0.2);
border: 1px solid #CCCCCC;
}
.ellipsis {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
@media screen and (min-width: 992px) {
.hide-desktop {display: none;}
}

9
public/js/lightbox.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long