Merge pull request #2686 from brkcvn/master
Dashboard responsive control & Parent&Child icon control
This commit is contained in:
commit
c2aee62770
54
public/css/app.css
vendored
54
public/css/app.css
vendored
@ -1618,6 +1618,36 @@ input[type="date"]::-webkit-inner-spin-button,
|
||||
height: 4rem;
|
||||
}
|
||||
|
||||
/* widget container name will change as lg:px-12 on database. When container class name change on database, this code will clean */
|
||||
|
||||
.dashboard .px-12{
|
||||
padding-left: 0px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
@media (min-width: 1024px){
|
||||
|
||||
.dashboard .px-12{
|
||||
padding-left: 3rem;
|
||||
padding-right: 3rem;
|
||||
}
|
||||
}
|
||||
|
||||
.dashboard .px-6{
|
||||
padding-left: 0px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
@media (min-width: 1024px){
|
||||
|
||||
.dashboard .px-6{
|
||||
padding-left: 1.5rem;
|
||||
padding-right: 1.5rem;
|
||||
}
|
||||
}
|
||||
|
||||
/* widget container name will change as lg:px-12 on database. When container class name change on database, this code will clean */
|
||||
|
||||
*, ::before, ::after{
|
||||
--tw-translate-x: 0;
|
||||
--tw-translate-y: 0;
|
||||
@ -49999,6 +50029,30 @@ body{
|
||||
}
|
||||
|
||||
@media (min-width: 1024px){
|
||||
.dashboard .lg\:px-12{
|
||||
padding-left: 0px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
@media (min-width: 1024px){
|
||||
|
||||
.dashboard .lg\:px-12{
|
||||
padding-left: 3rem;
|
||||
padding-right: 3rem;
|
||||
}
|
||||
}
|
||||
|
||||
.dashboard .lg\:px-6{
|
||||
padding-left: 0px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
@media (min-width: 1024px){
|
||||
|
||||
.dashboard .lg\:px-6{
|
||||
padding-left: 1.5rem;
|
||||
padding-right: 1.5rem;
|
||||
}
|
||||
}
|
||||
|
||||
.lg\:absolute{
|
||||
position: absolute;
|
||||
|
@ -842,7 +842,8 @@ export default {
|
||||
if (!check) {
|
||||
this.sorted_options.push({
|
||||
key: option.id.toString(),
|
||||
value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name
|
||||
value: (option.title) ? option.title : (option.display_name) ? option.display_name : option.name,
|
||||
level: (option.parent_id) ? 1 : 0 // 0: parent, 1: child. Level data get 0 via backend. This control will refactor.
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -165,19 +165,19 @@ export default {
|
||||
widthOptions: [
|
||||
{
|
||||
label: '25%',
|
||||
value: 'w-full lg:w-1/4 px-6'
|
||||
value: 'w-full lg:w-1/4 lg:px-6'
|
||||
},
|
||||
{
|
||||
label: '33%',
|
||||
value: 'w-full lg:w-1/3 px-6'
|
||||
value: 'w-full lg:w-1/3 lg:px-6'
|
||||
},
|
||||
{
|
||||
label: '50%',
|
||||
value: 'w-full lg:w-2/4 px-12'
|
||||
value: 'w-full lg:w-2/4 lg:px-12'
|
||||
},
|
||||
{
|
||||
label: '100%',
|
||||
value: 'w-full px-12'
|
||||
value: 'w-full lg:px-12'
|
||||
}
|
||||
],
|
||||
form: {
|
||||
|
9
resources/assets/sass/app.css
vendored
9
resources/assets/sass/app.css
vendored
@ -203,6 +203,15 @@
|
||||
overflow: hidden;
|
||||
height: 4rem;
|
||||
}
|
||||
/* widget container name will change as lg:px-12 on database. When container class name change on database, this code will clean */
|
||||
.dashboard .px-12 {
|
||||
@apply px-0 lg:pl-12 lg:pr-12;
|
||||
}
|
||||
|
||||
.dashboard .px-6 {
|
||||
@apply px-0 lg:pl-6 lg:pr-6;
|
||||
}
|
||||
/* widget container name will change as lg:px-12 on database. When container class name change on database, this code will clean */
|
||||
}
|
||||
|
||||
/* menu */
|
||||
|
Loading…
x
Reference in New Issue
Block a user