Skip to content

Commit 97db81f

Browse files
streamtwstreamtw
committed
fix wrapper padding issue
1 parent 51152de commit 97db81f

File tree

3 files changed

+107
-98
lines changed

3 files changed

+107
-98
lines changed

‎public/css/lfm.css‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
1+
@media screen and (max-width: 768px) {
2+
#main {
3+
padding: 0px;
4+
}
5+
}
6+
7+
@media screen and (min-width: 768px) {
8+
#main {
9+
border-left: 1px solid silver;
10+
}
11+
}
12+
113
#wrapper {
2-
margin: 10px;
14+
padding: 0px;
315
}
416

5-
#main {
6-
border-left: 1px solid silver;
17+
#wrapper > .panel {
18+
border-radius: 0;
719
}
820

9-
#fab a:hover, #fab a:focus{
10-
color: white;
21+
#wrapper > .panel > .panel-heading {
22+
border-radius: 0;
1123
}
1224

13-
@media screen and (max-width: 992px) {
14-
#nav a {
15-
font-size: 30px;
16-
padding-top: 40px;
17-
padding-bottom: 40px;
18-
}
19-
#nav a i {
20-
padding-bottom: 10px;
21-
}
22-
#fab {
23-
zoom: 2.5;
24-
}
25+
#wrapper > .panel > .panel-heading > .panel-title {
26+
padding: 10px 0;
27+
}
28+
29+
#wrapper > .row {
30+
margin: 0px;
31+
}
32+
33+
#fab a:hover, #fab a:focus{
34+
color: white;
2535
}
2636

2737
.img-row {
@@ -51,9 +61,8 @@
5161
}
5262

5363
.thumbnail-mobile {
54-
height: 210px;
55-
width: 210px;
56-
margin: 30px;
64+
height: 60px;
65+
width: 60px;
5766
}
5867

5968
.square {

‎src/views/index.blade.php‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -8,94 +8,94 @@
88
<meta name="msapplication-navbutton-color" content="#75C7C3">
99
<!-- iOS Safari -->
1010
<meta name="apple-mobile-web-app-status-bar-style" content="#75C7C3">
11+
<meta name="viewport" content="width=device-width; initial-scale=1;">
1112
<title>{{ trans('laravel-filemanager::lfm.title-page') }}</title>
1213
<link rel="shortcut icon" type="image/png" href="{{ asset('vendor/laravel-filemanager/img/folder.png') }}">
1314
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
1415
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
1516
<link rel="stylesheet" href="{{ asset('vendor/laravel-filemanager/css/cropper.min.css') }}">
16-
<link rel="stylesheet" href="{{ asset('/vendor/laravel-filemanager/css/lfm.css') }}">
17+
<style>{!! \File::get(base_path('vendor/unisharp/laravel-filemanager/public/css/lfm.css')) !!}</style>
18+
{{-- Use the line below instead of the above if you need to cache the css. --}}
19+
{{-- <link rel="stylesheet" href="{{ asset('/vendor/laravel-filemanager/css/lfm.css') }}"> --}}
1720
<link rel="stylesheet" href="{{ asset('vendor/laravel-filemanager/css/mfb.css') }}">
1821
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.css">
1922
</head>
2023
<body>
21-
<div class="container-fluid" style="padding:0">
22-
<div class="panel panel-primary hidden-sm" style="margin:0;border-radius:0">
23-
<div class="panel-heading" style="border-radius:0">
24-
<h1 class="panel-title" style="padding:10px 0 10px 0">{{ trans('laravel-filemanager::lfm.title-panel') }}</h1>
25-
</div>
24+
<div class="container-fluid" id="wrapper">
25+
<div class="panel panel-primary hidden-xs">
26+
<div class="panel-heading">
27+
<h1 class="panel-title">{{ trans('laravel-filemanager::lfm.title-panel') }}</h1>
28+
</div>
29+
</div>
30+
<div class="row">
31+
<div class="col-sm-2 hidden-xs">
32+
<div id="tree"></div>
2633
</div>
27-
<div id="wrapper">
28-
<div class="row">
29-
<div class="col-md-2 hidden-sm">
30-
<div id="tree"></div>
31-
</div>
3234

33-
<div class="col-md-10 col-sm-12" id="main">
34-
<nav class="navbar navbar-default" id="nav">
35-
<div class="navbar-header">
36-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
37-
<span class="sr-only">Toggle navigation</span>
38-
<span class="icon-bar"></span>
39-
<span class="icon-bar"></span>
40-
<span class="icon-bar"></span>
41-
</button>
42-
</div>
43-
<div class="collapse navbar-collapse">
44-
<ul class="nav navbar-nav" id="nav-buttons">
35+
<div class="col-sm-10 col-xs-12" id="main">
36+
<nav class="navbar navbar-default" id="nav">
37+
<div class="navbar-header">
38+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
39+
<span class="sr-only">Toggle navigation</span>
40+
<span class="icon-bar"></span>
41+
<span class="icon-bar"></span>
42+
<span class="icon-bar"></span>
43+
</button>
44+
</div>
45+
<div class="collapse navbar-collapse">
46+
<ul class="nav navbar-nav" id="nav-buttons">
47+
<li>
48+
<a class="pointer hide" id="to-previous">
49+
<i class="fa fa-arrow-left"></i>
50+
<span>{{ trans('laravel-filemanager::lfm.nav-back') }}</span>
51+
</a>
52+
</li>
53+
</ul>
54+
<ul class="nav navbar-nav navbar-right" id="bs-example-navbar-collapse-1">
55+
<li class="dropdown">
56+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-picture-o"></i> <span class="caret"></span></a>
57+
<ul class="dropdown-menu">
4558
<li>
46-
<a class="pointer hide" id="to-previous">
47-
<i class="fa fa-arrow-left"></i>
48-
<span>{{ trans('laravel-filemanager::lfm.nav-back') }}</span>
59+
<a class="pointer" id="thumbnail-display">
60+
<i class="fa fa-th-large"></i>
61+
<span>{{ trans('laravel-filemanager::lfm.nav-thumbnails') }}</span>
4962
</a>
5063
</li>
51-
</ul>
52-
<ul class="nav navbar-nav navbar-right">
53-
<li class="dropdown">
54-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-picture-o"></i> <span class="caret"></span></a>
55-
<ul class="dropdown-menu">
56-
<li>
57-
<a class="pointer" id="thumbnail-display">
58-
<i class="fa fa-th-large"></i>
59-
<span>{{ trans('laravel-filemanager::lfm.nav-thumbnails') }}</span>
60-
</a>
61-
</li>
62-
<li>
63-
<a class="pointer" id="list-display">
64-
<i class="fa fa-list"></i>
65-
<span>{{ trans('laravel-filemanager::lfm.nav-list') }}</span>
66-
</a>
67-
</li>
68-
</ul>
64+
<li>
65+
<a class="pointer" id="list-display">
66+
<i class="fa fa-list"></i>
67+
<span>{{ trans('laravel-filemanager::lfm.nav-list') }}</span>
68+
</a>
6969
</li>
7070
</ul>
71-
</div>
72-
</nav>
73-
74-
<div id="alerts"></div>
75-
76-
<div id="content"></div>
77-
</div>
78-
</div>
79-
80-
<ul id="fab">
81-
<li>
82-
<a href="#"></a>
83-
<ul class="hide">
84-
<li>
85-
<a href="#" id="add-folder" data-mfb-label="{{ trans('laravel-filemanager::lfm.nav-new') }}">
86-
<i class="fa fa-folder"></i>
87-
</a>
88-
</li>
89-
<li>
90-
<a href="#" id="upload" data-mfb-label="{{ trans('laravel-filemanager::lfm.nav-upload') }}">
91-
<i class="fa fa-upload"></i>
92-
</a>
9371
</li>
9472
</ul>
95-
</li>
96-
</ul>
73+
</div>
74+
</nav>
75+
76+
<div id="alerts"></div>
77+
78+
<div id="content"></div>
9779
</div>
9880

81+
<ul id="fab">
82+
<li>
83+
<a href="#"></a>
84+
<ul class="hide">
85+
<li>
86+
<a href="#" id="add-folder" data-mfb-label="{{ trans('laravel-filemanager::lfm.nav-new') }}">
87+
<i class="fa fa-folder"></i>
88+
</a>
89+
</li>
90+
<li>
91+
<a href="#" id="upload" data-mfb-label="{{ trans('laravel-filemanager::lfm.nav-upload') }}">
92+
<i class="fa fa-upload"></i>
93+
</a>
94+
</li>
95+
</ul>
96+
</li>
97+
</ul>
98+
</div>
9999
</div>
100100

101101
<div class="modal fade" id="uploadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -139,9 +139,9 @@
139139
var lfm_route = "{{ url(config('lfm.prefix')) }}";
140140
var lang = {!! json_encode(trans('laravel-filemanager::lfm')) !!};
141141
</script>
142-
<script src="{{ asset('vendor/laravel-filemanager/js/script.js') }}"></script>
143-
{{-- Use the line below instead of the above if you need to ignore browser cache. --}}
144-
<!-- <script>{!! \File::get(base_path('vendor/unisharp/laravel-filemanager/public/js/script.js')) !!}</script> -->
142+
<script>{!! \File::get(base_path('vendor/unisharp/laravel-filemanager/public/js/script.js')) !!}</script>
143+
{{-- Use the line below instead of the above if you need to cache the script. --}}
144+
{{-- <script src="{{ asset('vendor/laravel-filemanager/js/script.js') }}"></script> --}}
145145
<script>
146146
$.fn.fab = function () {
147147
var menu = this;

‎src/views/list-view.blade.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@if((sizeof($files) > 0) || (sizeof($directories) > 0))
2-
<table class="table table-condensed table-striped hidden-sm">
2+
<table class="table table-responsive table-condensed table-striped hidden-xs">
33
<thead>
44
<th style='width:50%;'>{{ Lang::get('laravel-filemanager::lfm.title-item') }}</th>
55
<th>{{ Lang::get('laravel-filemanager::lfm.title-size') }}</th>
@@ -29,7 +29,7 @@
2929
<i class="fa {{ $file->icon }}"></i>
3030
<?php $file_name = $file->name;?>
3131
<a href="javascript:useFile('{{ $file_name }}')" id="{{ $file_name }}" data-url="{{ $file->url }}">
32-
{{ $file_name }}
32+
{{ str_limit($file_name, $limit = 20, $end = '...') }}
3333
</a>
3434
&nbsp;&nbsp;
3535
<a href="javascript:rename('{{ $file_name }}')">
@@ -63,12 +63,12 @@
6363
</tbody>
6464
</table>
6565

66-
<table class="table visible-sm">
66+
<table class="table visible-xs">
6767
<tbody>
6868
@foreach($items as $item)
6969
<tr>
7070
<td>
71-
<div class="media">
71+
<div class="media" style="height: 70px;">
7272
<div class="media-left">
7373
<div class="clickable thumbnail-mobile">
7474
@if(!$item->is_file)
@@ -86,9 +86,9 @@
8686
</div>
8787
</div>
8888
</div>
89-
<div class="media-body" style="padding-top: 40px;padding-bottom: 40px">
89+
<div class="media-body" style="padding-top: 10px;">
9090
<div class="media-heading">
91-
<p style="font-size:70px">
91+
<p>
9292
@if(!$item->is_file)
9393
<a class="folder-item clickable" data-id="{{ $item->path }}">
9494
@else
@@ -102,7 +102,7 @@
102102
</a> --}}
103103
</p>
104104
</div>
105-
<p style="font-size:50px;color: #aaa;font-weight: 400">{{ $item->time }}</p>
105+
<p style="color: #aaa;font-weight: 400">{{ $item->time }}</p>
106106
</div>
107107
</div>
108108
</td>

0 commit comments

Comments
 (0)