Skip to content

Commit

Permalink
Styling - General text alignment, cross page margin harmonizarion and…
Browse files Browse the repository at this point in the history
… banner icon alignment
  • Loading branch information
jesperschmidt committed Mar 31, 2015
1 parent de3d029 commit 9a43b33
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 24 deletions.
32 changes: 16 additions & 16 deletions web-client/src/main/resources/apps/html5ui/css/gnmetadataview.css
Expand Up @@ -521,13 +521,13 @@ div.help ul li {
color: #333;
}
/* bread crumbs */
#bread-crumb-app {
margin-left: 20px;
}
/* #bread-crumb-app { */
/* margin: 2px 80px 2px 13px; */
/* } */
/* welcome in left sidebar */
#welcome-text {
margin: 20px 20px 10px 10px;
}
/* #welcome-text { */
/* margin: 20px 20px 10px 20px; */
/* } */
/* cloud tag */
#cloud-tag ul {
padding-left: 15px
Expand Down Expand Up @@ -599,7 +599,7 @@ div.help ul li {

/* first thumbnial container */
#latest-metadata {
margin-top: 20px;
/* margin-top: 20px; */
padding-top: 10px;
}

Expand Down Expand Up @@ -648,7 +648,7 @@ div.help ul li {
}

#search-container article{
width: calc( 80% - 30px);
width: calc( 80% - 15px);
margin:10px 0 10px 10px;
}

Expand All @@ -668,11 +668,11 @@ div.help ul li {

#search-container .main-aside {
width: calc( 20% - 30px);
margin: 10px 10px 10px 20px;
margin: 10px 10px 10px 13px;
}

#search-container #bread-crumb-div {
margin: 5px 0px 5px 17px; /* there is a 3 pix space in front of the breadcrum */
margin: 5px 0px 5px 10px; /* there is a 3 pix space in front of the breadcrum */
}

#search-container .main-aside a {
Expand Down Expand Up @@ -884,9 +884,9 @@ div.showBigMapItemInactive:hover {
no-repeat;
}

#big-map-container {
margin: 30px 20px 20px 20px;
}
/* #big-map-container { */
/* margin: 30px 20px 20px 20px; */
/* } */

#big-map-container .x-border-layout-ct {
background-color: #fff;
Expand Down Expand Up @@ -914,9 +914,9 @@ div.showBigMapItemInactive:hover {
}

/* metadata */
#metadata-info {
margin: 30px 20px 20px 20px;
}
/* #metadata-info { */
/* margin: 30px 20px 20px 20px; */
/* } */

#metadata-info a {
color: #0076A1;
Expand Down
63 changes: 60 additions & 3 deletions web-client/src/main/resources/apps/html5ui/css/main_ec.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web-client/src/main/resources/apps/html5ui/js/App.js
Expand Up @@ -308,7 +308,7 @@ GeoNetwork.app = function() {
resultsView : catalogue.resultsView,
layout : 'fit',
// autoHeight:true,
padding : '5px 25px',
//padding : '5px 25px',
currTab : GeoNetwork.defaultViewMode || 'simple',
printDefaultForTabs : GeoNetwork.printDefaultForTabs || false,
printUrl : '../../apps/html5ui/print.html',
Expand Down
Expand Up @@ -969,7 +969,7 @@ GeoNetwork.editor.EditorPanel = Ext.extend(Ext.Panel, {
var currTab = document.mainForm.currTab.value;
if (currTab === 'xml') {
var area = Ext.DomQuery.selectNode('textarea.xml', this.body.dom);
Ext.get(area).setStyle('min-height', this.editorMainPanel.ownerCt.getInnerHeight() - 5 + 'px');
Ext.get(area).setStyle('min-height', this.editorMainPanel.ownerCt.getInnerHeight() - 30 + 'px');
}


Expand Down
7 changes: 4 additions & 3 deletions web/src/main/webapp/xsl/search.xsl
Expand Up @@ -283,7 +283,7 @@
<div id="fb-button">
</div>
</div>
<div id="permalink-div" style="display:none"></div>
<!-- <div id="permalink-div" style="display:none"></div> -->
<div id="bread-crumb-app"></div>
<div id="search-form" style="display: none;">
<fieldset id="search-form-fieldset">
Expand Down Expand Up @@ -342,7 +342,7 @@
<div id="cloud-tag"></div>
</div>
</aside>
<article>
<article class="main-article">
<div>
<section>
<div id="latest-metadata">
Expand Down Expand Up @@ -374,6 +374,7 @@
</div>

<div id="big-map-container" style="display:none;"/>
<div id="permalink-div" style="display:none"/>
<div id="metadata-info" style="display:none;"/>
<div id="search-container" class="main wrapper clearfix">
<div id="bread-crumb-div"></div>
Expand Down Expand Up @@ -652,7 +653,7 @@

<div class="layout-footer" id="EC-footer">
<ul class="footer-items">
<li class="modification-date"><span>Last update: 2/2/2015</span></li>
<li class="modification-date"><span>Last update: 26/3/2015</span></li>
<li><a href="#">Top</a></li>
<li><a id="browse-tab" class="selected" href="javascript:showBrowse();">Home</a></li>
<xsl:if test="string(/root/gui/session/userId)!=''">
Expand Down

0 comments on commit 9a43b33

Please sign in to comment.