diff --git a/productMods/css/individual/individual-2column-view.css b/productMods/css/individual/individual-2column-view.css index 081991d6..ec6c494d 100644 --- a/productMods/css/individual/individual-2column-view.css +++ b/productMods/css/individual/individual-2column-view.css @@ -139,11 +139,6 @@ p#networks { border-top: 1px solid #DDE4E3; padding-top: 10px; } -.collaboratorship-link-separator-solid { - margin-top: 10px; - border-top: 1px solid #DDE4E3; - padding-top: 10px; -} .sparkline_text { font-size: .9em; text-align: left; @@ -174,27 +169,21 @@ div#pub_count_short_sparkline_vis { height: 48px; margin-bottom: 20px; } -/* <------ INDIVIDUAL TEMPORAL GRAPH */ +/* <------ INDIVIDUAL TEMPORAL GRAPH & MAP O' SCIENCE*/ #temporal-graph { padding: 0 3px 8px 0; background-color: #fff; margin-top: -4px; } -#temporal-graph h3 img { - padding-right: 10px; - vertical-align: middle; -} - -/* <------ INDIVIDUAL MAP O' SCIENCE */ -#map-of-science { - padding: 0 3px 24px 0; - background-color: #fff; -} +#temporal-graph h3 img, #map-of-science h3 img { padding-right: 10px; vertical-align: middle; } - +#map-of-science { + padding: 0 3px 24px 0; + background-color: #fff; +} /* <------ POSITIONS */ ul#individual-personInPosition { list-style-type: circle; @@ -213,7 +202,7 @@ ul#individual-personInPosition li:last-child { div#contactsWebpages { width:100%; display:inline; - clear:both + clear:both; } div#contactContainer { width:50%; @@ -264,15 +253,6 @@ span#qrCodeImage { overflow:visible; z-index:1000; } -span#qrCodeImage img { - padding: 1.7em 1.7em 0 1.7em; -} -a.qrCloseLink { - float: right; - padding-right: 1em; - margin-right: 0; - font-size: .8em; -} /* MISCELLANEOUS------> */ span#quickViewLink { clear:both; @@ -281,10 +261,6 @@ span#quickViewLink { span#quickViewLink img { margin-top:35px; } -a#manageLabels { - margin-left:20px; - font-size:0.7em; -} /****** FROM WILMA.CSS ******/ #individual-info h2.mainPropGroup { border-bottom: 1px solid #DDE4E3; diff --git a/productMods/css/individual/individual-quick-view.css b/productMods/css/individual/individual-quick-view.css index 2343fd35..d2e5f8a4 100644 --- a/productMods/css/individual/individual-quick-view.css +++ b/productMods/css/individual/individual-quick-view.css @@ -78,9 +78,6 @@ span#qrCodeImage { text-align:middle; overflow:visible; } -span#qrCodeImage img { - padding: 1.7em 1.7em 0 1.7em; -} /* <----- WEBPAGE CONTENT LEFT SIDE -----> */ .edit-mainImage { position: absolute; @@ -190,15 +187,6 @@ div#profileTypeContainer h2 { padding-top:0 !important; background:red !important; } -ul#individual-visualization li { - float: left; - padding-right: 10px; - margin-right: 10px; - border-right: 1px solid #5e6363; -} -ul#individual-visualization li:last-child { - border: none; -} /* <------ POSITIONS ------> */ ul#individual-personInPosition { list-style-type: circle; @@ -221,13 +209,15 @@ ul#individual-personInPosition li { margin-left: 8px !important; } /* <------ GEOGRAPHIC FOCUS */ -ul#individual-geographicFocus li { +ul#individual-geographicFocus li, +ul#individual-visualization li { float: left; padding-right: 10px; margin-right: 10px; border-right: 1px solid #5e6363; } -ul#individual-geographicFocus li:last-child { +ul#individual-geographicFocus li:last-child, +ul#individual-visualization li:last-child { border: none; } /* <------ MISC. ------> */ diff --git a/productMods/css/individual/individual-vivo.css b/productMods/css/individual/individual-vivo.css index 38ac6550..ff669b9f 100644 --- a/productMods/css/individual/individual-vivo.css +++ b/productMods/css/individual/individual-vivo.css @@ -68,9 +68,6 @@ ul#additional-emails li { margin-top: 10px; } /* <------ INDIVIDUAL INTRO - RIGHT SIDE CONTENT */ -#individual-info.withThumb { - width: 78%; -} #individual-intro .individual-overview { margin: 0; display: inline; @@ -168,34 +165,25 @@ p.view-all-coauthors { width: 200px; text-align: left; } -/* <------ INDIVIDUAL TEMPORAL GRAPH */ +/* <------ INDIVIDUAL TEMPORAL GRAPH & MAP O' SCIENCE */ #temporal-graph { padding: 0 3px 20px 0; background-color: #fff; } -#temporal-graph h3 { - margin: 0; - padding: 0; -} -#temporal-graph h3 img { - padding-right: 10px; - vertical-align: text-top; -} - -/* <------ INDIVIDUAL MAP O' SCIENCE */ -#map-of-science { - padding: 0 29px 20px 0; - background-color: #fff; -} -#map-of-science h3 { - margin: 0; - padding: 0; -} +#temporal-graph h3 img, #map-of-science h3 img { padding-right: 10px; vertical-align: text-top; } - +#map-of-science { + padding: 0 29px 20px 0; + background-color: #fff; +} +#map-of-science h3, +#temporal-graph h3 { + margin: 0; + padding: 0; +} /* <------ POSITIONS */ ul#individual-personInPosition { list-style-type: circle; @@ -209,12 +197,7 @@ ul#individual-personInPosition li:last-child { } /* <------ RESEARCH AREA */ -ul#individual-hasResearchArea li { - float: left; - padding-right: 10px; - margin-right: 10px; - border-right: 1px solid #5e6363; -} +ul#individual-hasResearchArea li, ul#individual-facultyMemberships li { float: left; padding-right: 10px; diff --git a/productMods/css/visualization/coauthorship/style.css b/productMods/css/visualization/coauthorship/style.css index b73bd521..bca99d18 100644 --- a/productMods/css/visualization/coauthorship/style.css +++ b/productMods/css/visualization/coauthorship/style.css @@ -73,6 +73,7 @@ ul { height :23px; display: block; } +#topNav ul li a:hover, #topNav ul li a.hover { background: url(../../../site_icons/visualization/coauthorship/top_btn_h.gif) no-repeat 0 0 #E1DBC7; color: #FFFFFF; @@ -84,17 +85,6 @@ ul { height: 23px; display: block; } -#topNav ul li a:hover { - background: url(../../../site_icons/visualization/coauthorship/top_btn_h.gif) no-repeat 0 0 #E1DBC7; - color: #FFFFFF; - font: bold 11px/23px "Trebuchet MS", Arial, Helvetica, sans-serif; - text-transform: uppercase; - text-align: center; - text-decoration: none; - width: 65px; - height: 23px; - display: block; -} /* shadow */ #topShadow { background: url(../../../site_icons/visualization/coauthorship/top_shadow.gif) no-repeat 0 0 #FDF9EE; @@ -145,19 +135,12 @@ ul { float: left; font: normal 24px/42px Georgia, "Times New Roman", Times, serif; } +#eventLink h2 span, #bodyPannel form.search h2 span { background-color: #FFFFFF; color: #0B0B0B; font: normal 24px/42px Georgia, "Times New Roman", Times, serif; } -#bodyPannel form.search label { - background-color: #FFFFFF; - color: #0B0B0B; - margin: 0 0 8px 0; - float: left; - font: bold 10px/28px Arial, Helvetica, sans-serif; - text-transform: uppercase; -} #bodyPannel form.search input { background-color: #EFEBDE; color: #0B0B0B; @@ -205,11 +188,6 @@ ul { padding: 6px 0 10px 48px; font: normal 28px/42px Georgia, "Times New Roman", Times, serif; } -#eventLink h2 span { - background-color: #FFFFFF; - color: #0B0B0B; - font: normal 28px/42px Georgia, "Times New Roman", Times, serif; -} #eventLink ul { float: left; padding: 0 0 0 5px; @@ -403,6 +381,7 @@ ul { color: #0B0B0B; font: normal 24px/30px Georgia, "Times New Roman", Times, serif; } +#bodyPannel form.search label, #newsLetter form.newsLetter label { background-color: #FFFFFF; color: #0B0B0B; diff --git a/productMods/css/visualization/entitycomparison/layout.css b/productMods/css/visualization/entitycomparison/layout.css index caeb08c4..a902bd6c 100644 --- a/productMods/css/visualization/entitycomparison/layout.css +++ b/productMods/css/visualization/entitycomparison/layout.css @@ -9,7 +9,9 @@ overflow: hidden; } -#body { +#body, +#error-container, +span#copy-vis-viewlink { display: none; } @@ -23,9 +25,6 @@ color:#aaa; margin-left:-18px; } -#error-container { - display: none; -} /* This is for the overlay that happens when you change the parameter. Somehow the top @@ -114,10 +113,6 @@ img.bar-count-icon { font-size: 0.75em; } -span#copy-vis-viewlink { - display: none; -} - img#copy-vis-viewlink-icon { cursor: pointer; } @@ -134,7 +129,8 @@ a.temporalGraphLinks { text-decoration: none; padding-bottom: 3px; } -a.clear-selected-entities { +a.clear-selected-entities, +#legend-row-header a { background-color: #878787; } #paginated-table-footer { @@ -149,9 +145,6 @@ a.clear-selected-entities { #loading-comparisons img { vertical-align: sub; } -#legend-row-header a { - background-color: #878787; -} #reset-search { color: #2485AE; cursor: pointer; diff --git a/productMods/css/visualization/mapofscience/layout.css b/productMods/css/visualization/mapofscience/layout.css index f9fb7761..6562ce82 100644 --- a/productMods/css/visualization/mapofscience/layout.css +++ b/productMods/css/visualization/mapofscience/layout.css @@ -13,11 +13,6 @@ margin-bottom: 6px; margin-top: 6px; } - -.hide-dom-on-init { - display: none; -} - #left-column { float: left; width: 260px; @@ -211,11 +206,7 @@ hr.subtle-hr { height: 30px; } -.datatable-table { - font-size: 0.9em; - width: 100%; -} - +.datatable-table, .entity-datatable-table { font-size: 0.9em; width: 100%; @@ -262,10 +253,7 @@ a.map-of-science-links { margin-top: 0; } -.filterInfo { - font-size: 0.81em; -} - +.filterInfo, .paginatedtabs { font-size: 0.81em; } @@ -286,7 +274,8 @@ a.map-of-science-links { /* --------------------------------------------------------------> */ /* SPECIAL STYLES FOR THE error */ /* --------------------------------------------------------------> */ -#error-container { +#error-container, +.hide-dom-on-init { display: none; } diff --git a/productMods/css/visualization/personlevel/page.css b/productMods/css/visualization/personlevel/page.css index 2ef22e4e..1c19bfbd 100644 --- a/productMods/css/visualization/personlevel/page.css +++ b/productMods/css/visualization/personlevel/page.css @@ -46,10 +46,6 @@ p.datatable { width: 67%; float: right; } -#profileImage img{ - width: 90px; - height: auto; -} #body h1 { margin: 0; } @@ -61,10 +57,7 @@ p.datatable { vertical-align: bottom; } .investigator_name, -.author_name { - color: #2485AE; - font-weight: bold; -} +.author_name, .neutral_investigator_name, .neutral_author_name { color: #2485AE; @@ -86,18 +79,12 @@ p.datatable { display: none; margin-top: -55PX; } -#publication-count-sparkline-include { - float: left; - width: 50%; -} -#coauthor-count-sparkline-include { - float: right; - width: 50%; -} +#publication-count-sparkline-include, #grant-count-sparkline-include { float: left; width: 50%; } +#coauthor-count-sparkline-include, #coinvestigator-count-sparkline-include { float: right; width: 50%; @@ -124,7 +111,8 @@ table.sparkline_wrapper_table td, th { float: left; padding-right: 5px; } -#ego_profile_image img { +#ego_profile_image img, +#profileImage img { width: 90px; height: auto; } diff --git a/productMods/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl b/productMods/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl index 8461d540..a0f9d591 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-dept-active-grants.ftl @@ -14,7 +14,7 @@

${i18TextString} ${firstRow["deptLabel"]} ${i18n().department}

<#break> - +
diff --git a/productMods/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl b/productMods/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl index 2c40d649..4bd7bc51 100644 --- a/productMods/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl +++ b/productMods/templates/freemarker/edit/forms/addEditorsToInformationResource.ftl @@ -48,7 +48,7 @@

${i18n().manage_editors}

-
${i18n().grant_name} ${i18n().close_date}