Align color palette with geOrchestra theme variable (#195)

georchestra · Nov 5, 2024 · 53d1310 · 53d1310
1 parent a215c29
commit 53d1310
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -171,9 +171,9 @@ In ordrer to do a release you can use the following steps. Usually it is done on
 
 - Build the extension locally, or download the last artifact from the github actions (they disappear after N days) 
 - Create a github release ( From github repo page --> `Releases` --> `Draft a new release`)
-    - target the master branch, if you have to publish from master 
-    - Write the tag name you want for the release and click on "Create new tag [...] on publish" entry. (This will create a new tag on the HEAD of the master branch when the release is published). E.g. `1.0.0-rc21`
-    - Fill title of the release with the name of the release (usually the same of the tag)
-    - Fill the release description ("auto-generate release notes" button usually does the job)
-    - Upload the extension zip to the attachments for the release
-    - Publish the release (this will create the tag)
+  - target the master branch, if you have to publish from master
+  - Write the tag name you want for the release and click on "Create new tag [...] on publish" entry. (This will create a new tag on the HEAD of the master branch when the release is published). E.g. `1.0.0-rc21`
+  - Fill title of the release with the name of the release (usually the same of the tag)
+  - Fill the release description ("auto-generate release notes" button usually does the job)
+  - Upload the extension zip to the attachments for the release
+  - Publish the release (this will create the tag)
diff --git a/js/extension/cadastrapp.css b/js/extension/cadastrapp.css
@@ -5,7 +5,7 @@
 
 .cadastrapp {
   position: absolute;
-  background: #fff;
+  background: inherit;
   box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.16);
   overflow: hidden;
   top: 0;
@@ -14,27 +14,6 @@
   width: 100%;
   z-index: 1000;
 }
-.cadastrapp .top {
-  height: 52px;
-  width: 100%;
-  color: #ffffff;
-  background-color: #078aa3;
-}
-.cadastrapp .top h4 {
-  float: left;
-  width: 200px;
-  line-height: 32px;
-  margin-left: calc(50% - 100px);
-}
-.cadastrapp .top .btn {
-  border: none !important;
-  border-top: none !important;
-}
-.cadastrapp .top .glyphicon:hover {
-  transition: 0.3s;
-  transform: scale(1.2);
-  display: block;
-}
 .cadastrapp .side-bar {
   width: 40px;
   margin-top: 0;
@@ -85,26 +64,10 @@
   width: calc(100% - 52px);
   overflow: auto;
 }
-.cadastrapp .btn-selected {
-  background: #fff;
-  color: #078aa3;
-}
 .cadastrapp .row {
   margin-left: 0px;
   margin-right: 0px;
 }
-.cadastrapp .not-selected-row:hover {
-  color: #078aa3 !important;
-  font-weight: bold;
-  background: #f2f2f2;
-  cursor: pointer;
-}
-.cadastrapp .selected-row {
-  color: #078aa3 !important;
-  font-weight: bold;
-  background: #f2f2f2;
-  cursor: pointer;
-}
 .cadastrapp .col-sm-12 {
   padding-left: 0;
   padding-right: 0;
@@ -121,21 +84,6 @@
   padding: 10px;
   min-height: 420px;
 }
-.cadastrapp .plots-selection .table-row {
-  float: left;
-  width: 100%;
-  cursor: pointer;
-  border-bottom: solid 1px #ddd;
-}
-.cadastrapp .plots-selection .table-row:hover {
-  color: #078aa3 !important;
-  background: #f2f2f2;
-}
-.cadastrapp .plots-selection .table-row.selected {
-  color: #078aa3 !important;
-  background: #f2f2f2;
-  font-weight: bold;
-}
 .cadastrapp .plots-selection .cell {
   padding: 4px;
   float: left;
@@ -210,9 +158,24 @@ div.cadastrapp-modal.cadastrapp-landed-property-modal {
   border: none;
 }
 .cadastrapp-modal .information-panel-title.selected {
-  background: #078aa3 !important;
+  background: inherit;
   color: #fff !important;
 }
+.cadastrapp-modal .information-panel-title.selected a:hover {
+  color: #fff
+}
+.cadastrapp-modal .information-panel-title.selected a,
+.cadastrapp-modal .information-panel-title.unselected a {
+  padding: 0px;
+}
+.cadastrapp-modal .information-panel-title.selected a .modal-header {
+  padding: 10px;
+}
+.cadastrapp-modal .information-panel-title.unselected a .modal-header{
+  padding: 10px;
+  background-color: inherit;
+  color: inherit;
+}
 .cadastrapp-modal .panel-heading {
   padding: 0 !important;
 }
@@ -228,29 +191,20 @@ div.cadastrapp-modal.cadastrapp-landed-property-modal {
   float: left;
   width: 100%;
   cursor: pointer;
-  border-bottom: solid 1px #ddd;
-}
-.cadastrapp-modal .table-row:hover {
-  color: #078aa3 !important;
-  background: #f2f2f2;
-}
-.cadastrapp-modal .table-row.selected {
-  color: #078aa3 !important;
-  background: #f2f2f2;
-  font-weight: bold;
+  border-bottom: solid 1px;
 }
 .cadastrapp-modal .cell {
   padding: 4px;
   float: left;
 }
 .cadastrapp-modal .header {
   float: left;
-  border-bottom: solid 1px #ddd;
+  border-bottom: solid 1px;
   font-weight: bold;
   width: 100%;
 }
 .cadastrapp-preferences-dialog {
-  background: #fff;
+  background: inherit;
   width: 400px;
 }
 .cadastrapp-preferences-dialog .tab-content {

diff --git a/js/extension/components/information/InformationPanelContainer.jsx b/js/extension/components/information/InformationPanelContainer.jsx
@@ -23,7 +23,7 @@ export default function InformationPanelContainer({ items = [], authLevel, addit
                 let header = (<div
                     onClick={() => { togglePanel(index); }}
                     className={`information-panel-title ${selectedPanel[index] ? 'selected' : 'unselected'}`}>
-                    {r.parcelle}
+                    <div className="modal-header">{r.parcelle}</div>
                     {infoLoading[r?.parcelle] ? <div style={{ "float": "right" }}><Spinner spinnerName="circle" noFadeIn overrideSpinnerClassName="spinner" /></div> : null}
                 </div>);
                 return (

diff --git a/js/extension/plugins/cadastrapp/Header.jsx b/js/extension/plugins/cadastrapp/Header.jsx
@@ -9,14 +9,14 @@ import Message from '@mapstore/components/I18N/Message';
  * Header of the Cadastrapp panel
  */
 function Header({onClose = () => {}}) {
-    return (<div className="top">
-        <h4><Message msgId={'cadastrapp.cadastre_tools'}/></h4>
-        <Button
+    return (<div className="row">
+        <div className="col-xs-8"><h4><Message msgId={'cadastrapp.cadastre_tools'}/></h4></div>
+        <div className="col-xs-4"><Button
             onClick={() => onClose()}
             bsStyle="primary"
             className="square-button ms-close pull-right">
             <span className="glyphicon glyphicon-1-close"></span>
-        </Button>
+        </Button></div>
     </div>);
 }
 

diff --git a/js/extension/plugins/cadastrapp/Main.jsx b/js/extension/plugins/cadastrapp/Main.jsx
@@ -36,7 +36,7 @@ export default connect(state => ({
                     position="right"
                     bsStyle="primary"
                     style={dockStyle}>
-                    <div className="cadastrapp">
+                    <div className="ms-header ms-primary cadastrapp">
                         <Header/>
                         <MainToolbar {...props} />
                         <MainPanel {...props} />