litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO 3722, 3723 and 3725 css and js changes for OpenSocial gadgets

Browse source
This commit is contained in:
tworrall 2012-06-19 13:38:25 +00:00
parent 075f7338c3
commit fc6be48674
2 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -104,16 +104,18 @@
<#-- VIVO OpenSocial Extension by UCSF --> <#-- VIVO OpenSocial Extension by UCSF -->
<#if openSocial??> <#if openSocial??>
<#if openSocial.visible> <#if openSocial.visible>
<#-- It would likely make sense to remove the #if logic as it is safe and --> <div id="openSocial">
<#-- arguably better to just have both divs in all conditions --> <h2>OpenSocial</h2>
<#if editable> <#-- It would likely make sense to remove the #if logic as it is safe and -->
<div id="gadgets-edit" class="gadgets-gadget-parent"></div> <#-- arguably better to just have both divs in all conditions -->
<#else> <#if editable>
<div id="gadgets-view" class="gadgets-gadget-parent"></div> <div id="gadgets-edit" class="gadgets-gadget-parent"></div>
</#if> <#else>
<div id="gadgets-view" class="gadgets-gadget-parent" ></div>
</#if>
</div>
</#if> </#if>
</#if> </#if>
</section> </section>
</section> </section>

23
themes/wilma/css/openSocial/gadgets.css
View file

@ -19,9 +19,9 @@
.gadgets-gadget-chrome { .gadgets-gadget-chrome {
float: left; float: left;
margin: 4px 6px 4px 0; margin: 4px 6px 4px 12px; /* changed the left value from 0 tlw72*/
border: 1px solid #7aa5d6;
border: 1px solid #CCC; border: 1px solid #CCC;
border: 1px solid #dfebe5; /*#7aa5d6;*/
} }
.col2 .gadgets-gadget-chrome { .col2 .gadgets-gadget-chrome {
margin-left: 9px; margin-left: 9px;
@ -31,23 +31,27 @@
{ {
width: 100%; width: 100%;
border: none; border: none;
background-color:#fff; /*tlw72*/
} }
.gadgets-gadget-title-bar { .gadgets-gadget-title-bar {
padding: 4px 4px 2px; padding: 4px 4px 2px;
background-color: #e5ecf9;
background-color: #EEEBE5; background-color: #EEEBE5;
background-color: #f1f2ee; /* #e5ecf9; */
} }
.gadgets-gadget-title-bar:hover { background-color: #e7e3db; } /*.gadgets-gadget-title-bar:hover { background-color: #e7e3db; } */
.gadgets-gadget-title-bar img, .gadgets-gadget-title-bar img,
.gadgets-gadget-title-button { .gadgets-gadget-title-button {
vertical-align: top; vertical-align: top;
} }
/* title bar */
.gadgets-gadget-title a, .gadgets-gadget-title a:hover { .gadgets-gadget-title a, .gadgets-gadget-title a:hover {
font-weight: bold; /* font-weight: bold; */
font-size: 14px; font-size: 16px; /*14px*/
color: #CA7C29; color: #2485AE; /*#CA7C29*/
padding-left:8px; /*tlw72*/
text-decoration: none; /*tlw72*/
} }
.EditBody .gadgets-gadget-title a { .EditBody .gadgets-gadget-title a {
color:#3B6394; color:#3B6394;
@ -77,8 +81,9 @@
.gadgets-gadget-title-button img { .gadgets-gadget-title-button img {
border: 2px solid #4F5CC7; border: 2px solid #4F5CC7;
border: none; border: none;
float: right; float: left; /*right*/
margin-right: 2px; margin-left: 2px; /*margin-right*/
margin-top:6px; /*tlw72*/
} }
.EditBody .gadgets-gadget-title-button img { .EditBody .gadgets-gadget-title-button img {
float: left; float: left;