Commit 24fbb09f authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
Browse files

Theming of search buttons, fresh theme, and more



- Replace search icon with ordinary button everywhere except the top
  right user search box
- Fix alignment of edit/delete note buttons
- Many fixes for unreadable text in Fresh theme
- Fix overlaps in site stats area
- Fix missing page access calendars in IE7
- New site logos for configurable theme, to fix clashes with
  configured colour scheme
- Tabs on my tags page in Primary theme
- Better alignment of subscribe (forum) buttons in IE

Change-Id: If450aa17425764ea023449289531be1fe9b29a90
Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent 88a6fd12
......@@ -3,8 +3,8 @@
<table id="notes" class="fullwidth listing">
<thead>
<tr>
<th style="width:65%">{str tag=Note section=artefact.internal}</th>
<th style="width:30%">{str tag=containedin section=artefact.internal}</th>
<th>{str tag=Note section=artefact.internal}</th>
<th>{str tag=containedin section=artefact.internal}</th>
<th></th>
</tr>
</thead>
......@@ -14,7 +14,7 @@
<tr class="{cycle values=r0,r1}">
<td>
<a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">{$n->title|str_shorten_text:80:true|safe}</a>
<div id="n{$n->id}_desc" class="hidden">{$n->description|clean_html|safe}</div>
<div id="n{$n->id}_desc" class="hidden desc">{$n->description|clean_html|safe}</div>
</td>
<td>
{foreach from=$n->views item=v}
......
......@@ -30,16 +30,16 @@
/* Posts */
.forumpost {
border: 1px dotted #BEE3F1;
border: 0;
background-color: #10171A;
}
.forumsubject {
background: #1A292F;
border-bottom: 1px dotted #BEE3F1;
background: #0e0e0e;
border-bottom: 0;
}
.forumpostleft {
background-color: #1A292F;
border-right: 1px dotted #BEE3F1;
background-color: #000000;
border-right: 0;
}
.forumpostleft h5 {
color: #BEE3F1;
......@@ -51,4 +51,8 @@
.postedits {
padding: 10px;
background: #000;
}
\ No newline at end of file
}
#viewforum div.pagination {
background: none;
}
......@@ -22,6 +22,16 @@
#forumbtns .editforum {
font-weight: bold;
}
#subscribe_forum div.btn-subscribe input.submit {
* display: block;
* float: left;
* filter: none;
}
#subscribe_forum span.help a img {
* zoom: 1;
* display: block;
* float: left;
}
/* forum description */
#forumdescription {
......
......@@ -216,34 +216,6 @@ span.btn a.icon, a span.icon {
width: 24px;
margin-left: 2px;
}
#selfsearch button,
.query-button,
#moderator_search_btn,
#search_search,
#selfsearch button,
#search_submit,
.btn-search,
#searchviews_submit,
#selfsearch button:hover,
.query-button:hover,
#moderator_search_btn:hover,
#search_search:hover,
#selfsearch button:hover,
#search_submit:hover,
.btn-search:hover,
#searchviews_submit:hover {
background: transparent url(../images/btn-search.png) no-repeat !important;
border: 0;
color: #1F97D5;
text-indent: -999px;
font-size: 1%;
cursor: pointer;
vertical-align: bottom;
height: 24px;
width: 24px;
margin-left: 2px;
}
/**************************** Top of page elements ****************************/
#container, #containerX {
......
......@@ -47,6 +47,8 @@
#current_bt_description {
background: #e1ecf4;
color: #333;
border-left: 10px solid #1D499F;
border-right: 10px solid #1D499F;
}
......
......@@ -142,6 +142,7 @@ legend a:hover {
/* Select */
select {
border: 1px solid #d1d1d1;
padding: 2px;
}
/* Fieldset */
......@@ -223,33 +224,6 @@ span.btn a.icon, a span.icon {
width: 23px;
margin-left: 0;
}
#selfsearch button,
.query-button,
#moderator_search_btn,
#search_search,
#selfsearch button,
#search_submit,
.btn-search,
#searchviews_submit,
#selfsearch button:hover,
.query-button:hover,
#moderator_search_btn:hover,
#search_search:hover,
#selfsearch button:hover,
#search_submit:hover,
.btn-search:hover,
#searchviews_submit:hover {
background: #FFFFFF url(../images/btn-search.png) no-repeat center !important;
border: 0;
color: #FFFFFF;
text-indent: -999px;
font-size: 1%;
cursor: pointer;
vertical-align: bottom;
height: 22px;
width: 22px;
margin-left: 0px;
}
input.submit, input.cancel, button, .buttondk, input.button, input.select, input#files_filebrowser_edit_artefact, .btn, div.btn-del input.submit, input.submit.btn-del, div.btn-add input.submit, input.submit.btn-add, button.btn-add, div.btn-msg input.submit, div.btn-edit input.submit, .btn-reply, .btn-subscribe input.submit, .rbuttons, .rbuttons a {
* filter:chroma(color=#FFFFFF);
}
......@@ -293,6 +267,7 @@ input.submit, input.cancel, button, .buttondk, input.button, input.select, input
#usf_query_container input {
color: #888888;
width: 205px;
border-width: 1px;
border: #888888;
}
......@@ -495,6 +470,15 @@ div.sideblock .sidebar-content a:hover,
#sb-profile .sidebar-header {
min-height: 57px;
}
#sb-profile .sidebar-content {
padding-top: 0;
padding-bottom: 0;
}
#sb-profile .sidebar-content ul li#groups,
#sb-profile .sidebar-content #changeuser {
padding-top: 5px;
padding-bottom: 5px;
}
#sb-profile #user-profileicon {
padding-top: 0;
}
......
......@@ -21,7 +21,7 @@
*/
/* General rules */
body {
body, body#micro {
background: #ccdce7 url(../images/background.gif) repeat-x top left;
color: #474220;
}
......@@ -192,34 +192,7 @@ span.btn a.icon, a span.icon {
text-indent: -999px;
font-size: 1%;
cursor: pointer;
vertical-align: bottom;
height: 24px;
width: 24px;
margin-left: 2px;
}
#selfsearch button,
.query-button,
#moderator_search_btn,
#search_search,
#selfsearch button,
#search_submit,
.btn-search,
#searchviews_submit,
#selfsearch button:hover,
.query-button:hover,
#moderator_search_btn:hover,
#search_search:hover,
#selfsearch button:hover,
#search_submit:hover,
.btn-search:hover,
#searchviews_submit:hover {
background: transparent url(../images/btn-search.gif) no-repeat !important;
border: 0;
color: #6e8e00;
text-indent: -999px;
font-size: 1%;
cursor: pointer;
vertical-align: bottom;
vertical-align: top;
height: 24px;
width: 24px;
margin-left: 2px;
......@@ -328,8 +301,10 @@ span.btn a.icon, a span.icon {
#sub-nav li a:active {
color: #474220;
height: 25px;
padding: 5px 12px 5px 10px;
padding: 0 12px 0 10px;
background: url(../images/submenu-divider.gif) no-repeat right top;
display: block;
float: left;
}
#sub-nav li a:hover {
color: #7e7327;
......
......@@ -173,3 +173,9 @@ ul.colnav li a {
.blockinstance-content .groupviewsection h5 {
color: #333;
}
/* copy a page */
#copyview .searchquery {
background-color: #EBF0F4;
border: 0;
}
......@@ -3,7 +3,7 @@
#register-site,
#runupgrade {
background-color: #1A292F;
border: 1px dotted #BEE3F1;
border: 0;
}
#register-site fieldset table table th,
#upgradestable th {
......@@ -15,6 +15,15 @@
background-color: #10171A;
}
#suspenddelete #suspend {
background: #1A292F;
border: 0;
}
#register-site-full {
width: auto;
}
/* delete suspend boxes */
#close-site,
#suspendinstitution,
......@@ -35,25 +44,33 @@
#institutionusers,
#staffusers,
#adminusers {
background: none;
border: 1px solid #0C2839;
background: #1b3b46;
border: 0;
}
/* add user */
#adduser td.step1 {
background-color: #1b3b46;
border: 0;
}
#adduser td.step2 {
background-color: #1b3b46;
border: 0;
}
#adduser td.step3 {
background-color: #254e5c;
border: 0;
}
#adduser #or {
color: #009ad5;
color: #FFFFFF;
}
#groupadminsform {
background:#10171A;
border: 1px solid #0C2839;
}
\ No newline at end of file
}
#profilepict {
background: #000000;
border: 0;
}
......@@ -71,7 +71,8 @@ h6 {
#searchresults tfoot td,
#adminstitutionslist tfoot td,
#profileicons tfoot td,
#activitylist tfoot td {
#activitylist tfoot td,
.tag-results #results {
border-top: 1px dotted #BEE3F1;
}
.main-column table h3 a,
......@@ -97,7 +98,7 @@ h6 {
}
.listing.twocolumn td {
padding: 4px !important;
border-color: #080D0F;
border-color: #1A292F;
}
/* Alternative row background colours */
.r0, .r0 td, .d0 {
......@@ -117,6 +118,15 @@ tr.highlight td {
border-bottom: none;
border-bottom: 1px solid #080D0F;
}
.filelist tr.highlight-file td {
color: #666666;
}
.filelist tr.folder td a {
color: #0084d7;
}
.filelist tr td a {
color: #00AEF1;
}
/**************************** Pagination ****************************/
div.pagination a {
......@@ -124,8 +134,8 @@ div.pagination a {
background-color: #1A292F;
}
div.pagination .disabled {
background-color: #080D0F;
color: #26363d;
background: none;
color: #080D0F;
}
div.pagination .selected {
border: 0;
......@@ -161,7 +171,7 @@ legend a:hover {
/* Fieldset */
fieldset {
border: 1px solid #1C3740;
border: 1px solid #BEE3F1;
}
......@@ -236,33 +246,6 @@ span.btn a.icon, a span.icon {
width: 24px;
margin-left: 2px;
}
#selfsearch button,
.query-button,
#moderator_search_btn,
#search_search,
#selfsearch button,
#search_submit,
.btn-search,
#searchviews_submit,
#selfsearch button:hover,
.query-button:hover,
#moderator_search_btn:hover,
#search_search:hover,
#selfsearch button:hover,
#search_submit:hover,
.btn-search:hover,
#searchviews_submit:hover {
background: transparent url(../images/btn-search.png) no-repeat !important;
border: 0;
color: #7EF000;
text-indent: -999px;
font-size: 1%;
cursor: pointer;
vertical-align: bottom;
height: 24px;
width: 24px;
margin-left: 2px;
}
.btn-del {
color: #ff4949 !important;
}
......@@ -437,21 +420,32 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
.subpage {
border: 1px solid #1C3740;
border-top: 10px solid #009ad5;
background: #1A292F;
}
.grouppageswrap {
border: 0;
padding: 10px 0;
}
/**************** MAIN CONTENT *****************/
#mainmiddle {
background: #0C2839;
padding: 0 10px;
}
#containerX #main-wrapper {
background: #0C2839;
overflow: hidden;
}
#containerX .main-column {
margin: 0 10px;
padding: 0;
background: #080D0F;
}
#containerX #main-column-container {
padding: 10px 15px;
}
#main-wrapper {
background: #080D0F;
overflow-x: hidden;
margin: 0 10px;
}
.main-column-narrow {
width: 69%;
......@@ -464,6 +458,10 @@ div.ok {
color: #2da000;
background-color: #cfe7c5;
}
.message.info,
div.info {
background: #366900;
}
#messages .error,
div.error {
color: #dd0221;
......@@ -476,7 +474,7 @@ div.error {
/* system messages */
.message {
background-color: #1C3740;
border: 1px dotted #e0e8ee;
border: 0;
}
.sitemessage {
......@@ -531,6 +529,9 @@ div.sideblock ul ul {
padding-top: 35px;
padding-right: 5px;
}
#user-profileicon img {
border: 0;
}
/* Side Online Users */
#lastminutes {
margin: 6px 15px 0 0;
......@@ -613,10 +614,10 @@ table.attachments td {
/* User/view */
#userview {
background-color: transparent;
border: 2px solid #1C3740;
border-color: #1C3740;
}
#userview .user-icon {
background: #0C2839;
background: none;
border: 0;
}
......@@ -631,14 +632,12 @@ table.attachments td {
/* Copy a view */
#viewpreview {
border: 10px solid #1C3740;
background-color: #10171A;
border: 10px solid #363636;
background-color: #000000;
}
#viewpreviewinner {
border: 1px solid #BEE3F1;
}
#viewpreviewclose {
border-bottom: 1px dotted #BEE3F1;
border: 0;
background: none;
}
/* View access */
......@@ -662,22 +661,26 @@ table.attachments td {
}
#friendslist td {
#friendslist td, #onlinelist td, #adminlist td, #stafflist td, #pendinglist td {
border-bottom: 0;
}
/* Group: about */
.group-info {
border: 2px solid #1C3740;
background-color: #1A292F;
border: 0;
background-color: #000000;
}
.main-column .groupviewsection table h3 a {
color: #7EF000 !important;
}
/* Home page info boxes */
.home-info {
border: 0;
background: #0C2839;
filter: none\0/;
}
.home-info p.subtitle {
border-top: solid 1px #cccccc;
......@@ -705,13 +708,17 @@ table.attachments td {
}
.morelinkwrap,
#myviews .submitted-viewitem {
background: #080D0F;
background: none;
}
.viewfooter .releaseviewform {
background: #080D0F;
}
.memberswrap {
border: 0;
paddign: 5px 0;
}
.memberssearch {
background: #080D0F !important;
background: #1A292F !important;
border: 0 !important;
}
#createfolder {
......@@ -731,6 +738,40 @@ tr.editrow, tr.editrow td {
border: 0 !important;
}
#editaccess #editaccess_collections_container,
#editaccess #editaccess_views_container,
#editaccess #editaccess_accesslist_container,
#editaccess #editaccess_more_container {
background: #1C3740;
border: 0;
}
#editaccess .checkboxes label {
color: #00AEF1;
}
#editaccess fieldset legend,
#editaccess fieldset legend a {
color: #7EF000 !important;
}
#accesslistitems .ai-container th, #accesslistitems .ai-container td {
border-bottom: 1px solid #BEE3F1;
color: #FFFFFF;
}
.wallpost {
background: #10171A;
border-color: #080D0F;
}
div.groupbox {
border: 10px solid #363636;
background-color: #000000;
}
div.groupbox div.jointype {
border: 0;
}
#addmembers {
background: #000000;
border: 0;
}
/**************** DROPDOWN NAVIGATION ****************/
/**************** SUB NAVIGATION *********************/
#main-nav .dropdown-sub {
......
......@@ -8,8 +8,7 @@
border-color: #1C3740;
}
#top-pane {
padding: 10px 10px 0 10px;
background: #1C3740;
background: none;
}
/* The tabs that allow you to select a blocktype category */
#category-list {
......@@ -57,17 +56,15 @@