Skip to content

Commit

Permalink
A2-48 - General Updates based on Comments
Browse files Browse the repository at this point in the history
  • Loading branch information
MetalPrime committed Feb 20, 2024
1 parent 7a11a06 commit 23afa2d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
14 changes: 8 additions & 6 deletions marlo-web/src/main/webapp/crp/css/home/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -856,16 +856,18 @@ span.timelineControl:hover {
}

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

.containerTextMap{
margin: 10px 20px 25px 20px;
}
.containerTextMap .titleMap{
font-size: 1.4em;
font-size: 1.35rem;
}

.containerTextMap .textMap{
font-size: 1.15rem;
font-size: 1.1rem;
}
.containerImgMap{
min-width: 25%;
min-width: 17%;
display:flex;
flex-direction: column;
justify-content: center;
Expand Down Expand Up @@ -921,11 +923,11 @@ span.timelineControl:hover {
/*************** sectionMap ********************/

.containerTextMap .titleMap{
font-size: 1.2em;
font-size: 1.15em;
}

.containerTextMap .textMap{
font-size: 1rem;
font-size: 0.95rem;
}

.containerImgMap{
Expand Down
14 changes: 7 additions & 7 deletions marlo-web/src/main/webapp/crp/js/home/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -468,25 +468,25 @@ divDataTables_length.css("z-index", "1");

var windowWidth = $(window).width();

if (windowWidth < 440) {

if (windowWidth < 768) {
divDataTables_length.css({
"left": "25%",
"left": "30vw",
"bottom": "0",
"margin-top": "32px",
"margin-top": "4rem",
"margin-left": "0"
})
}

if (windowWidth < 768) {
if (windowWidth < 440) {
divDataTables_length.css({
"left": "35%",
"left": "18vw",
"bottom": "0",
"margin-top": "4rem",
"margin-top": "32px",
"margin-left": "0"
})
}


$('a#impact[data-toggle="tab"]').on('shown.bs.tab', function(e) {
e.target // newly activated tab
e.relatedTarget // previous active tab
Expand Down
1 change: 1 addition & 0 deletions marlo-web/src/main/webapp/global/css/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -8202,6 +8202,7 @@ img.qaOptionsComment {
#draggable-button{
width: 35px;
height: 35px;
padding: 6px 6px 4px 6px;
}

#draggable-button img{
Expand Down

0 comments on commit 23afa2d

Please sign in to comment.