Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aiccra dev responsive #2494

Merged
merged 4 commits into from
Feb 26, 2024
+131 −85
Merged

Aiccra dev responsive #2494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b93ec7
Merge branch 'aiccra-staging' into aiccra-dev-responsive
kenjitm Feb 21, 2024
2b3f19b
A2-48 - Test requeriments update in homepage
MetalPrime Feb 26, 2024
d20c58c
A2-62 - Test requeriments update in cluster description
MetalPrime Feb 26, 2024
2b3471c
Merge branch 'aiccra-dev' into aiccra-dev-responsive
MetalPrime Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<div class="menuContent">
<div class="container">
<ul class="hidden-md hidden-lg">
<li> <span class="glyphicon glyphicon-menu-hamburger"></span> Main menu
<li> <span class="glyphicon glyphicon-menu-hamburger"></span> <span class="menuContentTitle">Main menu</span>
<ul class="subMenu">
[@mainMenuList /]
</ul>
Expand Down
170 changes: 95 additions & 75 deletions marlo-web/src/main/webapp/crp/css/home/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ span.timelineControl:hover {
position: relative;
scroll-behavior: smooth;
overflow-x: scroll;
width: 100%;
width: 85%;
margin-left: auto;
margin-right: auto;
margin: 0 auto;
Expand All @@ -293,7 +293,7 @@ span.timelineControl:hover {
}

.containerTimeline {
width: 90%;
width: 100%;
position: relative;
}

Expand Down Expand Up @@ -351,11 +351,11 @@ span.timelineControl:hover {
}

.buttonLeftTimeline {
left: -45px;
left: 0.75rem;
}

.buttonRightTimeline {
right: -45px;
right: 0.75rem;
}

.timelineBackSuccess {
Expand Down Expand Up @@ -396,67 +396,6 @@ span.timelineControl:hover {
margin-top: 7px;
}

@media (max-width:750px){

.buttonLeftTimeline {
left: -10px;
}

.buttonRightTimeline {
right: -10px;
}

.timelineAlert {
top: 325px !important;
}

.timelineAlertText {
font-size: 7px;
}

.infTimelineTimeline {
min-width: 180px;
}

.titleTimeline {
height: 142px;
font-size: 10px;
}

.timeline {
height: 243px;
}

.dateTimeline {
margin-right: -130px;
margin-top: -27px;
font-size: 13px;
}


.timeline-line {
width: 180px;
margin-top: -48px;
}

.timeline-pointTimeline {
bottom: 32px;
}

.sideButtonTimeline {
width: 30px;
height: 30px;
font-size: 22px;
top: 40%;
}

.porcentTimeLine {
margin-top: -48px;
max-width: 143px;
}

}

.timelineRefresh{
margin: 30px 0;
display: flex;
Expand Down Expand Up @@ -830,8 +769,9 @@ span.timelineControl:hover {
}

.itemsTablet {
height: 80px;
height: 100px;
margin: 10px;
padding-top: 2rem;
}

.itemsTablet img {
Expand All @@ -855,6 +795,19 @@ span.timelineControl:hover {
font-size: 0.7em;
}

#projects_filter{
width: 100%;
}

#projects_filter label{
width: 100%;
}

.iconSearch{
right: 1.5rem;
margin-top: 0;
}

/*************** sectionMap ********************/
.containerTextMap{
margin: 10px 20px 25px 20px;
Expand All @@ -876,6 +829,73 @@ span.timelineControl:hover {
.containerImgMap img{
width: 100%;
}


/*************** timeline ********************/
.homeTitleTimeline{
font-size: 1.1em;
}

.buttonLeftTimeline {
left: 2rem;
}

.buttonRightTimeline {
right: 2rem;
}

.timelineAlert {
top: 325px !important;
}

.timelineAlertText {
font-size: 7px;
}

.infTimelineTimeline {
min-width: 180px;
}

.titleTimeline {
height: 142px;
font-size: 10px;
}

.timeline {
height: 200px;
}

.dateTimeline {
margin-right: -130px;
margin-top: -27px;
font-size: 13px;
}


.timeline-line {
width: 180px;
margin-top: -48px;
}

.timeline-pointTimeline {
bottom: 32px;
}

.sideButtonTimeline {
width: 30px;
height: 30px;
font-size: 22px;
}

.porcentTimeLine {
margin-top: -48px;
max-width: 143px;
}

.scroll-x-containerTimeline{
width: 80%;
margin-top: 3rem;
}
}

@media only screen and (max-width:440px){
Expand All @@ -900,7 +920,7 @@ span.timelineControl:hover {
}

.itemsTablet{
padding-top: 1rem;
padding-top: 1.5rem;
width: 40%;
}

Expand All @@ -915,11 +935,6 @@ span.timelineControl:hover {
width: auto;
}

.iconSearch{
margin-left: 0;
right: 5%;
}

/*************** sectionMap ********************/

.containerTextMap .titleMap{
Expand Down Expand Up @@ -956,11 +971,16 @@ span.timelineControl:hover {
}

.buttonRightTimeline{
right: 0;
right: 2rem;
}

.buttonLeftTimeline{
left: 0;
left: 2rem;
}

.scroll-x-containerTimeline{
width: 70%;
margin-top: 0;
}

}
Expand All @@ -977,7 +997,7 @@ span.timelineControl:hover {
.dataTables_filter label input{
height: 30px !important;
width: 295px !important;
margin-left: -44px !important;
margin-left: 0 !important;
}

.iconSearch{
Expand Down
2 changes: 1 addition & 1 deletion marlo-web/src/main/webapp/crp/css/projects/projectsList.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
.dataTables_filter label input{
height: 30px !important;
width: 295px !important;
margin-left: -44px !important;
margin-left: 0 !important;
}

.iconSearch{
Expand Down
11 changes: 9 additions & 2 deletions marlo-web/src/main/webapp/crp/js/home/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,9 @@ $('table.projectsList').dataTable({
var iconSearch = $("<div></div>").addClass("iconSearch");
var divDataTables_filter = $('.dataTables_filter').parent();
iconSearch.append('<img src="' + baseUrl + '/global/images/search_outline.png" alt="Imagen" style="width: 24px; margin: auto;" >');
iconSearch.prependTo(divDataTables_filter)
iconSearch.prependTo(divDataTables_filter);


var divDataTables_length =$('.dataTables_length').parent();
divDataTables_length.css("position", "absolute");
divDataTables_length.css("bottom", "8px");
Expand All @@ -470,12 +472,17 @@ var windowWidth = $(window).width();


if (windowWidth < 768) {

divDataTables_filter.css({
"width": "100%",
});

divDataTables_length.css({
"left": "30vw",
"bottom": "0",
"margin-top": "4rem",
"margin-left": "0"
})
});
}

if (windowWidth < 440) {
Expand Down
2 changes: 1 addition & 1 deletion marlo-web/src/main/webapp/global/bower_components/datatables.net/js/jquery.dataTables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11636,7 +11636,7 @@
* } );
* } );
*/
"sSearch": "Search:",
"sSearch": "",


/**
Expand Down
2 changes: 1 addition & 1 deletion marlo-web/src/main/webapp/global/bower_components/datatables/media/js/jquery.dataTables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11637,7 +11637,7 @@
* } );
* } );
*/
"sSearch": "Search:",
"sSearch": "",


/**
Expand Down
8 changes: 4 additions & 4 deletions marlo-web/src/main/webapp/global/css/customDataTable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ table.dataTable a {

@media only screen and (max-width:768px){

.dataTables_filter label input{
width: 100% !important;
}

.dataTables_paginate{
margin-bottom: 3rem !important;
}
Expand All @@ -191,10 +195,6 @@ table.dataTable a {
width: 100%;
}

.dataTables_filter label input{
width: 100% !important;
}

.dataTables_paginate{
margin-bottom: 32px !important;
}
Expand Down
19 changes: 19 additions & 0 deletions marlo-web/src/main/webapp/global/css/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8182,10 +8182,26 @@ img.qaOptionsComment {
.usersInfo{
padding-left: 2rem;
}

#mainMenu .menuContent.positionFixedTop #userInfo{
padding: 9px 22px 3px 20px;
}

a#userLogOut{
top: auto;
}
/************* 2.1. SUPERADMIN ***************/
/************* 3. MAIN MENU ***************/
/************* BODY ***************/

.headTitle{
text-align: center;
}

#top-quote{
margin-top: 1rem;
text-align: center;
}
/************* FOOTER ***************/

#guide-button{
Expand Down Expand Up @@ -8284,6 +8300,9 @@ img.qaOptionsComment {
#mainMenu .menuContent ul li{
font-size: 0.9em;
}
.menuContentTitle{
display: none;
}

/************* BODY ***************/

Expand Down
Loading