Skip to content

Commit 1b3ccf7

Browse files
committed
merge branch feature/rwd
2 parents 4bad317 + 7fdd32a commit 1b3ccf7

File tree

12 files changed

+1095
-206
lines changed

12 files changed

+1095
-206
lines changed

docs/integration.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Check `vendor/unisharp/laravel-filemanager/src/views/demo.blade.php`, which alre
3636
```
3737

3838
### Option 2: TinyMCE4
39+
<<<<<<< HEAD
3940

4041
```html
4142
<script src="//cdn.tinymce.com/4/tinymce.min.js"></script>

public/css/lfm.css

Lines changed: 50 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,50 @@
1+
@media screen and (max-width: 768px) {
2+
#main {
3+
padding: 0px;
4+
}
5+
#nav {
6+
margin-bottom: -1px;
7+
}
8+
#content > .row {
9+
margin: 0px;
10+
}
11+
}
12+
13+
@media screen and (min-width: 768px) {
14+
#main {
15+
border-left: 1px solid silver;
16+
}
17+
}
18+
119
#wrapper {
2-
min-height: calc(100vh - 20px);
3-
margin-bottom: 10px;
4-
margin-top: 10px;
20+
padding: 0px;
21+
}
22+
23+
#wrapper > .panel {
24+
border-radius: 0;
25+
}
26+
27+
#wrapper > .panel > .panel-heading {
28+
border-radius: 0;
529
}
630

7-
#main {
8-
border-left: 1px solid silver;
9-
min-height: calc(100vh - 90px);
31+
#wrapper > .panel > .panel-heading > .panel-title {
32+
padding: 10px 0;
33+
}
34+
35+
#wrapper > .row {
36+
margin: 0px;
37+
}
38+
39+
#fab a:hover, #fab a:focus{
40+
color: white;
41+
}
42+
43+
.item_name {
44+
width: 120px;
45+
overflow:hidden;
46+
white-space:nowrap;
47+
text-overflow: ellipsis;
1048
}
1149

1250
.img-row {
@@ -32,7 +70,12 @@
3270
.thumbnail {
3371
max-width: 210px;
3472
max-height: 210px;
35-
margin-bottom: 10px;
73+
margin-bottom: 0 !important;
74+
}
75+
76+
.thumbnail-mobile {
77+
height: 60px;
78+
width: 60px;
3679
}
3780

3881
.square {

0 commit comments

Comments
 (0)