From 85169559797c1d9ed14b0ad6f5bf3a59103060fb Mon Sep 17 00:00:00 2001 From: Tim Worrall Date: Mon, 22 Sep 2014 12:58:52 -0400 Subject: [PATCH] VIVO-201: removed some css redundancies --- webapp/themes/vitro/css/vitroTheme.css | 334 +++++------------- webapp/web/css/account/account.css | 120 +------ webapp/web/css/classHierarchy.css | 6 +- webapp/web/css/edit.css | 53 +-- webapp/web/css/individual/individual.css | 11 +- webapp/web/css/login.css | 10 +- webapp/web/css/menupage/menuManagement.css | 10 +- webapp/web/css/menupage/menupage.css | 16 +- webapp/web/css/menupage/pageList.css | 40 --- webapp/web/css/menupage/pageManagement.css | 5 - webapp/web/css/search.css | 5 +- webapp/web/css/uploadImages.css | 6 - webapp/web/css/vitro.css | 93 +++-- .../body/accounts/userAccounts-list.ftl | 2 +- .../body/pagemanagement/pageList.ftl | 2 +- .../freemarker/edit/forms/css/customForm.css | 21 +- .../forms/css/customFormWithAutocomplete.css | 9 +- 17 files changed, 199 insertions(+), 544 deletions(-) diff --git a/webapp/themes/vitro/css/vitroTheme.css b/webapp/themes/vitro/css/vitroTheme.css index 3fd41b0c4..3f9c50ab0 100644 --- a/webapp/themes/vitro/css/vitroTheme.css +++ b/webapp/themes/vitro/css/vitroTheme.css @@ -29,12 +29,17 @@ body { body { background: #fff url(../images/header-background.gif) center 0 repeat-x; } -a:hover { - text-decoration: none; -} a { color: #47B6D0; } +a:hover, +h2 a:hover, +h2 a:active, +ul#header-nav a:link, +ul#header-nav a:visited, +.pagination.menupage li a { + text-decoration: none; +} em { font-style: italic; } @@ -53,10 +58,6 @@ h2 a:link, h2 a:visited { text-decoration: underline; } -h2 a:hover, -h2 a:active { - text-decoration: none; -} h3 { padding: 10px 0 12px 0; margin: 0; @@ -135,9 +136,6 @@ input.form-button:visited { font-size: 12px; color: #fff; } -#verbose-mode span { - color: #888C8C; -} #verbose-mode b { color: #595B5B; } @@ -187,7 +185,8 @@ input.delete:active, input#delete:active, input.submit:active, input#submit:active, -input.form-button:active { +input.form-button:active, +.button:active { top: 1px; } form textarea { @@ -242,9 +241,6 @@ p.submit { background-color: #f1f2ee; border-color: #dfe6e6; } -.editingForm .entryFormHead h2 { - color: #5F6464; -} .form-item { margin-top:.3em; background-color: #fff; @@ -254,12 +250,6 @@ p.submit { color: #595B5B; padding: .3em; } -.navlinkblock { - color: #5F6464; -} -.header { - color: #5F6464; -} .database_header { background-color: #f1f2ee; color: #47B6D0; @@ -274,7 +264,8 @@ p.submit { color: #5F6464; font-size: 1em; } -.rownumheader { +.rownumheader, +.rownum { background-color: #F1F2EE; color: #5F6464; font-size: 1em; @@ -294,9 +285,7 @@ p.submit { background-color: #f7f9f9; font-size: 1em; } -.postheadercenter { - font-size: 1em; -} +.postheadercenter, .postheaderright { font-size: 1em; } @@ -326,11 +315,6 @@ p.submit { font-size: 10pt; /*1em;*/ line-height: 2em; } -.rownum { - background-color: #F1F2EE; - color: #5F6464; - font-size: 1em; -} .form-background { background-color: #fff; } @@ -377,7 +361,11 @@ form select { border: 1px dotted #FFD324; } a.ingestMenu:link, -a.ingestMenu:visited { +a.ingestMenu:visited, +ul#alpha-browse-individuals a, +ul#browse-classes a, +ul#find-filters a, +ul#vgraph-classes a { text-decoration: none; color: #5E6363; } @@ -423,9 +411,6 @@ hr.formDivider { margin-top: 15px; opacity: 0.3; } -tr.editformcell td select { - font-size: .8em; -} .editingForm table { width: 100%; border: none; @@ -472,21 +457,11 @@ ul#header-nav li { font-size: .7em; color: #fff; } -ul#header-nav li.last { - border-right: none; -} ul#header-nav li:last-child { padding-left: 1px; padding-right: 0; border-right: none; } -ul#header-nav a { - color: #fff; -} -ul#header-nav a:link, -ul#header-nav a:visited { - text-decoration: none -} ul#header-nav a:hover, ul#header-nav a:active { text-decoration: none; @@ -555,13 +530,10 @@ ul#main-nav { color: #706a66; text-decoration: none; } -#main-nav li a:hover { - color: #002b44; - background: url(../images/rollover-nav.gif) left bottom repeat-x; -} +#main-nav li a:hover, #main-nav li a.selected { - color: #002b44; background: url(../images/rollover-nav.gif) left bottom repeat-x; + color: #002b44; } /* WRAPPER CONTENT------> */ #wrapper-content { @@ -598,7 +570,14 @@ body.loggedIn #intro { line-height: 1.3em; padding: 0 24px 0 24px; } -#intro a { +#intro a, +#terms h3, +#revision-build-date h3, +#visual-graph h5 +.blue, +.green, +p.forgot-password a, +h3.internal-auth:hover { color: #47B6D0 } /* LOG IN------> */ @@ -622,12 +601,6 @@ body.login #login { padding-top: 18px; border-bottom: none; } -h3.internal-auth { - color: #5E6363; -} -h3.internal-auth:hover { - color: #47B6D0; -} #error-alert { margin: 0 12px; margin-bottom: 12px; @@ -710,9 +683,6 @@ p.forgot-password { padding-top: 1.2em; padding-bottom: 1.2em; } -p.forgot-password a { - color: #47B6D0; -} p.request-account { width: 219px; clear: both; @@ -722,9 +692,6 @@ p.request-account { padding-top: 20px; border-top: 1px solid #e8ece9; } -p.request-account a { - color: #fff; -} p.password-note { font-size: 12px; color: #949696; @@ -785,7 +752,12 @@ input.search-homepage { padding-left: 0; margin-left: 0; } -#filter-search-nav a.active { +#filter-search-nav a.active, +#stats p, +p.request-account a, +ul#header-nav a, +ul#browse-classgroups a.selected span.count-classes, +ul#browse-classgroups a:hover span.count-classes { color: #fff; } #filter-search-nav a { @@ -813,16 +785,8 @@ ul#browse-classgroups { ul#browse-classgroups li { border-bottom: 1px solid #bbbbb9; } -ul#browse-classgroups a:hover { - background-image: none; - color: #fff; - background-color: #7c7a77; -} -ul#browse-classgroups a.selected { - color: #fff; - background-image: none; - background-color: #7c7a77; -} +ul#browse-classgroups a:hover, +ul#browse-classgroups a.selected, ul#classes-in-classgroup a:hover { background-image: none; color: #fff; @@ -832,9 +796,6 @@ ul#classes-in-classgroup a.selected { color: #fff; background-image: none; } -#visual-graph h5 { - color: #47B6D0; -} svg text:hover { color: #2EA0CF; } @@ -848,18 +809,13 @@ p.view-all { a.view-all-style { color: #303e4e } -ul#browse-classgroups a.selected span.count-classes, -ul#browse-classgroups a:hover span.count-classes { - color: #fff; -} - /* HOME STATS-----> */ #home-stats { border-top: 1px dotted #dbe3e3; /* stroke */ border-bottom: 1px dotted #dbe3e3; /* stroke */ background-color: #fff; /* layer fill content */ } -#home-stats h4 { +.home-sections h4 { border-top: 1px solid rgba(220,228,227,.42); /* stroke */ border-bottom: 1px solid rgba(220,228,227,.42); /* stroke */ background-color: #395d7f; /* layer fill content */ @@ -876,9 +832,6 @@ ul#browse-classgroups a:hover span.count-classes { background: #5e6363 url(../images/stats-bg.png) repeat-x 0 0; color: #fff; } -#stats p { - color: #fff; -} #stats li a:hover { opacity: .5; } @@ -919,33 +872,26 @@ ul#footer-nav li { padding-right: 10px; border-right: 1px solid #c9c8c8; } -ul#footer-nav li:last-child { - border-right: none +ul#footer-nav li:last-child, +ul#header-nav li.last, +ul#individual-hasResearchArea li:last-child { + border-right: none; } #footer-nav a { color: #4e5051 } -#footer-nav a:hover { - color: #09C; - text-decoration: none; -} -a.terms { - color: #09C; - text-decoration: none; -} -a.terms:hover { - color: #4e5051; - text-decoration: none; -} +#footer-nav a:hover, +a.terms, a.powered-by-vitro { color: #09C; text-decoration: none; } +a.terms:hover, a.powered-by-vitro:hover { color: #4e5051; text-decoration: none; } -p{ +p { margin-bottom: 1.3em; } @@ -968,15 +914,6 @@ p{ background-color: #111; color: #fff; } -.button:active { - top: 1px; -} -.blue { - color: #47B6D0; -} -.green { - color: #47b6d0; -} .small.button, .small.button:visited { font-size: 11px @@ -1033,6 +970,7 @@ p{ /* -------------------------------------------------> */ /* VISUAL GRAPH------> */ +.property-group, #menupage-intro { width: 920px; background: #fff; @@ -1062,25 +1000,11 @@ p{ color: #47B6D0; font-weight: normal; } -ul#vgraph-classes li { - border-bottom: 1px solid #dde4e3; - font-size: 1em; -} -ul#vgraph-classes a { - color: #5e6363; - text-decoration: none; -} +ul#vgraph-classes a.selected, ul#vgraph-classes a:hover { background: url(../images/arrow.gif) 0 10px no-repeat; color: #2ea0cf; } -ul#vgraph-classes a.selected { - color: #2ea0cf; - background: url(../images/arrow.gif) 0 10px no-repeat; -} -ul#vgraph-classes .count-classes { - font-size: .75em; -} /* FIND BY ------> */ #find-by { border: 1px solid #e4eae9; @@ -1090,17 +1014,10 @@ ul#vgraph-classes .count-classes { color: #47B6D0; font-weight: normal; } -ul#find-filters a { - color: #5e6363; - text-decoration: none; -} -ul#find-filters a:hover { - background: url(../images/arrow.gif) 0 6px no-repeat; - color: #2ea0cf; -} +ul#find-filters a:hover, ul#find-filters a.selected { - color: #2ea0cf; background: url(../images/arrow.gif) 0 6px no-repeat; + color: #2ea0cf; } /* RESEARCHERS ------> */ #researchers { @@ -1158,39 +1075,20 @@ ul#browse-classes { border-right: 0; background-color: #f1f2ee; } -ul#browse-classes li { +ul#browse-classes li, +ul#vgraph-classes li { border-bottom: 1px solid #dde4e3; font-size: 1em; } -ul#browse-classes a { - color: #5e6363; - text-decoration: none; -} -ul#browse-classes a:hover { - background: url(../images/arrow.gif) 4px 5px no-repeat; - color: #2ea0cf; -} +ul#browse-classes a:hover, ul#browse-classes a.selected { - color: #2ea0cf; background: url(../images/arrow.gif) 4px 5px no-repeat; + color: #2ea0cf; } ul#browse-classes .count-classes { font-size: 12px; } /* ALPHA BROWSE------> */ -ul#alpha-browse-individuals { - border: 1px solid #dde4e3; - background-color: #fff; - border-left: 1px solid #dde4e3; - border-bottom: none; -} -ul#alpha-browse-individuals li { - font-size: .8em; -} -ul#alpha-browse-individuals a { - color: #5e6363; - text-decoration: none; -} ul#alpha-browse-individuals a:hover { background: url(../images/arrowSmall.gif) -3px 7px no-repeat; color: #2ea0cf; @@ -1201,12 +1099,17 @@ ul#alpha-browse-individuals a.selected { margin-right: 3px; margin-left: 5px; } -ul#alpha-browse-individuals .count-classes { +ul#alpha-browse-individuals .count-classes, +ul#vgraph-classes .count-classes { font-size: .75em; } -.alphaIndex { +.alphaIndex, +.pagination.menupage, +tr.editformcell td select, +ul#alpha-browse-individuals li { font-size: .8em; } +ul#alpha-browse-individuals, nav#alpha-browse-container { border: 1px solid #dde4e3; background-color: #fff; @@ -1228,19 +1131,12 @@ ul#alpha-browse-individuals { #individuals-in-class li img { border: 2px solid #dde4e3; } -#individuals-in-class li h1 { +#individuals-in-class li h1, +#property-group-menu ul, +article.property ul.property-list { color: #5e6363; font-size: 1em; } -.pagination.menupage { - font-size: .8em; -} -.pagination.menupage li.selected { - color: #5e6363; -} -.pagination.menupage li a { - text-decoration: none; -} .pagination.menupage li a:hover { background: #5e6363; } @@ -1286,7 +1182,8 @@ ul#alpha-browse-individuals { background: #47B6D0; color: #fff; } -#admin .uri-link { +#admin .uri-link, +#verbose-mode span { color: #888c8c; } #admin a { @@ -1300,10 +1197,11 @@ ul#alpha-browse-individuals { font-size: 1.375em; color: #47B6D0; } -#individual-intro span.display-title { +#individual-intro span.display-title, +h1.fn .display-title { font-size: .825em; color: #5e6363; - border-left: 1px solid #A6B1B0; + border-left: 1px solid #a6b1b0; } ul#individual-tools { color: #8AA149; @@ -1312,12 +1210,6 @@ ul#individual-tools li{ float: left; padding-right: .5em; } -#individual-intro ul.individual-urls li a { - color: #47B6D0; -} -h2#mainImage, #share-contact h2 { - color: #5E6363; -} /* INDIVIDUAL INTRO - LEFT SIDE CONTENT ------> */ img.individual-photo { border: 7px solid #ebebeb; @@ -1326,19 +1218,14 @@ ul#individual-tools-people { border-bottom: 1px solid #e8ece9; color: #47b6d0; } -ul#individual-tools-people li a { - color: #47b6d0; -} ul#individual-tools { color: #8AA149 } -ul#individual-tools li a { - color: #47b6d0; -} -#share-contact a.email { - color: #5f6464; -} -#share-contact a.tel { +#share-contact a.email, +#share-contact a.tel, +.editingForm .entryFormHead h2, +.header, +.navlinkblock { color: #5f6464; } ul.individual-urls { @@ -1359,17 +1246,17 @@ ul.individual-urls li { font-size: .875em; line-height: 1.6em; } -ul.individual-urls li a { - color: #47B6D0; -} ul.individual-urls-people { list-style: url(../../../images/individual/arrow-grey.gif); } -ul.individual-urls-people li a { - color: #47B6D0; -} /* INDIVIDUAL RIGHT CONTENT ------> */ -#individual-info { +#individual-info, +#property-group-menu a, +.grey, +.pagination.menupage li.selected, +h2#mainImage, +#share-contact h2, +h3.internal-auth { color: #5e6363; } #individual-info h1.fn { @@ -1377,11 +1264,6 @@ ul.individual-urls-people li a { color: #006279; line-height: 1.3em; } -h1.fn .display-title { - font-size: .825em; - color: #5e6363; - border-left: 1px solid #a6b1b0; -} #individual-info h2 { color: #5E6363; font-size: 1em; @@ -1398,9 +1280,6 @@ ul#individual-personInPosition { ul#individual-personInPosition li { line-height: 1.8em; } -ul#individual-personInPosition li a { - color: #47B6D0; -} .individual-overview { font-size: 1em; padding-right: 10px; @@ -1413,18 +1292,18 @@ ul#individual-hasResearchArea { ul#individual-hasResearchArea li { border-right: 1px solid #A6B1B0; } -ul#individual-hasResearchArea li:last-child { - border-right: none; -} -ul#individual-hasResearchArea li a { +ul#individual-hasResearchArea li a, +ul#individual-personInPosition li a, +ul#individual-tools li a, +ul#individual-tools-people li a, +#individual-intro ul.individual-urls li a, +ul.individual-urls-people li a, +ul.individual-urls li a { color: #47B6D0; } /* INDIVIDUAL VISUALIZATION ------> */ -#visualization h3 { - font-size: 1.25em; - color: #47B6D0; -} -.publication-year-range { +.publication-year-range, +p.view-all-coauthors { font-size: .875em; } a.all-vivo-publications { @@ -1441,28 +1320,19 @@ a.all-vivo-publications { img.co-author { border: 2px solid #ebebeb; } -#co-authors h3 { +#co-authors h3, +#visualization h3 { font-size: 1.25em; color: #47B6D0; } -p.view-all-coauthors { - font-size: .875em; -} /* PROPERTY GROUP MENU ------> */ #property-group-menu { width: 920px; background: #f1f2ee; } -#property-group-menu ul { - color: #5e6363; - font-size: 1em; -} #property-group-menu li { background: url(../../../images/individual/separator-property-group-nav.jpg) right 10px no-repeat; } -#property-group-menu a { - color: #5e6363; -} #property-group-menu a:hover { color: #002b44; } @@ -1470,10 +1340,6 @@ p.view-all-coauthors { background: none; } /* PROPERTY GROUP ------> */ -.property-group { - width: 920px; - background: #fff; -} section.property-group h2 { font-size: 1.25em; color: #006279; @@ -1496,18 +1362,11 @@ article.property .data-property-statement { font-size: 1em; color: #5e6363; } -article.property ul.property-list { - font-size: 1em; - color: #5e6363; -} article.property ul.property-list li a { color: #47B6D0; line-height: 1.6em; } /* MISCELLANEOUS ------> */ -.grey { - color: #5e6363; -} .displace { position: absolute; left: -9999px; @@ -1557,9 +1416,6 @@ a { #revision-build-date { border-left: 1px solid #DFE6E6; } -#revision-build-date h3{ -color: #47B6D0; -} #revision-levels caption { font-size: 18px; color: #47B6D0; @@ -1571,14 +1427,6 @@ color: #47B6D0; #revision-levels td { border: 1px solid #DFE6E6; } - -/* -------------------------------------------------> */ -/* STATIC PAGES -----------------------------------> */ -/* -------------------------------------------------> */ -#terms h3 { - color: #47B6D0; -} - /* -------------------------------------------------> */ /* IE message when JS is disabled -----------------> */ /* -------------------------------------------------> */ diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css index 402521f30..52efb832c 100644 --- a/webapp/web/css/account/account.css +++ b/webapp/web/css/account/account.css @@ -10,46 +10,6 @@ padding: .5em; margin-bottom: 20px; } -table#account { - table-layout: auto; - width: 930px; - text-align: left; - margin: 0 auto; - border-collapse: collapse; - empty-cells: show; - caption-side: top; - margin: 20px 0 20px 0; -} -table#account caption { - display: none; -} -table#account th { - background-color: #F7F9F9; - height: 40px; - color: #064D68; - padding-top: 7px; - border: 1px solid #d9e4ea; - border-bottom: none; - padding-left: 6px; - font-size: .9em; -} -table#account th { - text-align: left; -} /*Fix for IE8 and 9, force text in a cell to be aligned to the left*/ -table#account td { - vertical-align: top; - padding: .5em; - border: 1px solid #d9e4ea; - font-size: .825em; - padding-top: .5em; - padding-bottom: .5em; -} -table#account td a { - word-wrap: break-word; -} -table#account tr:nth-child(2n) { - background-color: rgba(200, 200, 180,.25); -} input#externalAuthChkBox { height:18px; width:18px; @@ -126,7 +86,8 @@ form.customForm p.note { padding-bottom: 20px; padding-top: 5px; } -#add-account p.note { +#add-account p.note, +#passwordContainer { margin-top: 20px; } #search-feedback { @@ -136,8 +97,9 @@ form.customForm p.note { #filter-roles span { font-size: .8em; } -/* CREATE PASSWORD ------> */ -#create-password p.note { +/* CREATE/RESET PASSWORD ------> */ +#create-password p.note, +#reset-password p.note { margin-top: 0; } /* EDIT ACCOUNT ------> */ @@ -149,16 +111,13 @@ form.customForm p.note { padding-bottom: 10px; } #my-account input#email-address, -#my-account input#new-password { +#my-account input#new-password, +#search-proxy h4 { margin-bottom: 0; } section.account-feedback img { padding-right: 5px; } -/* RESET PASSWORD ------> */ -#reset-password p.note { - margin-top: 0; -} /* ASSOCIATE PROFILE ------> */ .explanatoryText { @@ -170,19 +129,13 @@ padding-right: 5px; line-height:15px; margin-top:-8px !important; } -#associated { - float:right; - display:none; -} -#associated label { - margin-bottom: 10px; -} +#associated, #associationOptions { float:right; display:none; } -#verifyProfileLink { - margin-left:10px; +#associated label { + margin-bottom: 10px; } #externalAuthIdInUse { color: #f70; @@ -263,20 +216,10 @@ form.customForm input[name="newPassword"], form.customForm input[name="confirmPassword"] { width: 10em; } -a.disable-delete { - padding-left: 24px; -} #passwordContainer p.note { margin-top: -10px; padding-bottom: 5px; } -#passwordContainer { - margin-top: 20px; -} -.disabledSubmit { - cursor: default ! important; -} - /* PROXY MY ACCOUNT'S PROFILE ------> */ #edit-myProxy { float: right; @@ -311,21 +254,9 @@ a.disable-delete { border-top: 1px solid #E0DFDF; padding-left: 0; } -#edit-myProxy img.photo-profile { - border: 2px solid #DDE4E3; - float: left; -} -#edit-myProxy p.proxy-info { - padding-left: 110px; - padding-top: 15px; -} #edit-myProxy span.class-label { color: #7F8993; } -#edit-myProxy a.remove-proxy { - font-size: .9em; -} - /* MANAGE PROXY ------> */ section.proxy-profile h4 { @@ -335,9 +266,7 @@ section.proxy-profile h4 { #add-relation legend{ display: none; } -.proxy-profile .acSelector { - margin-left: 20px; -} +.proxy-profile .acSelector, #add-relation label { margin-left: 20px; } @@ -412,17 +341,14 @@ p.selected-editors { border-top: 1px solid #E0DFDF; padding-left: 1.2em; } +img.photo-profile, img.photo-proxy { - border: 2px solid #DDE4E3; - float: left; -} - -img.photo-profile { border: 1px solid #DDE4E3; float: left; } #add-relation p.proxy-info, -#list-relation p.proxy-info { +#list-relation p.proxy-info, +#edit-myProxy p.proxy-info { padding-left: 110px; padding-top: 15px; } @@ -435,17 +361,12 @@ img.photo-profile { span.class-label { color: #7F8993; } -a.remove-proxy { - font-size: .9em; -} +a.remove-proxy, a.remove-proxyUri { font-size: .9em; } - -a.remove-proxyUri { - font-size: .9em; -} -h4.profile-editors { +h4.profile-editors, +#verifyProfileLink { margin-left: 10px; } #search-proxy { @@ -453,10 +374,6 @@ h4.profile-editors { padding: 10px; padding-top: 20px; } -#search-proxy h4 { - margin-bottom: 0; -} - #search-proxy p { margin-top: .3em; font-size: .8em; @@ -480,6 +397,7 @@ img.loading-addProfile, img.loading-profileMyAccoount { padding-left: 10px; } -span.unlinkedAccount { +span.unlinkedAccount, +a.disable-delete { padding-left:24px; } \ No newline at end of file diff --git a/webapp/web/css/classHierarchy.css b/webapp/web/css/classHierarchy.css index 089e08122..c2198fb02 100644 --- a/webapp/web/css/classHierarchy.css +++ b/webapp/web/css/classHierarchy.css @@ -15,11 +15,7 @@ table.classHierarchy { table.classHierarchy td { padding-left:6px; } -table.classHierarchy .classDetail { - width:90px; - color:#064D68; - white-space: nowrap; -} +table.classHierarchy .classDetail, td.classDetail { width:90px; color:#064D68; diff --git a/webapp/web/css/edit.css b/webapp/web/css/edit.css index 61623afb4..27e28f392 100644 --- a/webapp/web/css/edit.css +++ b/webapp/web/css/edit.css @@ -4,14 +4,16 @@ label { display: block; margin-top: .5em; } -label.inline { +label.inline, +div.sparqlform label { display: inline; font-weight: normal; } input.block { display: block; } -textarea { +textarea, +div.sparqlform div { margin-bottom: 1.5em; } form { @@ -44,9 +46,7 @@ form dl dt, form dl dd { font-weight: bold; color: #cc0000; } -.inlineForm input { - display: inline; -} +.inlineForm input, .inlineForm label { display: inline; } @@ -205,14 +205,8 @@ td.editformcell { td.editformcell select { margin: 0; } -.header { - background-color: #B0C4DE; - color: #000; - font-family: Arial, Helvetica, sans-serif; - font-size: 10pt; - font-style: normal; - text-align: left; -} +.header, +.database_upperleftcorner, .database_header { background-color: #B0C4DE; color: #000; @@ -221,22 +215,7 @@ td.editformcell select { font-style: normal; text-align: left; } -.database_upperleftcorner { - background-color: #B0C4DE; - color: #000; - font-family: Arial, Helvetica, sans-serif; - font-size: 10pt; - font-style: normal; - text-align: left; -} -.database_upperleftcenter { - background-color: #B0C4DE; - color: #000; - font-family: Arial, Helvetica, sans-serif; - font-size: 10pt; - font-style: normal; - text-align: center; -} +.database_upperleftcenter, .rownumheader { background-color: #B0C4DE; color: #000; @@ -253,14 +232,7 @@ td.editformcell select { font-style: normal; text-align: center; } -.postheader { - background-color: #E6E6FA; - color: #777; - font-family: Arial, Helvetica, sans-serif; - font-size: 10pt; - font-style: normal; - text-align: left; -} +.postheader, .database_postheader { background-color: #E6E6FA; color: #777; @@ -335,13 +307,6 @@ span.entityRelationsSpan { color: #2E440C; text-align: center; } -div.sparqlform label { - display: inline; - font-weight: normal; -} -div.sparqlform div { - margin-bottom: 1.5em; -} div.sparqlform .parenthetical { font-style: italic; margin-top: 0; diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css index d9e5fc29b..39e91f2c1 100644 --- a/webapp/web/css/individual/individual.css +++ b/webapp/web/css/individual/individual.css @@ -210,9 +210,6 @@ article.property ul.subclass-property-list li { padding-right: 1px; vertical-align: middle; } -.delete-individual { - vertical-align: middle; -} .edit-mainImage { position: absolute; background: rgba(255, 255, 255, 0.6); @@ -232,7 +229,8 @@ a.edit-mainImage img.edit-individual { background: rgba(255, 255, 255, 0.6); padding: 0 6px 0 8px; } -.middle { +.middle, +.delete-individual { vertical-align: middle; } a.more-less { @@ -293,10 +291,7 @@ ul.tinyMCEDisc { ol.tinyMCENumeric { list-style-type: decimal; } -ul.tinyMCEDisc li { - padding: 0 !important; - margin-left: 30px; -} +ul.tinyMCEDisc li, ol.tinyMCENumeric li { padding: 0 !important; margin-left: 30px; diff --git a/webapp/web/css/login.css b/webapp/web/css/login.css index 816dce895..1372c7712 100644 --- a/webapp/web/css/login.css +++ b/webapp/web/css/login.css @@ -5,12 +5,11 @@ #login-form label, #login-form input.text, #login-form #password, -#login-form #confirmPassword { +#login-form #confirmPassword, +#login-form label.label-remember-me, +#vivoAccountError { display: block; } -#login-form label.label-remember-me { - display: block; -} #login-form p.submit { float: left; margin-bottom: 0; @@ -72,9 +71,6 @@ h3.internal-auth { .vivoAccount { display: none; } -#vivoAccountError { - display: block; -} .formFieldAlert { border: 2px solid #900; } diff --git a/webapp/web/css/menupage/menuManagement.css b/webapp/web/css/menupage/menuManagement.css index cce1a8fb0..131d33c3f 100644 --- a/webapp/web/css/menupage/menuManagement.css +++ b/webapp/web/css/menupage/menuManagement.css @@ -7,7 +7,9 @@ display:none; } #add-menu-item p, -#edit-menu-item p { +#edit-menu-item p, +#existingContentType, +#selectContentType label { margin-top: 15px; } #add-menu-item input[name="prettyUrl"], @@ -18,12 +20,6 @@ #edit-menu-item p.note { margin-top: 5px; } -#existingContentType { - margin-top: 15px; -} -#selectContentType label { - margin-top: 15px; -} #selectedContentTypeValue { padding: 0.2em 0.4em; background: #f4f4f4; diff --git a/webapp/web/css/menupage/menupage.css b/webapp/web/css/menupage/menupage.css index 7a41e3767..066f71bbc 100644 --- a/webapp/web/css/menupage/menupage.css +++ b/webapp/web/css/menupage/menupage.css @@ -33,9 +33,6 @@ ul#vgraph-classes li { height: 35px; line-height: 35px; } -ul#vgraph-classes li:last-child { - border-bottom: 0; -} ul#vgraph-classes a { display: block; padding-left: 15px; @@ -123,9 +120,6 @@ ul#find-filters a { height: 115px; float: left; } -#profile-photo-display ul { - display: block; -} #profile-photo-display li { display: block; width: 90px; @@ -181,9 +175,6 @@ ul#browse-classes li { padding-top: 10px; padding-bottom: 10px; } -ul#browse-classes li:last-child { - border-bottom: 0; -} ul#browse-classes a { display: block; padding-left: 20px; @@ -203,7 +194,9 @@ ul#alpha-browse-individuals li { ul#alpha-browse-individuals li:first-child { padding-left: 1px; } -ul#alpha-browse-individuals li:last-child { +ul#alpha-browse-individuals li:last-child, +ul#vgraph-classes li:last-child, +ul#browse-classes li:last-child { border-bottom: 0; } ul#alpha-browse-individuals a { @@ -258,7 +251,8 @@ li.individual h1.thumb { font-size: .8em; line-height: 1; } -#individuals-in-class span.org { +#individuals-in-class span.org, +#profile-photo-display ul { display: block; } ul.mostSpecificTypes li { diff --git a/webapp/web/css/menupage/pageList.css b/webapp/web/css/menupage/pageList.css index 28b147602..8dd24a9f6 100644 --- a/webapp/web/css/menupage/pageList.css +++ b/webapp/web/css/menupage/pageList.css @@ -5,49 +5,9 @@ height:18px; background: url("../../images/checkMark.png") no-repeat left center; } -table#pageList { - table-layout: auto; - width: 930px; - text-align: left; - margin: 0 auto; - border-collapse: collapse; - empty-cells: show; - caption-side: top; - margin: 20px 0 20px 0; -} -table#pageList caption { - display: none; -} -table#pageList th { - background-color: #F7F9F9; - height: 40px; - color: #064D68; - padding-top: 7px; - border: 1px solid #d9e4ea; - border-bottom: none; - padding-left: 6px; - font-size: .9em; -} -table#pageList th { - text-align: left; -} /*Fix for IE8 and 9, force text in a cell to be aligned to the left*/ th#isMenuPage { width: 86px; } th#iconColumns { width: 90px; -} -table#pageList td { - vertical-align: top; - padding: .5em; - border: 1px solid #d9e4ea; - font-size: .825em; - padding-top: .5em; - padding-bottom: .5em; -} -table#pageList td a { - word-wrap: break-word; -} -table#pageList tr:nth-child(2n) { - background-color: rgba(200, 200, 180,.25); } \ No newline at end of file diff --git a/webapp/web/css/menupage/pageManagement.css b/webapp/web/css/menupage/pageManagement.css index 180230eec..ea17c29c8 100644 --- a/webapp/web/css/menupage/pageManagement.css +++ b/webapp/web/css/menupage/pageManagement.css @@ -144,8 +144,3 @@ form#managePage textarea { margin-bottom: .8em; width: 65%; } -.disabledSubmit { - color: #ede ! important; - background-color: #b2d15a ! important; - cursor: default ! important; -} diff --git a/webapp/web/css/search.css b/webapp/web/css/search.css index 6f00b95e4..db043d048 100644 --- a/webapp/web/css/search.css +++ b/webapp/web/css/search.css @@ -2,15 +2,12 @@ /* Search form styles */ -/* Search form */ -.advancedSearchForm .form-button { - margin-top: 1em -} /* Class and subclass refinement links */ .searchTOC { margin-bottom: 1.5em; } /* Search results */ +.advancedSearchForm .form-button, .searchhits li { margin-top: 1em; } diff --git a/webapp/web/css/uploadImages.css b/webapp/web/css/uploadImages.css index 3585abb42..b4101984a 100644 --- a/webapp/web/css/uploadImages.css +++ b/webapp/web/css/uploadImages.css @@ -77,12 +77,6 @@ margin-bottom: 5px; height: 30px; } -#error-alert img { - float: left; - margin: 0; - padding: 0; - vertical-align: middle; -} #error-alert p { padding-left: 35px; font-size: .9em; diff --git a/webapp/web/css/vitro.css b/webapp/web/css/vitro.css index c64dc9db0..244b9e50d 100644 --- a/webapp/web/css/vitro.css +++ b/webapp/web/css/vitro.css @@ -20,6 +20,9 @@ .hidden { display: none !important; } +.disabledSubmit { + cursor:default ! important; +} /* <------ USER FEEDBACK*/ #error-alert { color: #900; @@ -27,13 +30,15 @@ margin-bottom: 5px; height: auto; } -#error-alert img { +#error-alert img, +#confirmation-alert img { float:left; margin: 0; padding: 0; vertical-align: middle; } -#error-alert p { +#error-alert p, +#confirmation-alert p { padding-left: 30px; font-size: .9em; line-height: 30px; @@ -47,17 +52,6 @@ margin-bottom: 5px; height: 30px; } -#confirmation-alert img { - float: left; - margin: 0; - padding: 0; - vertical-align: middle; -} -#confirmation-alert p { - padding-left: 30px; - font-size: .9em; - line-height: 30px; -} #flash-message { background-color: #7285a0; padding: .5em; @@ -166,12 +160,14 @@ a.close { ul.dropdown { position: relative; } -ul.dropdown li { +ul.dropdown li, +ul.language-dropdown li { float: left; zoom: 1; padding: 0 !important; } -ul.dropdown li a { +ul.dropdown li a, +ul.language-dropdown li a { display: block; font-size: 1.4em; } @@ -185,14 +181,18 @@ ul.dropdown li#user-menu a { margin-left:10px; } ul.dropdown li#user-menu.hover, -ul.dropdown li#user-menu:hover { +ul.dropdown li#user-menu:hover, +ul.language-dropdown li#language-menu.hover, +ul.language-dropdown li#language-menu:hover { color: #000 !important; position: relative; background: #fff url(../images/arrowDownAccount.gif) right 9px no-repeat; border-bottom: 1px solid #cdcfcf; } ul.dropdown li.hover a, -ul.dropdown li:hover a { +ul.dropdown li:hover a, +ul.language-dropdown li.hover a, +ul.language-dropdown li:hover a { color: #000 !important; margin-left:10px; } @@ -253,15 +253,6 @@ ul.dropdown li:hover > ul { ul.language-dropdown { position: relative; } -ul.language-dropdown li { - float: left; - zoom: 1; - padding: 0 !important; -} -ul.language-dropdown li a { - display: block; - font-size: 1.4em; -} ul.language-dropdown li#language-menu { background: url(../images/arrowDownOverAccount.gif) right 9px no-repeat; min-width:110px; @@ -272,18 +263,6 @@ ul.language-dropdown li#language-menu a { margin-right: 28px; margin-left:10px; } -ul.language-dropdown li#language-menu.hover, -ul.language-dropdown li#language-menu:hover { - color: #000 !important; - position: relative; - background: #fff url(../images/arrowDownAccount.gif) right 9px no-repeat; - border-bottom: 1px solid #cdcfcf; -} -ul.language-dropdown li.hover a, -ul.language-dropdown li:hover a { - color: #000 !important; - margin-left:10px; -} /* LEVEL TWO */ ul.language-dropdown ul.sub_menu { font-size: 1.4em; @@ -504,4 +483,40 @@ div .realperson-challenge { div .realperson-text { text-align: center; } - +/* TABLE STYLES USED IN ACCOUNTS AND PAGE MANAGEMENT */ +table#table-listing { + border-collapse: collapse; + caption-side: top; + empty-cells: show; + margin: 0 auto; + margin: 20px 0 20px 0; + table-layout: auto; + text-align: left; + width: 930px; +} +table#table-listing tr:nth-child(2n) { + background-color: rgba(200, 200, 180,.25); +} +table#table-listing caption { + display: none; +} +table#table-listing th { + background-color: #F7F9F9; + border-bottom: none; + border: 1px solid #d9e4ea; + color: #064D68; + font-size: .9em; + height: 40px; + padding-left: 6px; + padding-top: 7px; + text-align: left; +} +table#table-listing td { + border: 1px solid #d9e4ea; + font-size: .825em; + padding: .5em; + vertical-align: top; +} +table#table-listing td a { + word-wrap: break-word; +} diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl index e6e1bf639..f76707992 100644 --- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl +++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl @@ -81,7 +81,7 @@
<@p.accountsNav /> - +
diff --git a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl index 9e49075bd..d149f60cb 100644 --- a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl +++ b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl @@ -7,7 +7,7 @@ <#if pages?has_content > -
${strings.account_management}
+
${i18n().page_management}
diff --git a/webapp/web/templates/freemarker/edit/forms/css/customForm.css b/webapp/web/templates/freemarker/edit/forms/css/customForm.css index 013db7917..c9e8b6117 100644 --- a/webapp/web/templates/freemarker/edit/forms/css/customForm.css +++ b/webapp/web/templates/freemarker/edit/forms/css/customForm.css @@ -17,7 +17,8 @@ form.customForm div.addNewLink { display: none; /* Hide if Javascript disabled. Javascript will show. */ } form.customForm .existing span.requiredHint, -form.customForm .new span.requiredHint { +form.customForm .new span.requiredHint, +#ie67DisableWrapper { display: none; /* Hide if Javascript disabled. Javascript will show. */ } form.customForm .existing { @@ -34,7 +35,8 @@ form.customForm .existing { width: 300px; } form.customForm p.inline input, -form.customForm p.inline label { +form.customForm p.inline label, +form.customForm p.inline-search { float: left; clear: left; } @@ -89,9 +91,6 @@ form.customForm textarea { div.acSelection { margin-bottom: 15px; } -#ie67DisableWrapper { - display: none; -} form.customForm input.concept-search { float: right; margin-right: 1em; @@ -102,23 +101,15 @@ form.customForm h4.services { margin-bottom: -5px; margin-top: -12px; } -form.customForm p.inline-search { - float: left; - clear: left; -} form.customForm p.inline-search #searchTerm{ margin-top: 6px; } /* <------ DATE TIME*/ +form.customForm fieldset, +fieldset.dateTime label, form.customForm label.dateTime { display: inline; } -form.customForm fieldset { - display: inline; -} -fieldset.dateTime label { - display: inline; -} fieldset.dateTime select { margin-top: 0; } diff --git a/webapp/web/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css b/webapp/web/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css index 54218bd21..7e27dbfe8 100644 --- a/webapp/web/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css +++ b/webapp/web/templates/freemarker/edit/forms/css/customFormWithAutocomplete.css @@ -28,9 +28,6 @@ form.customForm h4 { background: none; color: #000; } -.disabledSubmit { - cursor: default ! important; -} span.readOnly { color: #000; } @@ -39,12 +36,10 @@ span.readOnly { label.vniLabels { padding-left: 50px; } -input.vniInputs { +input.vniInputs, +input.sepInputs { margin-left: 57px; } label.sepLabels { padding-left: 31px; } -input.sepInputs { - margin-left: 57px; -}
${i18n().page_management}