Merge pull request #1019 from devgateway/develop-elgeyo

Develop elgeyo into master elgeyo 2.0.11
devgateway · Apr 30, 2021 · d45fceb · d45fceb
2 parents 8b1b7d2 + 924f38e
commit d45fceb
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 74 deletions.
diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/overview/DataEntryBasePage.html b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/overview/DataEntryBasePage.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <wicket:extend>
-    <div wicket:id="sideBar"></div>
+    <div wicket:id="sideBar" class="row"></div>
 
     <wicket:child/>
 </wicket:extend>

diff --git a/...it/forms/wicket/page/overview/department/DepartmentOverviewPage$ProjectOverviewPanel.html b/...it/forms/wicket/page/overview/department/DepartmentOverviewPage$ProjectOverviewPanel.html
@@ -51,8 +51,8 @@ <h3><wicket:message key="ministryProjects" /></h3>
 
     <div class="ministry" wicket:id="projectsList"></div>
 
-    <div wicket:id="noData" class="row col-md-offset-5 col-col-md-2">
-        <h3><wicket:message key="noData" /></h3>
+    <div wicket:id="noData" class="row">
+        <h3 class="text-center"><wicket:message key="noData" /></h3>
     </div>
 
 </wicket:panel>

diff --git a/...ms/wicket/page/overview/department/DepartmentOverviewPage$TenderProcessOverviewPanel.html b/...ms/wicket/page/overview/department/DepartmentOverviewPage$TenderProcessOverviewPanel.html
@@ -62,8 +62,8 @@ <h3><wicket:message key="ministryTenders" /></h3>
         </div>
     </div>
 
-    <div wicket:id="noData" class="row col-md-offset-5 col-col-md-2">
-        <h3><wicket:message key="noData" /></h3>
+    <div wicket:id="noData" class="row">
+        <h3 class="text-center"><wicket:message key="noData" /></h3>
     </div>
 
 </wicket:panel>

diff --git a/...vgateway/toolkit/forms/wicket/page/overview/department/ListViewTenderProcessOverview.html b/...vgateway/toolkit/forms/wicket/page/overview/department/ListViewTenderProcessOverview.html
@@ -20,7 +20,7 @@ <h5>
     <wicket:fragment wicket:id="nonEmptyContainerFragment">
         <a wicket:id="delete" class="mb-1"></a>
         <div class="row display-flex">
-            <div wicket:id="panels" class="col-md-4" style="border-top: 1px solid #dfe3e9;"></div>
+            <div wicket:id="panels" class="col-md-4 col-sm-6" style="border-top: 1px solid #dfe3e9;"></div>
         </div>
     </wicket:fragment>
 </wicket:extend>

diff --git a/...oolkit/forms/wicket/page/overview/status/StatusOverviewPage$StatusOverviewSearchView.html b/...oolkit/forms/wicket/page/overview/status/StatusOverviewPage$StatusOverviewSearchView.html
@@ -40,8 +40,8 @@ <h3><wicket:message key="departmentProcurementPlans" /></h3>
 
     <div wicket:id="statusPanel"></div>
 
-    <div wicket:id="noData" class="row col-md-offset-5 col-col-md-2">
-        <h3><wicket:message key="noData" /></h3>
+    <div wicket:id="noData" class="row">
+        <h3 class="text-center"><wicket:message key="noData" /></h3>
     </div>
 
 </wicket:panel>

diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/styles/BaseStyles.css b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/styles/BaseStyles.css
@@ -38,7 +38,7 @@ body {
      * @see: bootstrap::navbar.less
      */
     min-height: 50px;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
     height: 60px;
     overflow: visible;
     position: fixed;
@@ -97,30 +97,9 @@ body {
     min-height: 20em;
     padding-bottom: 15px;
 }
-@media (min-width: 1025px){
-    .mainContainer{
-        margin-top: 5%;
-    }
-}
-@media (max-width: 1024px){
-    .mainContainer{
-        margin-top: 0;
-    }
-}
-@media (max-width: 768px){
-    .mainContainer{
-        margin-top: 0;
-    }
-}
-@media (max-width:412px){
-    .mainContainer{
-        margin-top: 25%;
-    }
-}
-
-@media (max-width: 767px){
-    .navbar-inverse .navbar-collapse{
-        margin-top: 30px;
+@media (min-width: 768px) {
+    .mainContainer {
+        margin-top: 75px;
     }
 }
 
@@ -692,14 +671,16 @@ hr.edit-separator {
 
 .p-t-xs { padding-top: .25em; }
 
-.row.display-flex {
-    display: flex;
-    flex-wrap: wrap;
-}
+@media (min-width: 767px) {
+    .row.display-flex {
+        display: flex;
+        flex-wrap: wrap;
+    }
 
-.row.display-flex > [class*='col-'] {
-    display: flex;
-    flex-direction: column;
+    .row.display-flex > [class*='col-'] {
+        display: flex;
+        flex-direction: column;
+    }
 }
 
 .btn.text-left {

diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/styles/OverviewStyles.css b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/styles/OverviewStyles.css
@@ -3,16 +3,6 @@
 /* general styles for dashboards
 -------------------------------------------------- */
 
-.container-fluid {
-    padding-left: 0 !important;
-}
-
-@media screen and (max-width: 767px) {
-    .container-fluid {
-        padding-right: 0;
-    }
-}
-
 [class*="col-"].no-padding {
     padding-left: 0 !important;
     padding-right: 0 !important;
@@ -43,7 +33,7 @@
     overflow-y: auto;
     padding: 20px 30px 30px 30px;
     position: fixed;
-    top: 60px;
+    top: 75px;
     bottom: 0;
 }
 
@@ -184,11 +174,6 @@
     margin: 0;
     padding: 25px 25px 25px 25px;
 }
-@media screen and (max-width: 1024px){
-  .header{
-    padding-top: 80px;
-  }
-}
 
 .header h2 {
     color: #223a49;
@@ -827,7 +812,6 @@
 }
 
 .tender-header .tender-label {
-    float: left;
     font-size: 12px;
     text-transform: uppercase;
 }
@@ -855,6 +839,7 @@
 
 .tender-info ul {
     padding-left: 0;
+    margin-bottom: 0;
 }
 
 .collapse-content.tender .tender-info ul li {
@@ -899,6 +884,10 @@
   min-width: 75px;
 }
 
+.tender-info {
+  overflow: auto;
+}
+
 .borderless tr td {
     border: none !important;
 }

diff --git a/ui/src/oce-standalone/style.scss b/ui/src/oce-standalone/style.scss
@@ -26,6 +26,7 @@ $extend: 100%;
     @media screen and (max-width: 767px) {
         background-color: #ffffff;
         margin-top: 24px;
+        margin-bottom: 0px;
     }
 }
 

diff --git a/ui/src/oce/alerts/Alerts.jsx b/ui/src/oce/alerts/Alerts.jsx
@@ -140,23 +140,11 @@ const Alerts = (props) => {
 
               : (
                 <div>
+                  <h4 className="sub-title">{t('alerts:alertPreferences')}</h4>
+                  <h5 className="sub-title">{t('alerts:onNewTender')}</h5>
                   <div className="row">
-                    <div className="col-md-12">
-                      <h4 className="sub-title">{t('alerts:alertPreferences')}</h4>
-                    </div>
-                    <div className="col-md-2" />
-                    <div className="col-md-5">
+                    <div className="col-md-6">
                       <ControlLabel>{t('alerts:alertsForTendersFromDepartment')}</ControlLabel>
-                    </div>
-                    <div className="col-md-5">
-                      <ControlLabel>{t('alerts:alertsForItemsFromDepartment')}</ControlLabel>
-                    </div>
-                  </div>
-                  <div className="row">
-                    <div className="col-md-2">
-                      {t('alerts:onNewTender')}
-                    </div>
-                    <div className="col-md-5">
                       <Typeahead
                         id="departments"
                         onChange={(selected) => handleChange({
@@ -175,7 +163,8 @@ const Alerts = (props) => {
                         highlightOnlyResult
                       />
                     </div>
-                    <div className="col-md-5">
+                    <div className="col-md-6">
+                      <ControlLabel>{t('alerts:alertsForItemsFromDepartment')}</ControlLabel>
                       <Typeahead
                         id="items"
                         onChange={(selected) => handleChange({

diff --git a/ui/src/oce/makueni/makueni.scss b/ui/src/oce/makueni/makueni.scss
@@ -645,7 +645,7 @@ a.more-details-link:hover::before {
         left: 0;
         margin-left: 13%;
         position: relative;
-        width: 100%;
+        width: 87%;
     }
 
     .alerts-button {