Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchParapheur
Manage
Activity
Members
Plan
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchParapheur
Commits
0d1ce5ca
Commit
0d1ce5ca
authored
4 years ago
by
Hamza HRAMCHI
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #15550 TIME 1:50 adapt the width of right menu according to the device
parent
07afe747
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/frontend/app/app.component.html
+1
-1
1 addition, 1 deletion
src/frontend/app/app.component.html
src/frontend/app/app.component.scss
+6
-0
6 additions, 0 deletions
src/frontend/app/app.component.scss
src/frontend/app/app.component.ts
+9
-3
9 additions, 3 deletions
src/frontend/app/app.component.ts
with
16 additions
and
4 deletions
src/frontend/app/app.component.html
+
1
−
1
View file @
0d1ce5ca
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<div
id=
"leftContent"
style=
"display: contents;"
></div>
<div
id=
"leftContent"
style=
"display: contents;"
></div>
</ion-menu>
</ion-menu>
<ion-router-outlet
id=
"main-content"
></ion-router-outlet>
<ion-router-outlet
id=
"main-content"
></ion-router-outlet>
<ion-menu
c
lass=
"
right-menu
"
#rightMenu
menuId=
"right-menu"
contentId=
"main-content"
side=
"end"
type=
"overlay"
disabled
(ionDidOpen)=
"showRightContent=true"
<ion-menu
[ngC
lass
]
=
"
[isPortrait ? 'right-menu' : 'right-menu-responsive']
"
#rightMenu
menuId=
"right-menu"
contentId=
"main-content"
side=
"end"
type=
"overlay"
disabled
(ionDidOpen)=
"showRightContent=true"
(ionDidClose)=
"showRightContent=false"
>
(ionDidClose)=
"showRightContent=false"
>
<div
id=
"rightContent"
style=
"display: contents;"
></div>
<div
id=
"rightContent"
style=
"display: contents;"
></div>
</ion-menu>
</ion-menu>
...
...
This diff is collapsed.
Click to expand it.
src/frontend/app/app.component.scss
+
6
−
0
View file @
0d1ce5ca
...
@@ -10,6 +10,12 @@
...
@@ -10,6 +10,12 @@
--max-width
:
350px
%
;
--max-width
:
350px
%
;
}
}
.right-menu-responsive
{
--width
:
89%
;
--min-width
:
89%
;
--max-width
:
89%
;
}
.split-pane-ios.split-pane-visible
>
.left-menu
,
.split-pane-ios.split-pane-visible
>
.left-menu
,
.split-pane-md.split-pane-visible
>
.left-menu
{
.split-pane-md.split-pane-visible
>
.left-menu
{
max-width
:
350px
;
max-width
:
350px
;
...
...
This diff is collapsed.
Click to expand it.
src/frontend/app/app.component.ts
+
9
−
3
View file @
0d1ce5ca
...
@@ -11,7 +11,7 @@ import { AuthService } from './service/auth.service';
...
@@ -11,7 +11,7 @@ import { AuthService } from './service/auth.service';
import
{
MenuController
}
from
'
@ionic/angular
'
;
import
{
MenuController
}
from
'
@ionic/angular
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
Router
}
from
'
@angular/router
'
;
import
{
environment
}
from
'
../core/environments/environment
'
;
import
{
environment
}
from
'
../core/environments/environment
'
;
import
{
Platform
}
from
'
@ionic/angular
'
;
@
Component
({
@
Component
({
selector
:
'
app-root
'
,
selector
:
'
app-root
'
,
templateUrl
:
'
app.component.html
'
,
templateUrl
:
'
app.component.html
'
,
...
@@ -20,7 +20,8 @@ import { environment } from '../core/environments/environment';
...
@@ -20,7 +20,8 @@ import { environment } from '../core/environments/environment';
})
})
export
class
AppComponent
{
export
class
AppComponent
{
debugMode
:
boolean
=
false
;
isPortrait
:
boolean
;
debugMode
:
boolean
;
showLeftContent
:
boolean
=
false
;
showLeftContent
:
boolean
=
false
;
showRightContent
:
boolean
=
false
;
showRightContent
:
boolean
=
false
;
constructor
(
private
translate
:
TranslateService
,
constructor
(
private
translate
:
TranslateService
,
...
@@ -32,7 +33,8 @@ export class AppComponent {
...
@@ -32,7 +33,8 @@ export class AppComponent {
public
dialog
:
MatDialog
,
iconReg
:
MatIconRegistry
,
public
dialog
:
MatDialog
,
iconReg
:
MatIconRegistry
,
public
authService
:
AuthService
,
public
authService
:
AuthService
,
private
menu
:
MenuController
,
private
menu
:
MenuController
,
public
router
:
Router
public
router
:
Router
,
public
platform
:
Platform
)
{
)
{
iconReg
.
addSvgIcon
(
'
maarchLogo
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
../src/frontend/assets/logo_white.svg
'
));
iconReg
.
addSvgIcon
(
'
maarchLogo
'
,
sanitizer
.
bypassSecurityTrustResourceUrl
(
'
../src/frontend/assets/logo_white.svg
'
));
...
@@ -46,6 +48,10 @@ export class AppComponent {
...
@@ -46,6 +48,10 @@ export class AppComponent {
if
(
!
environment
.
production
)
{
if
(
!
environment
.
production
)
{
this
.
debugMode
=
true
;
this
.
debugMode
=
true
;
}
}
this
.
platform
.
resize
.
subscribe
(
async
()
=>
{
this
.
isPortrait
=
this
.
platform
.
isPortrait
()
?
true
:
false
;
});
}
}
test
()
{
test
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment