Skip to content

Commit a112cd4

Browse files
gregra81gregra81
committed
Merge branch 'hotfix/design_fixes'
2 parents 04501b2 + 47770bd commit a112cd4

File tree

13 files changed

+177
-89
lines changed

13 files changed

+177
-89
lines changed

‎assets/css/common.css‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ input[type="checkbox"]:checked + label span.chk {
198198
/* medium size is default */
199199
height: 35px;
200200
line-height: 35px;
201-
padding: 0px 25px;
201+
padding: 0px 32px;
202202
font-size: 14px;
203203
position: relative;
204204
}
@@ -259,7 +259,7 @@ input[type="checkbox"]:checked + label span.chk {
259259
}
260260

261261
.form_field{
262-
margin-bottom: 20px;
262+
margin-bottom: 12px;
263263
}
264264
.form_field .field_error {
265265
position: relative;
@@ -350,6 +350,11 @@ input[type="checkbox"]:checked + label span.chk {
350350

351351
#welcome-wrapper{
352352
text-align: center;
353+
height: 375px;
354+
margin: auto;
355+
position: absolute;
356+
top:0;
357+
bottom:0;
353358
}
354359

355360
/***** TOOLTIP *****/
@@ -461,6 +466,7 @@ i.stooltip span {
461466
background-position: -286px -47px;
462467
width: 17px;
463468
height: 16px;
469+
margin-left: 6px;
464470
}
465471

466472
.si-help-hover {
@@ -687,13 +693,18 @@ i.stooltip span {
687693

688694
/**** galleries ****/
689695

696+
.box {
697+
margin-bottom: 20px;
698+
height: 231px;
699+
}
700+
690701
.thumb{
691702
border-top: 1px solid lightgray;
692703
border-left: 1px solid lightgray;
693704
border-right: 1px solid lightgray;
694705
border-top-left-radius: 4px;
695706
border-top-right-radius: 4px;
696-
height: 150px;
707+
height: 191px;
697708
overflow: hidden;
698709
position: relative;
699710
}
@@ -724,7 +735,7 @@ i.stooltip span {
724735
border-bottom-left-radius: 5px;
725736
border-bottom-right-radius: 5px;
726737
border: 1px solid #ccc;
727-
padding: 8px;
738+
padding: 9px;
728739
}
729740

730741
.btn-github {
@@ -857,7 +868,7 @@ i.stooltip span {
857868
}
858869

859870
#breadcrumbs-section #action-button #create-file > a{
860-
padding: 0 32px;
871+
padding: 0 40px;
861872
}
862873

863874
#breadcrumbs-section #action-button #create-file i{
@@ -872,7 +883,7 @@ i.stooltip span {
872883
}
873884

874885
#breadcrumbs-section #action-button #create-file i.si-add-item{
875-
left:12px;
886+
left:20px;
876887
top:11px;
877888
}
878889

@@ -904,7 +915,7 @@ i.stooltip span {
904915
height: 61px;
905916
margin: auto;
906917
position: absolute;
907-
top: 0;
918+
top: 4px;
908919
left:30px;
909920
}
910921

@@ -931,13 +942,18 @@ i.stooltip span {
931942
padding: 11px;
932943
display: inline-block;
933944
height: 39px;
945+
color:#777777;
934946
}
935947

936948
.bread-crumb.dark{
937949
background-image: url("../img/dark_bread_crumbs_arrow_A.png");
938950
}
939951
.bread-crumb.dark span{
940952
background-color: #EBEBEB;
953+
color:#333333;
954+
}
955+
.bread-crumb.dark span b{
956+
font-weight: 400;
941957
}
942958

943959
.bread-crumb.dark .bread-crumb-tail{
@@ -974,7 +990,7 @@ i.stooltip span {
974990
{
975991
background-color: #2b2f3e;
976992
color:#8c92a4;
977-
min-height: 100px;
993+
min-height: 86px;
978994
margin-bottom: 10px;
979995
border-bottom:1px solid #2b2f3e;
980996
border-left:1px solid #2b2f3e;
@@ -1080,7 +1096,7 @@ i.stooltip span {
10801096

10811097
#requestLog{
10821098
overflow-y: auto;
1083-
height: 150px;
1099+
height: 113px;
10841100
}
10851101

10861102
#requestLog pre{

‎examples/drive/show-asset-sources/index.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
.assets-container{
6060
padding-top: 20px;
6161
overflow-y: scroll;
62-
height: 480px;
62+
height: 360px;
6363
}
6464

6565
</style>
@@ -190,6 +190,9 @@ <h4>WARNING</h4>
190190
} else {
191191
$('#empty-files').removeClass('hidden');
192192
$('.upload-link').attr('href', $('.upload-link').attr('href') + '?assetId=' + currentAssetId);
193+
194+
//broadcast the state to the iframe - intended only for the storage UI
195+
eventBroadCaster.broadcastEvent('emptyAssets');
193196
}
194197
});
195198

‎examples/drive/show-asset-thumbnails/gallery-view.html‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<style>
1717
.modal-header {
1818
position: relative;
19-
padding: 8px 20px;
19+
padding: 10px 20px;
2020
}
2121

2222
.modal-header .layouts {
2323
position: absolute;
2424
right: 0;
2525
background-color: #ffffff;
2626
padding-left: 10px;
27+
top:9px;
2728
}
2829

2930
.modal-header .layouts a {
@@ -61,14 +62,15 @@
6162
.si-asset-icon {
6263
margin-right: 8px;
6364
}
65+
66+
#files{
67+
margin-top:-14px;
68+
}
69+
6470
#files-gallery{
6571
padding-top: 20px;
6672
overflow-y: auto;
67-
height: 460px;
68-
}
69-
.box{
70-
margin-bottom: 20px;
71-
height: 190px;
73+
height: 360px;
7274
}
7375

7476
</style>
@@ -203,9 +205,9 @@ <h4>WARNING</h4>
203205
function loopGallery(index, item) {
204206
var imgUrlThumb = item.thumb_path_prefix + 'Medium.jpg';
205207

206-
var box = $('<div class="col-xs-3 box box-' + index + '"></div>');
208+
var box = $('<div class="col-xs-4 box box-' + index + '"></div>');
207209
var view = $('<div class="view thumb"></div>');
208-
var text = $('<div class="text"><i class="spark_icon si-asset-file-icon"></i>' + common.maxLength(item.caption,7) + '</div>');
210+
var text = $('<div class="text"><i class="spark_icon si-asset-file-icon"></i>' + common.maxLength(item.caption,18) + '</div>');
209211

210212
$('#files-gallery').append(box);
211213
box.append(view);
@@ -242,6 +244,9 @@ <h4>WARNING</h4>
242244
});
243245
} else {
244246
$('#empty-assets').removeClass('hidden');
247+
248+
//broadcast the state to the iframe - intended only for the storage UI
249+
eventBroadCaster.broadcastEvent('emptyAssets');
245250
}
246251
});
247252
}

‎examples/drive/show-asset-thumbnails/index.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<style>
1717
.modal-header {
1818
position: relative;
19-
padding: 8px 20px;
19+
padding: 10px 20px;
2020
}
2121

2222
.modal-header .layouts {
2323
position: absolute;
2424
right: 0;
2525
background-color: #ffffff;
2626
padding-left: 10px;
27+
top:9px;
2728
}
2829

2930
.modal-header .layouts a {
@@ -56,10 +57,14 @@
5657
left: -20px;
5758
}
5859

60+
#files{
61+
margin-top:-14px;
62+
}
63+
5964
.assets-container{
6065
padding-top: 20px;
6166
overflow-y: scroll;
62-
height: 480px;
67+
height: 380px;
6368
}
6469

6570
</style>
@@ -198,6 +203,9 @@ <h4>WARNING</h4>
198203
} else {
199204
$('#empty-files').removeClass('hidden');
200205
$('.upload-link').attr('href', $('.upload-link').attr('href') + '?assetId=' + currentAssetId);
206+
207+
//broadcast the state to the iframe - intended only for the storage UI
208+
eventBroadCaster.broadcastEvent('emptyAssets');
201209
}
202210
});
203211

‎examples/drive/show-my-assets/gallery-view.html‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<style>
1717
.modal-header {
1818
position: relative;
19-
padding: 8px 20px;
19+
padding: 10px 20px;
2020
}
2121

2222
.modal-header .layouts {
2323
position: absolute;
2424
right: 0;
2525
background-color: #ffffff;
2626
padding-left: 10px;
27+
top:9px;
2728
}
2829

2930
.modal-header .layouts a {
@@ -56,13 +57,8 @@
5657
.si-asset-icon {
5758
margin-right: 8px;
5859
}
59-
.box{
60-
margin-bottom: 20px;
61-
height: 190px;
62-
}
6360

6461
.text a{
65-
padding: 8px;
6662
display: block;
6763
color:#333333;
6864
}
@@ -73,10 +69,14 @@
7369
margin-right:10px;
7470
}
7571

72+
#assets{
73+
margin-top:-14px;
74+
}
75+
7676
#assets-gallery{
7777
margin-top: 20px;
7878
overflow-y: auto;
79-
height: 460px;
79+
height: 360px
8080
}
8181

8282
</style>
@@ -206,10 +206,10 @@ <h4>WARNING</h4>
206206
function loopGallery(index, item) {
207207
var imgUrlThumb = item.thumb_path_prefix + 'Medium.jpg';
208208

209-
var box = $('<div class="col-xs-3 box box-' + index + '"></div>');
209+
var box = $('<div class="col-xs-4 box box-' + index + '"></div>');
210210
var view = $('<div class="view thumb"></div>');
211211
var text = $('<div class="text"><a title="' + item.asset_name + '" href="../show-my-assets/files.html?assetId=' + item.asset_id + '">' +
212-
'<i class="spark_icon si-asset-icon"></i>' + common.maxLength(item.asset_name,7) + '</a></div>');
212+
'<i class="spark_icon si-asset-icon"></i>' + common.maxLength(item.asset_name,18) + '</a></div>');
213213

214214
$('#assets-gallery').append(box);
215215
box.append(view);
@@ -245,6 +245,9 @@ <h4>WARNING</h4>
245245
});
246246
} else {
247247
$('#empty-assets').removeClass('hidden');
248+
249+
//broadcast the state to the iframe - intended only for the storage UI
250+
eventBroadCaster.broadcastEvent('emptyAssets');
248251
}
249252

250253
return response;

‎examples/drive/show-my-assets/index.html‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<style>
1717
.modal-header {
1818
position: relative;
19-
padding: 8px 20px;
19+
padding: 10px 20px;
2020
}
2121

2222
.modal-header .layouts {
2323
position: absolute;
2424
right: 0;
2525
background-color: #ffffff;
2626
padding-left: 10px;
27+
top:9px;
2728
}
2829

2930
.modal-header .layouts a {
@@ -56,10 +57,14 @@
5657
left: -20px;
5758
}
5859

60+
#assets{
61+
margin-top:-14px;
62+
}
63+
5964
.assets-container{
6065
margin-top: 20px;
6166
overflow-y: scroll;
62-
height: 480px;
67+
height: 380px;
6368
}
6469

6570
</style>
@@ -236,6 +241,9 @@ <h4>WARNING</h4>
236241
} else {
237242
if (page < 2) {
238243
$('#empty-assets').removeClass('hidden');
244+
245+
//broadcast the state to the iframe - intended only for the storage UI
246+
eventBroadCaster.broadcastEvent('emptyAssets');
239247
}
240248
}
241249

0 commit comments

Comments
 (0)