Commit 0f2552c7 authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon

UI changes for Mahara 1.8 Default and Aqua theme Bug #1199563

Change-Id: Ic85c30bfdcedb4236c21986470ee68aa9acb29e7
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
parent 0216e35f
{foreach from=$blogs->data item=blog}
<div class="{cycle name=rows values='r0,r1'} listrow">
<h3 class="title"><a href="{$WWWROOT}artefact/blog/view/index.php?id={$blog->id}">{$blog->title}</a></h3>
<div class="fr nowrap">
<span class="entries"><a href="{$WWWROOT}artefact/blog/view/index.php?id={$blog->id}">{str tag=nposts section=artefact.blog arg1=$blog->postcount}</a></span>
<span class="newentry"><a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn">{str tag=addpost section=artefact.blog}</a></span>
......@@ -12,7 +13,6 @@
{/if}
</span>
</div>
<h3 class="title"><a href="{$WWWROOT}artefact/blog/view/index.php?id={$blog->id}">{$blog->title}</a></h3>
<div id="blogdesc">{$blog->description|clean_html|safe}</div>
<div class="cb"></div>
</div>
......
......@@ -30,6 +30,12 @@
#files_filebrowser_agreement label {
margin-left: -80px;
}
.fileuploadlicense {
margin-bottom: 10px;
}
.fileuploadlicense th {
padding-left: 0;
}
input#files_filebrowser_notice {
margin: 2px 1px 0 0;
}
......
{if $views}
<table class="viewlist fullwidth">
<div class="viewlist fullwidth listing">
{foreach from=$views item=view}
<tr class="{cycle values='r0,r1'}">
<td><h3 class="title"><a href="{$view.fullurl}">{$view.title}</a></h3>
<div class="{cycle values='r0,r1'} listrow">
<h3 class="title"><a href="{$view.fullurl}">{$view.title}</a></h3>
<div class="detail">{$view.description|str_shorten_html:100:true|strip_tags|safe}</div>
{if $view.sharedby}
<div class="groupuserdate">
......@@ -18,10 +18,9 @@
{$view.mtime|strtotime|format_date:'strftimedate'}</span>
</div>
{/if}
</td>
</tr>
</div>
{/foreach}
</table>
</div>
{else}
{str tag=noviews section=view}
{/if}
......@@ -21,7 +21,8 @@
*/
/******************** Body ********************/
body, body#micro {
body,
body#micro {
background: #0B1960 url(../images/bg.jpg) repeat-x top center;
}
/******************** General headings ********************/
......@@ -34,11 +35,15 @@ h6 {
color: #1A428F;
}
/******************** General text ********************/
a, a:visited, a:link, a:active {
a,
a:visited,
a:link,
a:active {
color: #024ac3;
text-decoration: none;
}
a:hover, a:focus {
a:hover,
a:focus {
text-decoration: underline;
}
/* some common listing text styles */
......@@ -66,6 +71,7 @@ fieldset {
border: 1px solid #14436F;
}
/******************** Buttons ********************/
/* Buttons to override with colour */
/* input buttons */
tr.submitcancel input.submit,
tr.submitcancel input.cancel,
......@@ -94,7 +100,9 @@ input#instconf_artefactid_edit_cancel,
#collectiondonewrap .btn:link,
input#export_submit,
#sitelicenses .btn,
#adduser #adduser_submit {
#adduser #adduser_submit,
input#login_submit,
.login-externallink a.btn {
background: url(../images/btn_bkgd.png) repeat-x 0 50%;
border-color: #0b1962;
color: #FFFFFF;
......@@ -123,7 +131,9 @@ input#instconf_artefactid_edit_cancel:hover,
#collectiondonewrap .btn:hover,
input#export_submit:hover,
#sitelicenses .btn:hover,
#adduser #adduser_submit:hover {
#adduser #adduser_submit:hover,
input#login_submit:hover,
.login-externallink a.btn:hover {
background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
border-color: #0b1962;
color: #FFFFFF;
......@@ -152,13 +162,15 @@ input#instconf_artefactid_edit_cancel:active,
#collectiondonewrap .btn:active,
input#export_submit:active,
#sitelicenses .btn:active,
#adduser #adduser_submit:active {
#adduser #adduser_submit:active,
input#login_submit:active,
.login-externallink a.btn:active {
background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
border-color: #3C7FB1;
color: #FFFFFF;
}
/* made to look like default grey buttons to match graphic icon buttons */
input#subscribe_forum_submit,
#forumslist input.btn-subscribe,
input#addviews_submit,
input#edituser_suspend_submit,
input#friendscontrol_submit {
......@@ -166,7 +178,7 @@ input#friendscontrol_submit {
background: url(../images/btn_bkgd_grey.png) repeat-x 0 50%;
color: #333333;
}
input#subscribe_forum_submit:hover,
#forumslist input.btn-subscribe:hover,
input#addviews_submit:hover,
input#edituser_suspend_submit:hover,
input#friendscontrol_submit:hover {
......@@ -174,7 +186,7 @@ input#friendscontrol_submit:hover {
background: url(../images/btn_bkgd_grey_hover.png) repeat-x 0 50%;
color: #333333;
}
input#subscribe_forum_submit:active,
#forumslist input.btn-subscribe:active,
input#addviews_submit:active,
input#edituser_suspend_submit:active,
input#friendscontrol_submit:active {
......@@ -329,7 +341,7 @@ div.pagination a {
background: #00084F;
color: #FFFFFF;
}
#main-nav .dropdown-sub li a:hover {
.main-nav .dropdown-sub li a:hover {
background: #1F97D5;
}
/******************** Tabs ********************/
......
......@@ -40,7 +40,7 @@ ul.colnav li a:active {
}
/******************** Blocktype icons panel ********************/
#blocktype-list {
color: #1D499F !important;
color: #1D499F;
background-color: #f4f7f9;
border: 0;
}
......
/* ADMIN HOME */
#close_site_submit, #suspenddelete #delete #edituser_delete_submit, #institution_suspend_submit {
color: #FFFFFF !important;
}
/* CONFIGURE SITE > LINKS AND RESOURCES MENU */
#menuitemlist table td {
background-color: #f5f8fa;
}
#menuitemlist #rownew td {
background-color: #e9eef4;
}
#menuitemlist tr.edit td {
background-color: #f3f7ec;
}
\ No newline at end of file
/* The main calendar widget. DIV containing a table. */
div.calendar {
position: relative;
font-size: 75%;
border: 2px solid #dddddd;
}
.calendar table {
font-size: .9167em;
color: #333;
cursor: default;
background: #f0f0f0;
}
.calendar thead td {
padding: 0;
}
.calendar tbody td {
padding: 3px 5px;
}
/* Header part -- contains navigation buttons and day names. */
.calendar .button div { /* "<<", "<", ">", ">>" buttons have this class */
text-align: center; /* They are the navigation buttons */
background-color: #2b2b2b;
color: #FFF;
padding: 3px 5px;
}
.calendar .nav {
background: #7d9728 url('../images/menuarrow.gif') no-repeat 100% 100%;
}
.calendar thead .title { /* This holds the current "month, year" */
font-weight: bold; /* Pressing it will take you to the current date */
text-align: center;
background: #2b2b2b;
color: #FFF;
vertical-align: middle;
}
.calendar thead .name { /* Cells <TD> containing the day names */
text-align: center;
color: #FFF;
}
.calendar thead .hilite div { /* How do the buttons in header appear when hover */
background-color: #4b4b4b;
}
.calendar thead .daynames { /* Row <TR> containing the day names */
background: #6a6a6a;
font-weight: bold;
}
.calendar thead .daynames td {
* padding: 3px;
padding-top: 3px;
padding-bottom: 3px;
}
/* The body part -- contains all the days in month. */
.calendar tbody .day { /* Cells <TD> containing month days dates */
width: 20px;
text-align: right;
}
.calendar tbody .day.othermonth {
font-size: .9167em;
color: #bbb;
}
.calendar tbody .day.othermonth.oweekend {
color: #434343;
}
.calendar table .wn {
background: #6a6a6a;
color: #b7b7b7;
}
.calendar tbody .rowhilite td {
background: #d9d9d9;
}
.calendar tbody .rowhilite td.wn {
background: #838383;
}
.calendar tbody td.hilite { /* Hovered cells <TD> */
background: #7b7b7b;
border: none;
}
.calendar tbody td.active { /* Active (pressed) cells <TD> */
background: #4c4c4c;
border: none;
}
.calendar tbody td.selected { /* Cell showing today date */
font-weight: bold;
background: #000000;
color: #fff;
}
.calendar tbody td.weekend { /* Cells showing weekend days */
color: #888;
}
.calendar tbody td.today {
font-weight: bold;
color: #FFF;
background: #9a9a9a;
}
.calendar tbody .disabled { color: #999; }
.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
visibility: hidden;
}
.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
display: none;
}
/* The footer part -- status bar and "Close" button */
.calendar tfoot {
font-size: .9167em;
background: #2b2b2b;
text-align: center;
color: #FFF;
}
/* Combo boxes (menus that display months/years for direct selection) */
.calendar .combo {
position: absolute;
display: none;
top: 0px;
left: 0px;
width: 45px;
cursor: default;
background: #717277;
color: #FFF;
font-size: 90%;
z-index: 100;
}
.calendar .combo .label,
.calendar .combo .label-IEfix {
text-align: center;
padding: 1px;
}
.calendar .combo .label-IEfix {
width: 45px;
}
.calendar .combo .hilite {
background: #6e8e00;
}
.calendar .combo .active {
background: #7d9728;
font-weight: bold;
}
.calendar td.time {
text-align: center;
background-color: #605b3b;
color: #EAE097;
font-weight: bold;
}
.calendar td.time .hour,
.calendar td.time .minute,
.calendar td.time .ampm {
padding: 0 3px;
}
.calendar td.time .ampm {
text-align: center;
}
.calendar td.time .colon {
padding: 0 3px;
font-weight: bold;
}
.calendar td.time span.hilite {
background-color: #6e8e00;
color: #FFF;
}
This diff is collapsed.
/********************** Top pane of Edit View *************************/
#top-pane {
background: #565656;
}
#page #bottom-pane {
background-color: #acacac;
}
#middle-pane label {
/**
* Views stylesheet - for Custom theme.
*
* Copyright (C) 2011-2013 Catalyst IT Ltd
* This file is licensed under the same terms as Mahara itself
*/
/******************** Collection navigation ********************/
ul.colnav li a,
ul.colnav li a:link,
ul.colnav li a:visited,
ul.colnav li a:active {
color: #FFFFFF;
background: #F6871F;
}
/* The tabs that allow you to select a blocktype category */
#category-list ul {
height: 28px;
line-height: 28px;
/******************** Top pane of edit page ********************/
#top-pane {
background: #565656;
}
/******************** Blocktype tabs ********************/
#category-list li a,
#category-list li a:link,
#category-list li a:visited,
#category-list li a:active {
background: none;
color: #d5d5d5;
padding: 0 15px;
height: 28px;
line-height: 28px;
color: #D5D5D5;
}
#category-list li a:hover {
text-decoration: underline;
......@@ -31,103 +31,24 @@
#category-list li.current a:link,
#category-list li.current a:visited,
#category-list li.current a:active {
background-color: #2e2e2e;
background-color: #2E2E2E;
color: #FFFFFF;
}
/* The panel that contains the blocktype icons */
/******************** Blocktype icons panel ********************/
#blocktype-list {
color: #FFF !important;
background-color: #2e2e2e;
border: 0;
}
#blocktype-list .blocktype h4 {
color: #FFFFFF;
}
.blocktype-description {
color: #FFFFFF;
}
#middle-pane {
background: #1c1c1c;
color: #FFF;
}
/********************** Blockinstance ***********************************/
/* header*/
.blockinstance-header h4 {
border-bottom: 2px solid #d2d2d2;
font-size: 15px !important;
}
/* Wall */
.wallpost {
background-color: #f4f4f4;
}
/* tabs for the artefact chooser */
ul.artefactchooser-tabs {
font-weight: bold;
font-size: 12px !important;
padding-left: 1em !important;
background: none;
}
ul.artefactchooser-tabs li {
margin: 0 3px 0 0 !important;
color: #FFF !important;
}
ul.artefactchooser-tabs li a,
ul.artefactchooser-tabs li a:link,
ul.artefactchooser-tabs li a:visited,
ul.artefactchooser-tabs li a:active {
color: #FFF !important;
background: #acacac;
}
ul.artefactchooser-tabs li.current a,
ul.artefactchooser-tabs li.current a:link,
ul.artefactchooser-tabs li.current a:visited
ul.artefactchooser-tabs li.current a:active {
color: #000 !important;
background: #e9e9e9;
border-bottom: 0;
}
ul.artefactchooser-subtabs li {
padding: 0;
margin: 0 3px 0 0 !important;
border-right: 0;
}
ul.artefactchooser-subtabs li a,
ul.artefactchooser-subtabs li a:link,
ul.artefactchooser-subtabs li a:visited,
ul.artefactchooser-subtabs li a:active {
text-decoration: none;
padding: 3px 5px;
}
ul.artefactchooser-subtabs li a:hover {
text-decoration: none;
}
ul.artefactchooser-subtabs li.current a,
ul.artefactchooser-subtabs li.current a:link,
ul.artefactchooser-subtabs li.current a:visited,
ul.artefactchooser-subtabs li.current a:active {
color: #333;
font-weight: bold;
}
ul.artefactchooser-subtabs li.current a:hover {
text-decoration: none;
}
#artefactchooser-body {
background: #e9e9e9;
color: #FFFFFF;
background-color: #2E2E2E;
border: 0;
}
#collection {
color: #FFF;
}
#collection .collection-title {
color: #FFF;
.blocktype-title {
color: #FFFFFF;
}
ul.colnav li a {
background: #565656;
/******************** Blocktype name & description panel ********************/
#middle-pane {
background: #1C1C1C;
color: #FFFFFF;
}
/******************** Bottom pane of edit page ********************/
#page #bottom-pane {
background-color: #ACACAC;
}
\ No newline at end of file
<?php
/**
* Mahara: Electronic portfolio, weblog, resume builder and social networking
* Copyright (C) 2011 Catalyst IT Ltd and others; see:
* Copyright (C) 2011-2013 Catalyst IT Ltd and others; see:
* http://wiki.mahara.org/Contributors
*
* This program is free software: you can redistribute it and/or modify
......
/* ADMIN HOME */
/* Administration Home styles */
/**
* Admin stylesheet - for Mahara's Default theme.
*
* Copyright (C) 2006-2013 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* Admin home > Overview */
.admin-warning-box h3 {
color: #333333;
}
#register-site,
#runupgrade,
#site-stats {