Skip to content

Commit 073b889

Browse files
author
Mostafa Moradi
committed
mobile responsive issues resolved
1 parent f41574f commit 073b889

File tree

5 files changed

+45
-31
lines changed

5 files changed

+45
-31
lines changed

resources/css/ocify-sidebar.css

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1-
#main {
2-
margin-left: 315px;
3-
transition: margin-left 0.3s ease-in-out;
4-
}
5-
#main .top-bar {
6-
width: calc(100% - 300px);
7-
transition: width 0.3s ease-in-out;
8-
padding-left: 20px;
1+
@media (min-width: 768px) {
2+
#main {
3+
margin-left: 315px;
4+
transition: margin-left 0.3s ease-in-out;
5+
}
6+
#main .top-bar {
7+
width: calc(100% - 300px);
8+
transition: width 0.3s ease-in-out;
9+
padding-left: 28px;
10+
}
11+
#footer {
12+
margin-left: 300px;
13+
transition: margin-left 0.3s ease-in-out;
14+
}
915
}
16+
1017
#main.wide-content {
11-
margin-left: 125px;
18+
margin-left: 0;
1219
}
1320
#main.wide-content .top-bar {
14-
width: calc(100% - 110px);
15-
}
16-
#footer {
17-
margin-left: 300px;
18-
transition: margin-left 0.3s ease-in-out;
21+
width: 100%;
22+
padding-left: 55px;
1923
}
2024
#footer.wide-content {
21-
margin-left: 110px;
25+
margin-left: 0;
2226
}
2327
#wrapper {
2428
background-color: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }};
@@ -57,15 +61,15 @@
5761
}
5862
#wrapper .logo-bar #menu-toggle-2 {
5963
position: absolute;
60-
right: 0;
64+
right: -16px;
6165
width: 34px;
6266
height: 34px;
6367
display: flex;
6468
align-items: center;
6569
justify-content: center;
66-
background: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }};
70+
background: rgba(24, 201, 65, .9);
6771
backdrop-filter: blur(68.49px);
68-
border-radius: 18.264px;
72+
border-radius: 0 5px 5px 0;
6973
transform: translateX(50%);
7074
box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.1);
7175
}
@@ -85,7 +89,6 @@
8589
display: flex;
8690
border-radius: 8px;
8791
border: 1px solid rgba(220, 220, 220, 0.3);
88-
margin: 2em 0;
8992
}
9093
#wrapper .sidebar-wrapper #search .search-bar {
9194
flex: 1;
@@ -234,6 +237,7 @@
234237
}
235238
#wrapper.toggled-2 {
236239
width: 110px;
240+
left:-110px;
237241
}
238242
#wrapper.toggled-2 .title, #wrapper.toggled-2 .group-sublist, #wrapper.toggled-2 #search, #wrapper.toggled-2 .sidebar-nav i {
239243
display: none;

resources/css/theme.css

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3397,13 +3397,14 @@ border-color: {{setting_value('visiosoft.theme.defaultadmin::input_focused_borde
33973397

33983398
.breadcrumb {
33993399
border-radius: 0 !important;
3400-
background-color: {{ setting_value('visiosoft.theme.defaultadmin::background_color') }} !important;
3400+
background-color: {{ setting_value('visiosoft.theme.defaultadmin::block_background_color') }} !important;
34013401
font-size: 0.8rem;
34023402
margin-top: 15px !important;
34033403
margin-bottom: 0 !important;
34043404
padding-top: 0 !important;
34053405
padding-bottom: 0 !important;
34063406
}
3407+
34073408
.breadcrumb li.active {
34083409
background-color: inherit !important;
34093410
}
@@ -3499,12 +3500,22 @@ body.sidebars--static .logo {
34993500
}
35003501

35013502
@media (max-width: 991px) {
3503+
.breadcrumb {
3504+
border-radius: 0 !important;
3505+
background-color: {{ setting_value('visiosoft.theme.defaultadmin::background_color') }} !important;
3506+
font-size: 0.8rem;
3507+
margin-top: 15px !important;
3508+
margin-bottom: 0 !important;
3509+
padding-top: 0 !important;
3510+
padding-bottom: 0 !important;
3511+
}
35023512
.login-form-block .form-control {
35033513
min-width: 200px;
35043514
}
35053515
.top-bar {
3506-
background: {{ setting_value('visiosoft.theme.defaultadmin::secondary_color')}};
3507-
width: calc(100% - 60px);
3516+
background: {{ setting_value('visiosoft.theme.defaultadmin::background_color') }};
3517+
width: 100%;
3518+
padding-left: 28px;
35083519
}
35093520

35103521
.top-bar .user-action-dropdown {

resources/js/ocify-sidebar.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1+
if (window.innerWidth <= 768) {
2+
$("#wrapper").addClass('toggled-2');
3+
}
14
$("#menu-toggle").click(function (e) {
25
e.preventDefault();
3-
$("#wrapper").toggleClass("toggled");
6+
$("#wrapper").toggleClass('toggled');
47
});
58
$("#menu-toggle-2").click(function (e) {
69
e.preventDefault();
7-
$("#wrapper").toggleClass("toggled-2");
8-
$(".top-bar").toggleClass("wide-top-bar");
9-
$("#main, #footer").toggleClass("wide-content");
10-
11-
$("#menu-toggle-2 i").toggleClass("fa-angle-left fa-angle-right");
10+
$("#wrapper").toggleClass('toggled-2');
11+
$(".top-bar").toggleClass('wide-top-bar');
12+
$("#main, #footer").toggleClass('wide-content');
1213
});
1314

14-
1515
function flexExpended(class_name) {
1616
$(class_name).on('click', function () {
1717
if ($(this).attr('aria-expanded') === "false") {

resources/js/theme/initialize.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ $(document).on('ready', function () {
1515

1616
// Initialize scrollbars.
1717
$('.scrollbar').perfectScrollbar();
18-
1918
// Flush the footer to the bottom.
2019
$('#main').css('min-height', $(window).height() - $('#brand').outerHeight() - $('#footer').outerHeight() - 24);
2120

resources/views/partials/interactiveMenu.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</div>
1515

1616
<div id="menu-toggle-2">
17-
<i class="fa fa-angle-left"></i>
17+
<i class="fa fa-bars"></i>
1818
</div>
1919
</div>
2020

0 commit comments

Comments
 (0)