Skip to content

Commit

Permalink
Improve card contrast #1529
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmiguim
hmiguim committed May 23, 2022
1 parent 60188ae commit 95a17c4
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 43 deletions.
3 changes: 2 additions & 1 deletion roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseRepresentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ public void onSelection(SelectionEvent<Integer> event) {
});
addTab.addStyleName("addTab");
addTab.getElement().setId("representationNewDescriptiveMetadata");
addTab.getParent().addStyleName("addTabWrapper");
addTab.addStyleName("newDescriptiveMetadataTab");
// addTab.getParent().addStyleName("addTabWrapper");

PermissionClientUtils.bindPermission(newDescriptiveMetadata, aip.getPermissions(),
RodaConstants.PERMISSION_METHOD_CREATE_DESCRIPTIVE_METADATA_FILE);
Expand Down
85 changes: 45 additions & 40 deletions roda-ui/roda-wui/src/main/java/org/roda/wui/client/browse/BrowseRepresentation.ui.xml
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,55 @@
<?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:m="urn:import:org.roda.wui.client.main"
xmlns:commonsearch="urn:import:org.roda.wui.client.common.search"
xmlns:lists="urn:import:org.roda.wui.client.common.lists"
xmlns:common="urn:import:org.roda.wui.client.common">
xmlns:g="urn:import:com.google.gwt.user.client.ui"
xmlns:commonsearch="urn:import:org.roda.wui.client.common.search"
xmlns:common="urn:import:org.roda.wui.client.common">

<ui:with field='messages' type='config.i18n.client.ClientMessages' />
<ui:with field='messages' type='config.i18n.client.ClientMessages'/>

<g:FocusPanel ui:field="keyboardFocus">
<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 content">
<!-- STATUS -->
<g:HTML ui:field="aipState" />

<!-- IDENTIFICATION -->
<g:FlowPanel styleName="browseItemPanel">
<g:HTML addStyleNames="h2 browseItemIcon" ui:field="representationIcon"/>
<g:FlowPanel addStyleNames="h2 browseItemText" ui:field="representationTitle"/>
<g:FocusPanel ui:field="keyboardFocus">
<g:FlowPanel styleName="wui-browse-representation" addStyleNames="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">
<!-- STATUS -->
<g:HTML ui:field="aipState"/>

<g:FlowPanel addStyleNames="browseItemPanelRisksEventsLogs" ui:field="risksEventsLogs" />
<g:Label addStyleNames="browseItemId" ui:field="dateCreatedAndModified" />
</g:FlowPanel>
<!-- 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"/>

<!-- 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>
<g:FlowPanel addStyleNames="browseItemPanelRisksEventsLogs"
ui:field="risksEventsLogs"/>
<g:Label addStyleNames="browseItemId" ui:field="dateCreatedAndModified"/>
</g:FlowPanel>
</g:FlowPanel>

<!-- FILES -->
<g:FlowPanel addStyleNames="card filesCard">
<commonsearch:SearchWrapper ui:field="filesSearch" />
</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>

<!-- DIPs -->
<g:FlowPanel addStyleNames="card disseminationsCard">
<commonsearch:SearchWrapper ui:field="disseminationsSearch" />
</g:FlowPanel>
</g:FlowPanel>
</g:FlowPanel>
</g:FlowPanel>
</g:FocusPanel>
<!-- 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>
</g:FlowPanel>
</g:FlowPanel>
</g:FlowPanel>
</g:FlowPanel>
</g:FocusPanel>
</ui:UiBinder>
4 changes: 2 additions & 2 deletions roda-ui/roda-wui/src/main/java/org/roda/wui/client/common/resources/main.gss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2441,15 +2441,15 @@ td.datePickerMonth, td.datePickerYear {
vertical-align: top;
}

.browse_aip .identification {
.browse_aip .identification, .browse-representation .identification {
background-color: white;
padding: 2em;
border-bottom: 1px solid #dedcdc;
padding-bottom: 3em;
padding-top: 3em;
}

.browse_aip .cards {
.browse_aip .cards, .browse-representation .cards {
padding: 30px;
background-color: #f7f7f7;
min-height: 350px;
Expand Down

0 comments on commit 95a17c4

Please sign in to comment.