Skip to content

Commit a2f2037

Browse files
MetalPrimeMetalPrime
authored
Merge pull request #2494 from CCAFS/aiccra-dev-responsive
Aiccra dev responsive
2 parents b363cfb + 2b3471c commit a2f2037

File tree

8 files changed

+131
-85
lines changed

8 files changed

+131
-85
lines changed

‎marlo-web/src/main/webapp/WEB-INF/global/pages/main-menu.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<div class="menuContent">
121121
<div class="container">
122122
<ul class="hidden-md hidden-lg">
123-
<li> <span class="glyphicon glyphicon-menu-hamburger"></span> Main menu
123+
<li> <span class="glyphicon glyphicon-menu-hamburger"></span> <span class="menuContentTitle">Main menu</span>
124124
<ul class="subMenu">
125125
[@mainMenuList /]
126126
</ul>

‎marlo-web/src/main/webapp/crp/css/home/dashboard.css

Lines changed: 95 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ span.timelineControl:hover {
274274
position: relative;
275275
scroll-behavior: smooth;
276276
overflow-x: scroll;
277-
width: 100%;
277+
width: 85%;
278278
margin-left: auto;
279279
margin-right: auto;
280280
margin: 0 auto;
@@ -293,7 +293,7 @@ span.timelineControl:hover {
293293
}
294294

295295
.containerTimeline {
296-
width: 90%;
296+
width: 100%;
297297
position: relative;
298298
}
299299

@@ -351,11 +351,11 @@ span.timelineControl:hover {
351351
}
352352

353353
.buttonLeftTimeline {
354-
left: -45px;
354+
left: 0.75rem;
355355
}
356356

357357
.buttonRightTimeline {
358-
right: -45px;
358+
right: 0.75rem;
359359
}
360360

361361
.timelineBackSuccess {
@@ -396,67 +396,6 @@ span.timelineControl:hover {
396396
margin-top: 7px;
397397
}
398398

399-
@media (max-width:750px){
400-
401-
.buttonLeftTimeline {
402-
left: -10px;
403-
}
404-
405-
.buttonRightTimeline {
406-
right: -10px;
407-
}
408-
409-
.timelineAlert {
410-
top: 325px !important;
411-
}
412-
413-
.timelineAlertText {
414-
font-size: 7px;
415-
}
416-
417-
.infTimelineTimeline {
418-
min-width: 180px;
419-
}
420-
421-
.titleTimeline {
422-
height: 142px;
423-
font-size: 10px;
424-
}
425-
426-
.timeline {
427-
height: 243px;
428-
}
429-
430-
.dateTimeline {
431-
margin-right: -130px;
432-
margin-top: -27px;
433-
font-size: 13px;
434-
}
435-
436-
437-
.timeline-line {
438-
width: 180px;
439-
margin-top: -48px;
440-
}
441-
442-
.timeline-pointTimeline {
443-
bottom: 32px;
444-
}
445-
446-
.sideButtonTimeline {
447-
width: 30px;
448-
height: 30px;
449-
font-size: 22px;
450-
top: 40%;
451-
}
452-
453-
.porcentTimeLine {
454-
margin-top: -48px;
455-
max-width: 143px;
456-
}
457-
458-
}
459-
460399
.timelineRefresh{
461400
margin: 30px 0;
462401
display: flex;
@@ -830,8 +769,9 @@ span.timelineControl:hover {
830769
}
831770

832771
.itemsTablet {
833-
height: 80px;
772+
height: 100px;
834773
margin: 10px;
774+
padding-top: 2rem;
835775
}
836776

837777
.itemsTablet img {
@@ -855,6 +795,19 @@ span.timelineControl:hover {
855795
font-size: 0.7em;
856796
}
857797

798+
#projects_filter{
799+
width: 100%;
800+
}
801+
802+
#projects_filter label{
803+
width: 100%;
804+
}
805+
806+
.iconSearch{
807+
right: 1.5rem;
808+
margin-top: 0;
809+
}
810+
858811
/*************** sectionMap ********************/
859812
.containerTextMap{
860813
margin: 10px 20px 25px 20px;
@@ -876,6 +829,73 @@ span.timelineControl:hover {
876829
.containerImgMap img{
877830
width: 100%;
878831
}
832+
833+
834+
/*************** timeline ********************/
835+
.homeTitleTimeline{
836+
font-size: 1.1em;
837+
}
838+
839+
.buttonLeftTimeline {
840+
left: 2rem;
841+
}
842+
843+
.buttonRightTimeline {
844+
right: 2rem;
845+
}
846+
847+
.timelineAlert {
848+
top: 325px !important;
849+
}
850+
851+
.timelineAlertText {
852+
font-size: 7px;
853+
}
854+
855+
.infTimelineTimeline {
856+
min-width: 180px;
857+
}
858+
859+
.titleTimeline {
860+
height: 142px;
861+
font-size: 10px;
862+
}
863+
864+
.timeline {
865+
height: 200px;
866+
}
867+
868+
.dateTimeline {
869+
margin-right: -130px;
870+
margin-top: -27px;
871+
font-size: 13px;
872+
}
873+
874+
875+
.timeline-line {
876+
width: 180px;
877+
margin-top: -48px;
878+
}
879+
880+
.timeline-pointTimeline {
881+
bottom: 32px;
882+
}
883+
884+
.sideButtonTimeline {
885+
width: 30px;
886+
height: 30px;
887+
font-size: 22px;
888+
}
889+
890+
.porcentTimeLine {
891+
margin-top: -48px;
892+
max-width: 143px;
893+
}
894+
895+
.scroll-x-containerTimeline{
896+
width: 80%;
897+
margin-top: 3rem;
898+
}
879899
}
880900

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

902922
.itemsTablet{
903-
padding-top: 1rem;
923+
padding-top: 1.5rem;
904924
width: 40%;
905925
}
906926

@@ -915,11 +935,6 @@ span.timelineControl:hover {
915935
width: auto;
916936
}
917937

918-
.iconSearch{
919-
margin-left: 0;
920-
right: 5%;
921-
}
922-
923938
/*************** sectionMap ********************/
924939

925940
.containerTextMap .titleMap{
@@ -956,11 +971,16 @@ span.timelineControl:hover {
956971
}
957972

958973
.buttonRightTimeline{
959-
right: 0;
974+
right: 2rem;
960975
}
961976

962977
.buttonLeftTimeline{
963-
left: 0;
978+
left: 2rem;
979+
}
980+
981+
.scroll-x-containerTimeline{
982+
width: 70%;
983+
margin-top: 0;
964984
}
965985

966986
}
@@ -977,7 +997,7 @@ span.timelineControl:hover {
977997
.dataTables_filter label input{
978998
height: 30px !important;
979999
width: 295px !important;
980-
margin-left: -44px !important;
1000+
margin-left: 0 !important;
9811001
}
9821002

9831003
.iconSearch{

‎marlo-web/src/main/webapp/crp/css/projects/projectsList.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
.dataTables_filter label input{
4242
height: 30px !important;
4343
width: 295px !important;
44-
margin-left: -44px !important;
44+
margin-left: 0 !important;
4545
}
4646

4747
.iconSearch{

‎marlo-web/src/main/webapp/crp/js/home/dashboard.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,9 @@ $('table.projectsList').dataTable({
459459
var iconSearch = $("<div></div>").addClass("iconSearch");
460460
var divDataTables_filter = $('.dataTables_filter').parent();
461461
iconSearch.append('<img src="' + baseUrl + '/global/images/search_outline.png" alt="Imagen" style="width: 24px; margin: auto;" >');
462-
iconSearch.prependTo(divDataTables_filter)
462+
iconSearch.prependTo(divDataTables_filter);
463+
464+
463465
var divDataTables_length =$('.dataTables_length').parent();
464466
divDataTables_length.css("position", "absolute");
465467
divDataTables_length.css("bottom", "8px");
@@ -470,12 +472,17 @@ var windowWidth = $(window).width();
470472

471473

472474
if (windowWidth < 768) {
475+
476+
divDataTables_filter.css({
477+
"width": "100%",
478+
});
479+
473480
divDataTables_length.css({
474481
"left": "30vw",
475482
"bottom": "0",
476483
"margin-top": "4rem",
477484
"margin-left": "0"
478-
})
485+
});
479486
}
480487

481488
if (windowWidth < 440) {

‎marlo-web/src/main/webapp/global/bower_components/datatables.net/js/jquery.dataTables.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11636,7 +11636,7 @@
1163611636
* } );
1163711637
* } );
1163811638
*/
11639-
"sSearch": "Search:",
11639+
"sSearch": "",
1164011640

1164111641

1164211642
/**

‎marlo-web/src/main/webapp/global/bower_components/datatables/media/js/jquery.dataTables.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11637,7 +11637,7 @@
1163711637
* } );
1163811638
* } );
1163911639
*/
11640-
"sSearch": "Search:",
11640+
"sSearch": "",
1164111641

1164211642

1164311643
/**

‎marlo-web/src/main/webapp/global/css/customDataTable.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ table.dataTable a {
176176

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

179+
.dataTables_filter label input{
180+
width: 100% !important;
181+
}
182+
179183
.dataTables_paginate{
180184
margin-bottom: 3rem !important;
181185
}
@@ -191,10 +195,6 @@ table.dataTable a {
191195
width: 100%;
192196
}
193197

194-
.dataTables_filter label input{
195-
width: 100% !important;
196-
}
197-
198198
.dataTables_paginate{
199199
margin-bottom: 32px !important;
200200
}

‎marlo-web/src/main/webapp/global/css/global.css

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8182,10 +8182,26 @@ img.qaOptionsComment {
81828182
.usersInfo{
81838183
padding-left: 2rem;
81848184
}
8185+
8186+
#mainMenu .menuContent.positionFixedTop #userInfo{
8187+
padding: 9px 22px 3px 20px;
8188+
}
8189+
8190+
a#userLogOut{
8191+
top: auto;
8192+
}
81858193
/************* 2.1. SUPERADMIN ***************/
81868194
/************* 3. MAIN MENU ***************/
81878195
/************* BODY ***************/
81888196

8197+
.headTitle{
8198+
text-align: center;
8199+
}
8200+
8201+
#top-quote{
8202+
margin-top: 1rem;
8203+
text-align: center;
8204+
}
81898205
/************* FOOTER ***************/
81908206

81918207
#guide-button{
@@ -8284,6 +8300,9 @@ img.qaOptionsComment {
82848300
#mainMenu .menuContent ul li{
82858301
font-size: 0.9em;
82868302
}
8303+
.menuContentTitle{
8304+
display: none;
8305+
}
82878306

82888307
/************* BODY ***************/
82898308

0 commit comments

Comments
 (0)