Skip to content

GitLab

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

Future-proofing base themes 



Adds new wrapper divs to the main column and tabs for more flexibility
in child themes.
Styling of new blocktype panel (see bug #808601)
Many other miscellaneous fixes, including to the dropdown menus
Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>

Change-Id: Ie1de1861d967bb6e954bdb41c792c268245f6bb8
Author:    Evonne Cheung <evonne@catalyst.net.nz>
parent 7224dc44
Hide whitespace changes
Inline Side-by-side
Showing with 249 additions and 274 deletions
htdocs/artefact/file/theme/default/static/style/style.css
View file @ a3bdc366
......@@ -8,7 +8,7 @@
#upload,
.fileupload {
background-color: #ebf0f4;
border: 1px solid #95a8b7;
border: 0;
}
/* File list */
.filelist td.right input.btn-del {
......@@ -33,5 +33,5 @@ tr.folderhover td {
#createfolder {
background-color: #ebf0f4;
border: 1px solid #95a8b7;
}
\ No newline at end of file
border: 0;
}
htdocs/artefact/file/theme/raw/static/style/style.css
View file @ a3bdc366
......@@ -152,7 +152,6 @@ tr.parentfolder td {
}
/* folder row */
tr.folder td {
background-color: #e7e7e7;
border-bottom: 1px solid #FFF;
}
tr.folder td.filename {
......
htdocs/artefact/resume/theme/raw/static/style/style.css
View file @ a3bdc366
......@@ -52,14 +52,6 @@
width: auto;
}
#addemploymenthistory th,
#addeducationhistory th,
#addcertification th,
#addbook th,
#addmembership th {
text-align: left;
padding: 3px;
}
#resumewrap #addemploymenthistory table td,
#resumewrap #addeducationhistory table td,
......
htdocs/blocktype/groupmembers/theme/raw/groupmembers.tpl
View file @ a3bdc366
......@@ -2,5 +2,5 @@
{if $groupmembers}
{$groupmembers.tablerows|safe}
{/if}
<div class="morelinkwrap"><a class="morelink" href="{$show_all.url}">{$show_all.message} &raquo;</a></div>
<div class="cl morelinkwrap"><a class="morelink" href="{$show_all.url}">{$show_all.message} &raquo;</a></div>
</div>
htdocs/blocktype/myfriends/theme/raw/myfriendrows.tpl
View file @ a3bdc366
{foreach from=$friends item=row}
<tr>
{foreach from=$row item=friend}
<td class="{cycle values='r0,r1'} friendcell">
<div class="{cycle values='d0,d1'} friendcell">
<a href="{$WWWROOT}user/view.php?id={$friend->id}">
<img src="{profile_icon_url user=$friend maxwidth=60 maxheight=60}" alt="">
</a>
<div><a href="{$WWWROOT}user/view.php?id={$friend->id}">{$friend|display_default_name|escape}</a></div>
</td>
</div>
{/foreach}
</tr>
{/foreach}
htdocs/blocktype/myfriends/theme/raw/myfriends.tpl
View file @ a3bdc366
<div class="friends">
{if $friends}
<table id="userfriendstable" class="center fullwidth">
<tbody>
<div id="userfriendstable" class="center fullwidth">
{$friends.tablerows|safe}
</tbody>
</table>
<div class="cl"></div>
</div>
<div id="myfriends_page_container" class="hidden">{$friends.pagination|safe}</div>
<script>
addLoadEvent(function() {literal}{{/literal}
......
htdocs/blocktype/wall/theme/raw/wallposts.tpl
View file @ a3bdc366
{include file="header.tpl"}
<h2>{$owner->displayname}: {str tag='wall' section='blocktype.wall'}</h2>
<div class="rbuttons"><a href="{$WWWROOT}/user/view.php?id={$owner->id}" class="btn btn-back">{str tag='backtoprofile' section='blocktype.wall'}</a></div>
<div class="rbuttons"><a href="{$WWWROOT}/user/view.php?id={$owner->id}" class="btn">{str tag='backtoprofile' section='blocktype.wall'}</a></div>
{include file="blocktype:wall:inlineposts.tpl"}
......
htdocs/interaction/forum/theme/raw/index.tpl
View file @ a3bdc366
......@@ -33,9 +33,9 @@
</td>
<td class="center" width="15%">{$forum->topiccount}</td>
<td class="nowrap s subscribetd">{if $forum->subscribe}{$forum->subscribe|safe}{/if}</td>
<td>
<td class="right">
{if $admin}
<div class="fr btn-spacer s">
<div class="btn-spacer s">
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-edit" title="{str tag=edit}"></a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-del" title="{str tag=delete}"></a>
</div>
......
htdocs/interaction/forum/theme/raw/static/style/style.css
View file @ a3bdc366
......@@ -16,7 +16,6 @@
right: 30px;
}
#forumbtns a.btn {
* padding: 3px 5px 4px 5px;
* display: block;
* float: left;
}
......@@ -89,6 +88,9 @@
#forumtopicstable h4 {
margin: 0;
}
#forumtopicstable td.narrow {
width: 15px;
}
@media screen and (-webkit-min-device-pixel-ratio:0){
#forumtopicstable td div.btn-spacer {
width: 50px;
......@@ -152,7 +154,7 @@
border-right: 2px solid #eee;
text-align: center;
font-size: .9167em;
background: #eaeeed;
background: #eeeeee;
}
.postedits .posttime {
color: #888;
......
htdocs/interaction/forum/theme/raw/topics.tpl
View file @ a3bdc366
......@@ -29,8 +29,8 @@
{/if}
</td>
{if $moderator}
<td>
<div class="s btn-spacer fr">
<td class="right">
<div class="s btn-spacer">
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-edit" title="{str tag="edit"}"></a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-del" title="{str tag="delete"}"></a>
</div>
......
htdocs/theme/aqua/static/style/style.css
View file @ a3bdc366
......@@ -21,9 +21,8 @@
*/
/* General rules */
body,
body#micro {
background: #0B1960 url(../images/bg.jpg) repeat-x top center;
body {
background: #0B1960;
color: #14336F;
}
a, a:visited, a:link, a:active {
......@@ -59,11 +58,9 @@ h6 {
/**************************** Tables ****************************/
.main-column thead th {
color: #888888;
border-bottom: 1px solid #14436F;
}
.main-column tbody th {
color: #888888;
border-bottom: none;
}
/* table with th border-bottom */
......@@ -101,12 +98,10 @@ h6 {
border-top: 1px solid #14436F;
}
/* Alternative row background colours */
.r0,
.r0 td {
.r0, .r0 td, .d0 {
background-color: #e9f1f6;
}
.r1,
.r1 td {
.r1, .r1 td, .d1 {
background-color: #f4f7f9;
}
tr.folder td {
......@@ -145,11 +140,6 @@ legend a:hover {
color: #1e6297 !important;
}
/* Select */
select {
border: 1px solid #b2b2b2;
}
/* Fieldset */
fieldset {
border: 1px solid #14436F;
......@@ -226,9 +216,6 @@ span.btn a.icon, a span.icon {
width: 24px;
margin-left: 2px;
}
* html #usf_submit {
height: 22px;
}
#selfsearch button,
.query-button,
#moderator_search_btn,
......@@ -236,13 +223,15 @@ span.btn a.icon, a span.icon {
#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 {
.btn-search:hover,
#searchviews_submit:hover {
background: transparent url(../images/btn-search.png) no-repeat !important;
border: 0;
color: #1F97D5;
......@@ -258,15 +247,15 @@ span.btn a.icon, a span.icon {
/**************************** Top of page elements ****************************/
#container, #containerX {
background: transparent url(../images/bg-container.jpg) no-repeat top center;
margin-top:0px;
padding-top:0px;
min-width: 970px;
width: 90%;
background: transparent url(../images/bg.jpg) repeat-x top center;
* overflow: hidden;
}
#top-wrapper {
background: transparent;
background: transparent url(../images/bg-container.jpg) no-repeat top center;
border: none;
min-width: 970px;
width: 90%;
margin: 0 auto;
}
#containerX #top-wrapper {
height: auto;
......@@ -288,6 +277,9 @@ span.btn a.icon, a span.icon {
color: #333333;
width: 205px;
}
#header-right label {
color: #FFFFFF;
}
/**************** TOP NAVIGATION ****************/
#right-nav ul {
......@@ -309,6 +301,7 @@ span.btn a.icon, a span.icon {
padding: 0;
margin: 0;
height: 27px;
border-bottom: 0;
}
#main-nav ul {
float: right;
......@@ -335,7 +328,7 @@ span.btn a.icon, a span.icon {
display:block;
}
#main-nav li a:hover {
color: #FFFFFF;
color: #1F97D5;
text-decoration: underline;
}
#main-nav li.selected a,
......@@ -394,48 +387,36 @@ span.btn a.icon, a span.icon {
}
/**************** IN PAGE TAB NAVIGATION ****************/
ul.in-page-tabs {
line-height: 25px;
height: 25px;
font-size: 12px;
}
ul.in-page-tabs li {
margin: 0 3px 0 0 !important;
height: 25px;
line-height: 25px;
}
ul.in-page-tabs li a,
ul.in-page-tabs li a:link,
ul.in-page-tabs li a:visited,
ul.in-page-tabs li a:active {
ul.in-page-tabs,
ul.edit-view-tabs {
height: 24px;
line-height: 26px;
}
ul.in-page-tabs li a, ul.in-page-tabs li a:link, ul.in-page-tabs li a:visited, ul.in-page-tabs li a:active,
ul.edit-view-tabs li a, ul.edit-view-tabs li a:link, ul.edit-view-tabs li a:visited, ul.edit-view-tabs li a:active {
color: #FFF;
padding: 4px 10px;
padding: 4px 10px 5px 10px\0/;
text-decoration: none;
background: #00084F;
line-height: 26px;
}
ul.in-page-tabs li a:hover {
text-decoration: underline;
color: #1F97D5;
}
ul.in-page-tabs li a.current-tab,
ul.in-page-tabs li a.current-tab:link,
ul.in-page-tabs li a.current-tab:visited,
ul.in-page-tabs li a.current-tab:active {
ul.in-page-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.in-page-tabs li a.current-tab:visited, ul.in-page-tabs li a.current-tab:active,
ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.edit-view-tabs li a.current-tab:visited, ul.edit-view-tabs li a.current-tab:active {
color: #14336F;
background: #FFF;
border-left: 1px solid #ddd;
border-top: 1px solid #ddd;
border-right: 1px solid #ddd;
border-bottom: 1px solid #FFF;
padding: 4px 10px;
}
.subpage {
border: 1px solid #ddd;
border-top: 10px solid #d1d1d1;
}
/**************** MAIN CONTENT *****************/
#mainmiddle {
min-width: 970px;
width: 90%;
margin: 0 auto;
}
#main-wrapper {
background: #FFF;
}
......@@ -512,7 +493,12 @@ div.sideblock h3 a:hover {
#footer-wrap {
background-color: #0B1960;
border: 0;
padding: .5em 0 1.5em 0;
}
#footer {
min-width: 970px;
width: 90%;
margin: 0 auto;
padding: 5px 0;
}
#footernav {
color: #FFFFFF;
......@@ -585,22 +571,27 @@ ul.colnav li a {
/**************** SUB NAVIGATION *********************/
#main-nav .dropdown-sub {
background: #F3F3F3 !important;
top: 27px !important;
border-width:1px;
border-style:solid;
border-color: transparent #DDDDDD #DDDDDD #DDDDDD;
top: 27px !important;
}
#main-nav .dropdown-sub li {
line-height: 25px !important;
height: 25px !important;
}
#main-nav .dropdown-sub li a,
#main-nav .dropdown-sub li a:link,
#main-nav .dropdown-sub li a:visited,
#main-nav .dropdown-sub li a:active {
color: #0B1960;
font-weight: bold;
text-decoration: none !important;
padding: 5px 13px !important;
background: #00084f !important;
color: #FFF !important;
}
#main-nav .dropdown-sub li a:hover,
#main-nav .dropdown-sub li.selected a:hover {
color: #1A428F !important;
text-decoration: underline !important;
#main-nav .dropdown-sub li a:hover {
background: #0b1960 !important;
color: #1F97D5 !important;
text-decoration: none !important;
}
.group-info {
background: #F4F7F9;
border: 0;
}
htdocs/theme/aqua/static/style/views.css
View file @ a3bdc366
/********************** Top pane of Edit View *************************/
#top-pane,
#middle-pane,
#page #bottom-pane,
#blocksinstruction {
#page #bottom-pane {
background-color: #FFFFFF;
padding: 20px 0 10px 0;
border-width: 0 10px 10px 10px;
border-style: solid;
border-color: #1D499F;
}
#top-pane {
padding: 10px 10px 0 10px;
background: #1D499F;
}
#middle-pane label {
color: #FFFFFF;
}
#blocksinstruction {
font-weight: normal;
font-style: italic;
color: #FFFFFF;
}
/* The tabs that allow you to select a blocktype category */
#category-list ul {
height: 25px;
padding-left: 1em;
}
#category-list li {
margin: 0;
float: left;
color: #1E6297;
}
#category-list li a,
......@@ -30,9 +26,6 @@
#category-list li a:active {
background: none;
color: #FFF;
line-height: 25px;
padding: 5px 10px 7px 10px;
* padding: 7px 10px 7px 10px;
}
#category-list li a:hover {
text-decoration: underline;
......@@ -43,17 +36,17 @@
#category-list li.current a:active {
background-color: #f4f7f9;
color: #1e6297;
padding: 5px 10px 7px 10px;
* padding: 7px 10px 7px 10px;
}
/* The panel that contains the blocktype icons */
#blocktype-list {
color: #1D499F !important;
background-color: #f4f7f9;
border: 0;
}
#current_bt_description {
color: #FFF;
background: #e1ecf4;
color: #333;
}
......@@ -69,17 +62,13 @@
}
/* tabs for the artefact chooser */
ul.artefactchooser-tabs {
line-height: 25px;
font-weight: bold;
font-size: 12px !important;
height: 25px;
padding-left: 1em !important;
background: none;
}
ul.artefactchooser-tabs li {
line-height: 25px;
margin: 0 3px 0 0 !important;
float: left;
color: #FFF !important;
}
ul.artefactchooser-tabs li a,
......@@ -87,8 +76,6 @@ ul.artefactchooser-tabs li a:link,
ul.artefactchooser-tabs li a:visited,
ul.artefactchooser-tabs li a:active {
color: #FFF !important;
padding: 5px 12px 6px 10px;
height: 25px;
background: #1D499F;
}
ul.artefactchooser-tabs li.current a,
......@@ -97,12 +84,6 @@ ul.artefactchooser-tabs li.current a:visited
ul.artefactchooser-tabs li.current a:active {
color: #000 !important;
background: #F5F9FC;
border-left: 1px solid #d1d1d1;
border-top: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
border-bottom: 0;
padding: 5px 12px 6px 10px;
height: 25px;
}
ul.artefactchooser-subtabs {
margin: 0 !important;
......@@ -118,7 +99,6 @@ ul.artefactchooser-subtabs li a:link,
ul.artefactchooser-subtabs li a:visited,
ul.artefactchooser-subtabs li a:active {
text-decoration: none;
padding: .25em .5em;
background: #FFF;
}
ul.artefactchooser-subtabs li a:hover {
......@@ -138,6 +118,7 @@ ul.artefactchooser-subtabs li.current a:hover {
#artefactchooser-body {
background: #F5F9FC;
border: 0;
}
......
htdocs/theme/default/static/style/style.css
View file @ a3bdc366
......@@ -73,12 +73,10 @@ h6 {
.tablerenderer-loading {
}
/* Alternative row background colours */
.r0,
.r0 td {
.r0, .r0 td, .d0 {
background-color: #fafbf7;
}
.r1,
.r1 td {
.r1, .r1 td, .d1 {
background-color: #f3f7ec;
}
tr.folder td {
......@@ -114,11 +112,6 @@ legend {
color: #1e6297;
}
/* Select */
select {
border: 1px solid #D1D1D1;
}
/* Fieldset */
fieldset {
border: 1px solid #95a8b7;
......@@ -132,7 +125,6 @@ textarea,
input[type=text],
input[type=password],
input[type=file] {
border: 1px solid #D1D1D1;
}
/****************************** Buttons ****************************/
......@@ -212,13 +204,15 @@ span.btn a.icon, a span.icon {
#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 {
.btn-search:hover,
#searchviews_submit:hover {
background: transparent url(../images/btn-search.gif) no-repeat !important;
border: 0;
color: #6e8e00;
......@@ -233,13 +227,14 @@ span.btn a.icon, a span.icon {
/**************************** Top of page elements ****************************/
#container, #containerX {
width: 90%;
min-width: 950px;
background: none;
* overflow: hidden;
}
#top-wrapper {
background: url(../images/top-wrapper-bkgd.png) repeat-x left top;
border: 0;
height: 125px;
width: 90%;
min-width: 950px;
}
#containerX #top-wrapper {
height: auto;
......@@ -249,6 +244,7 @@ span.btn a.icon, a span.icon {
}
#site-logo {
padding: 0;
margin: 0;
}
#top-wrapper ul,
#top-wrapper li {
......@@ -265,11 +261,19 @@ span.btn a.icon, a span.icon {
color: #767676;
background-color: #ecf3d4;
width: 205px;
padding: 2px 5px;
border: 1px solid #d1d1d1;
margin-right: 3px;
margin-top: 1px;
}
/**************** TOP NAVIGATION ****************/
#right-nav ul {
}
#main-nav {
height: 25px;
border-bottom: 0;
}
#main-nav li {
color: #e6c560;
* zoom: 1;
......@@ -337,49 +341,51 @@ span.btn a.icon, a span.icon {
}
/**************** IN PAGE TAB NAVIGATION ****************/
ul.in-page-tabs {
ul.in-page-tabs,
ul.edit-view-tabs {