Revert: Improve card contrast #1529

keeps · May 18, 2022 · 71a37e3 · 71a37e3
1 parent 6051580
commit 71a37e3
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 107 deletions.
diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseAIP.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseAIP.java
@@ -421,8 +421,7 @@ public void onSuccess(SafeHtml result) {
 
       addTab.addStyleName("addTab");
       addTab.getElement().setId("aipNewDescriptiveMetadata");
-      addTab.addStyleName("newDescriptiveMetadataTab");
-      // addTab.getParent().addStyleName("addTabWrapper");
+      addTab.getParent().addStyleName("addTabWrapper");
     }
 
     descriptiveMetadataSavedButtons = new HashMap<>();

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseAIP.ui.xml b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseAIP.ui.xml
@@ -1,56 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
 <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
-  xmlns:g="urn:import:com.google.gwt.user.client.ui"
-  xmlns:common="urn:import:org.roda.wui.client.common">
-
-  <ui:with field='messages' type='config.i18n.client.ClientMessages'/>
-
-  <g:FocusPanel ui:field="keyboardFocus">
-    <g:FlowPanel styleName="browse" addStyleNames="skip_padding">
-      <common:NavigationToolbar ui:field="navigationToolbar"
-        header="{messages.catalogueItemTitle}"/>
-      <g:FlowPanel addStyleNames="row full_width skip_padding" ui:field="center">
-        <g:FlowPanel addStyleNames="col_12">
-          <!-- STATUS -->
-          <g:HTML ui:field="aipState"/>
-
-          <!-- IDENTIFICATION -->
-          <g:FlowPanel addStyleNames="identification">
-            <common:TitlePanel ui:field="title">
-              <g:FlowPanel addStyleNames="browseItemPanelDisposal" ui:field="disposalPolicy"/>
-              <g:FlowPanel addStyleNames="browseItemPanelRisksEventsLogs"
-                ui:field="risksEventsLogs"/>
-              <g:Label addStyleNames="browseItemId" ui:field="dateCreatedAndModified"/>
-            </common:TitlePanel>
-          </g:FlowPanel>
-
-          <g:FlowPanel addStyleNames="cards">
-            <!-- DESCRIPTIVE METADATA -->
-            <g:Button addStyleNames="btn btn-block btn-plus browseNewDescriptiveMetadataButton"
-              ui:field="newDescriptiveMetadata">
-              <ui:text from='{messages.newDescriptiveMetadataTitle}'/>
-            </g:Button>
-            <g:FlowPanel addStyleNames="card descriptiveMetadataCard">
-              <g:TabPanel ui:field="descriptiveMetadata"
-                addStyleNames="browseItemMetadata"/>
-            </g:FlowPanel>
-
-            <!-- REPRESENTATIONS -->
-            <g:SimplePanel ui:field="representationsCard" addStyleNames="card representationsCard"/>
-
-            <!-- DIPs -->
-            <g:SimplePanel ui:field="disseminationsCard" addStyleNames="card disseminationsCard"/>
-
-            <!-- AIP CHILDREN -->
-            <g:SimplePanel ui:field="aipChildrenCard" addStyleNames="card aipChildrenCard"/>
-
-            <!-- ADD NEW -->
-            <g:SimplePanel ui:field="addRepresentation" addStyleNames="ActionableStyleButtons"/>
-            <g:SimplePanel ui:field="addChildAip" addStyleNames="ActionableStyleButtons"/>
-          </g:FlowPanel>
-        </g:FlowPanel>
-      </g:FlowPanel>
-    </g:FlowPanel>
-  </g:FocusPanel>
+			 xmlns:g="urn:import:com.google.gwt.user.client.ui"
+			 xmlns:common="urn:import:org.roda.wui.client.common">
+
+	<ui:with field='messages' type='config.i18n.client.ClientMessages' />
+
+	<g:FocusPanel ui:field="keyboardFocus">
+		<g:FlowPanel styleName="browse" addStyleNames="wrapper skip_padding">
+			<common:NavigationToolbar ui:field="navigationToolbar" header="{messages.catalogueItemTitle}" />
+			<g:FlowPanel addStyleNames="row full_width skip_padding" ui:field="center">
+				<g:FlowPanel addStyleNames="col_12 content">
+					<!-- STATUS -->
+					<g:HTML ui:field="aipState" />
+
+					<!-- IDENTIFICATION -->
+					<common:TitlePanel ui:field="title">
+						<g:FlowPanel addStyleNames="browseItemPanelDisposal" ui:field="disposalPolicy" />
+						<g:FlowPanel addStyleNames="browseItemPanelRisksEventsLogs" ui:field="risksEventsLogs" />
+						<g:Label addStyleNames="browseItemId" ui:field="dateCreatedAndModified" />
+					</common:TitlePanel>
+
+					<!-- DESCRIPTIVE METADATA -->
+					<g:Button addStyleNames="btn btn-block btn-plus browseNewDescriptiveMetadataButton" ui:field="newDescriptiveMetadata">
+						<ui:text from='{messages.newDescriptiveMetadataTitle}' />
+					</g:Button>
+					<g:FlowPanel addStyleNames="card descriptiveMetadataCard">
+						<g:TabPanel ui:field="descriptiveMetadata"
+							addStyleNames="browseItemMetadata" />
+					</g:FlowPanel>
+
+					<!-- REPRESENTATIONS -->
+					<g:SimplePanel ui:field="representationsCard" addStyleNames="card representationsCard"/>
+
+					<!-- DIPs -->
+					<g:SimplePanel ui:field="disseminationsCard" addStyleNames="card disseminationsCard"/>
+
+					<!-- AIP CHILDREN -->
+					<g:SimplePanel ui:field="aipChildrenCard" addStyleNames="card aipChildrenCard"/>
+
+					<!-- ADD NEW -->
+					<g:SimplePanel ui:field="addRepresentation" addStyleNames="ActionableStyleButtons" />
+					<g:SimplePanel ui:field="addChildAip" addStyleNames="ActionableStyleButtons" />
+				</g:FlowPanel>
+			</g:FlowPanel>
+		</g:FlowPanel>
+	</g:FocusPanel>
 </ui:UiBinder>
diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseRepresentation.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseRepresentation.java
@@ -335,8 +335,7 @@ public void onSelection(SelectionEvent<Integer> event) {
     });
     addTab.addStyleName("addTab");
     addTab.getElement().setId("representationNewDescriptiveMetadata");
-    addTab.addStyleName("newDescriptiveMetadataTab");
-    // addTab.getParent().addStyleName("addTabWrapper");
+    addTab.getParent().addStyleName("addTabWrapper");
 
     PermissionClientUtils.bindPermission(newDescriptiveMetadata, aip.getPermissions(),
       RodaConstants.PERMISSION_METHOD_CREATE_DESCRIPTIVE_METADATA_FILE);

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseRepresentation.ui.xml b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseRepresentation.ui.xml
@@ -8,45 +8,40 @@
   <ui:with field='messages' type='config.i18n.client.ClientMessages'/>
 
   <g:FocusPanel ui:field="keyboardFocus">
-    <g:FlowPanel styleName="wui-browse-representation" addStyleNames="skip_padding">
+    <g:FlowPanel styleName="wui-browse-representation" addStyleNames="wrapper skip_padding">
       <common:NavigationToolbar ui:field="navigationToolbar"
         header="{messages.catalogueRepresentationTitle}"/>
       <g:FlowPanel addStyleNames="row full_width skip_padding" ui:field="center">
-        <g:FlowPanel addStyleNames="col_12">
+        <g:FlowPanel addStyleNames="col_12 content">
           <!-- STATUS -->
           <g:HTML ui:field="aipState"/>
 
           <!-- IDENTIFICATION -->
-          <g:FlowPanel addStyleNames="identification">
-            <g:FlowPanel styleName="browseItemPanel">
-              <g:HTML addStyleNames="h2 browseItemIcon" ui:field="representationIcon"/>
-              <g:FlowPanel addStyleNames="h2 browseItemText" ui:field="representationTitle"/>
+          <g:FlowPanel styleName="browseItemPanel">
+            <g:HTML addStyleNames="h2 browseItemIcon" ui:field="representationIcon"/>
+            <g:FlowPanel addStyleNames="h2 browseItemText" ui:field="representationTitle"/>
 
-              <g:FlowPanel addStyleNames="browseItemPanelRisksEventsLogs"
-                ui:field="risksEventsLogs"/>
-              <g:Label addStyleNames="browseItemId" ui:field="dateCreatedAndModified"/>
-            </g:FlowPanel>
+            <g:FlowPanel addStyleNames="browseItemPanelRisksEventsLogs" ui:field="risksEventsLogs"/>
+            <g:Label addStyleNames="browseItemId" ui:field="dateCreatedAndModified"/>
           </g:FlowPanel>
 
-          <g:FlowPanel addStyleNames="cards">
-            <!-- DESCRIPTIVE METADATA -->
-            <g:Button addStyleNames="btn btn-block btn-plus browseNewDescriptiveMetadataButton"
-              ui:field="newDescriptiveMetadata">
-              <ui:text from='{messages.newDescriptiveMetadataTitle}'/>
-            </g:Button>
-            <g:FlowPanel addStyleNames="card descriptiveMetadataCard">
-              <g:TabPanel ui:field="itemMetadata" addStyleNames="browseItemMetadata"/>
-            </g:FlowPanel>
+          <!-- DESCRIPTIVE METADATA -->
+          <g:Button addStyleNames="btn btn-block btn-plus browseNewDescriptiveMetadataButton"
+            ui:field="newDescriptiveMetadata">
+            <ui:text from='{messages.newDescriptiveMetadataTitle}'/>
+          </g:Button>
+          <g:FlowPanel addStyleNames="card descriptiveMetadataCard">
+            <g:TabPanel ui:field="itemMetadata" addStyleNames="browseItemMetadata"/>
+          </g:FlowPanel>
 
-            <!-- FILES -->
-            <g:FlowPanel addStyleNames="card filesCard">
-              <commonsearch:SearchWrapper ui:field="filesSearch"/>
-            </g:FlowPanel>
+          <!-- FILES -->
+          <g:FlowPanel addStyleNames="card filesCard">
+            <commonsearch:SearchWrapper ui:field="filesSearch"/>
+          </g:FlowPanel>
 
-            <!-- DIPs -->
-            <g:FlowPanel addStyleNames="card disseminationsCard">
-              <commonsearch:SearchWrapper ui:field="disseminationsSearch"/>
-            </g:FlowPanel>
+          <!-- DIPs -->
+          <g:FlowPanel addStyleNames="card disseminationsCard">
+            <commonsearch:SearchWrapper ui:field="disseminationsSearch"/>
           </g:FlowPanel>
         </g:FlowPanel>
       </g:FlowPanel>

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/resources/main.gss b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/resources/main.gss
@@ -2441,18 +2441,6 @@ td.datePickerMonth, td.datePickerYear {
     vertical-align: top;
 }
 
-.browse_aip .identification, .browse-representation .identification {
-  background-color: white;
-  padding: 2em;
-  border-bottom: 1px solid #dedcdc;
-}
-
-.browse_aip .cards, .browse-representation .cards {
-  padding: 20px 30px;
-  background-color: #f7f7f7;
-  min-height: 383px;
-}
-
 .browse.under_appraisal, .browse.deleted, .browse.created, .browse.ingest_processing {
     background-color: #efefef;
     background-image: repeating-linear-gradient(-45deg, transparent, transparent 35px, rgba(255, 255, 255, .5) 35px, rgba(255, 255, 255, .5) 70px);
@@ -2566,7 +2554,7 @@ td.datePickerMonth, td.datePickerYear {
 }
 
 .browseItemMetadata .gwt-TabBar {
-    background-color: #f7f7f7;
+    background-color: #eee;
     line-height: 3.5rem;
     width: auto !important; /* needed so buttons appear on the right */
     border-collapse: collapse;
@@ -2603,17 +2591,6 @@ td.datePickerMonth, td.datePickerYear {
     background-color: transparent;
 }
 
-.browseItemMetadata .newDescriptiveMetadataTab {
-    width: 40px;
-    color: white;
-    background: #999;
-    text-align: center;
-}
-
-.browseItemMetadata .newDescriptiveMetadataTab:hover {
-    background: COLOR_PRIMARY;
-}
-
 .browseItemMetadata .addTabWrapper > div {
     padding-bottom: 5px;
 }