Commit c3a83948 authored by Nigel McNie's avatar Nigel McNie
Browse files

The new them. My last request: a pixie caramel!

* A more neutral colour scheme, appropriate for a default installation
* Forms are layed out with the title beside the inputs
* The profile page is in tabs
* Layout is cleaner and clearer
* Still will be some bugs, especially in IE!
parent 6e3bb9f1
htdocs/theme/default/static/images/star.png

3 KB | W: | H:

htdocs/theme/default/static/images/star.png

869 Bytes | W: | H:

htdocs/theme/default/static/images/star.png
htdocs/theme/default/static/images/star.png
htdocs/theme/default/static/images/star.png
htdocs/theme/default/static/images/star.png
  • 2-up
  • Swipe
  • Onion skin
htdocs/theme/default/static/images/up.png

256 Bytes | W: | H:

htdocs/theme/default/static/images/up.png

185 Bytes | W: | H:

htdocs/theme/default/static/images/up.png
htdocs/theme/default/static/images/up.png
htdocs/theme/default/static/images/up.png
htdocs/theme/default/static/images/up.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -3,11 +3,11 @@
div.calendar { position: relative; }
.calendar table {
border: 1px solid #d4d1c0;
border: 1px solid #d2d2d2;
font-size: 11px;
color: #000;
cursor: default;
background: #e5e8da;
background: #f4f4f4;
font-family: Arial,sans-serif;
}
......@@ -16,45 +16,45 @@ div.calendar { position: relative; }
.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
text-align: center; /* They are the navigation buttons */
padding: 2px; /* Make the buttons seem like they're pressing */
background-color: #5c8727;
background-color: #7d7d7d;
color: #FFF;
}
.calendar .nav {
background: #5c8727 url('../images/menuarrow.gif') no-repeat 100% 100%;
background: #7d7d7d 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;
padding: 2px;
background: #3a5813;
color: #e6c55b;
background: #4d4d4d;
color: #FFF;
}
.calendar thead .headrow { /* Row <TR> containing navigation buttons */
}
.calendar thead .name { /* Cells <TD> containing the day names */
border-bottom: 1px solid #d4d1c0;
border-bottom: 1px solid #d2d2d2;
padding: 2px;
text-align: center;
color: #3a5813;
color: #707070;
}
.calendar thead .weekend { /* How a weekend day name shows in header */
color: #585713;
color: #858585;
}
.calendar thead .hilite { /* How do the buttons in header appear when hover */
background-color: #5c8727;
background-color: #545454;
}
.calendar thead .active { /* Active (pressed) buttons in header */
}
.calendar thead .daynames { /* Row <TR> containing the day names */
background: #819f18;
background: #bfbfbf;
font-weight: bold;
}
......@@ -71,30 +71,30 @@ div.calendar { position: relative; }
color: #bbb;
}
.calendar tbody .day.othermonth.oweekend {
color: #585713;
color: #434343;
}
.calendar table .wn {
padding: 2px 3px 2px 2px;
background: #acc067;
background: #acacac;
}
.calendar tbody .rowhilite td {
background: #f3f8df;
background: #eaeaea;
}
.calendar tbody .rowhilite td.wn {
background: #acc067;
background: #bcbcbc;
}
.calendar tbody td.hilite { /* Hovered cells <TD> */
background: #c0cd89;
background: #b9b9b9;
padding: 1px 3px 1px 1px;
border: none;
}
.calendar tbody td.active { /* Active (pressed) cells <TD> */
background: #dec;
background: #888888;
padding: 2px 2px 0px 2px;
border: none;
}
......@@ -103,15 +103,15 @@ div.calendar { position: relative; }
font-weight: bold;
border: 1px solid #FFF;
padding: 1px 3px 1px 1px;
background: #e6c55b;
color: #3a5813;
background: #ffffff;
color: #6f6f6f;
}
.calendar tbody td.weekend { /* Cells showing weekend days */
color: #585713;
color: #6c6c6c;
}
.calendar tbody td.today { font-weight: bold; color: #696; }
.calendar tbody td.today { font-weight: bold; color: #727272; }
.calendar tbody .disabled { color: #999; }
......@@ -127,14 +127,14 @@ div.calendar { position: relative; }
.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
text-align: center;
background: #3a5813;
color: #e6c55b;
background: #4c4c4c;
color: #FFF;
}
.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
padding: 2px;
background: #3a5813;
color: #e6c55b;
background: #737373;
color: #FFF;
}
.calendar tfoot .hilite { /* Hover style for buttons in footer */
......@@ -152,8 +152,8 @@ div.calendar { position: relative; }
left: 0px;
width: 4em;
cursor: default;
border: 1px solid #d4d1c0;
background: #f3f8df;
border: 1px solid #d2d2d2;
background: #f4f4f4;
color: #000;
font-size: 90%;
z-index: 100;
......@@ -174,17 +174,17 @@ div.calendar { position: relative; }
}
.calendar .combo .active {
border-top: 1px solid #5c8727;
border-bottom: 1px solid #5c8727;
background: #f3f8df;
border-top: 1px solid #d2d2d2;
border-bottom: 1px solid #d2d2d2;
background: #dfdfdf;
font-weight: bold;
}
.calendar td.time {
border-top: 1px solid #d4d1c0;
border-top: 1px solid #d2d2d2;
padding: 1px 0px;
text-align: center;
background-color: #819f18;
background-color: #888888;
}
.calendar td.time .hour,
......@@ -206,9 +206,9 @@ div.calendar { position: relative; }
}
.calendar td.time span.hilite {
border-color: #819f18;
background-color: #f3f8df;
color: #3a5813;
border-color: #d2d2d2;
background-color: #868686;
color: #FFF;
}
.calendar td.time span.active {
......
This diff is collapsed.
body, td {
font-family: Arial, Helvetica, sans-serif !important;
font-size: 12px !important;
padding: 5px !important;
color: #474220;
}
pre {
font: 12px monospace !important;
......@@ -10,44 +12,56 @@ a,
a:link,
a:active,
a:visited {
color: #547c22 !important;
text-decoration: none !important;
border-bottom: 1px dotted #547c22 !important;
color: #7f9d16 !important;
text-decoration: none;
}
a:hover {
color: #819f18 !important;
border-bottom: 1px solid #819f18 !important;
color: #84aa00 !important;
text-decoration: underline;
}
h1, h2 {
color: #547c22 !important;
font-size: 22px !important;
font-weight: normal !important;
margin: 0 0 5px 0 !important;
padding: 0 !important;
border-bottom: 1px solid #819f18 !important;
h1 {
color: #4c711d;
font-size: 30px;
font-weight: normal;
margin: 0 0 5px 0;
padding: 0;
}
h2 {
font-size: 20px !important;
font-size: 24px;
color: #4c711d;
font-weight: bold;
margin: 0 0 5px 0;
padding: 0;
}
h3, h4 {
color: #819f18 !important;
font-weight: bold !important;
font-size: 17px !important;
margin: 15px 0 0 !important;
h3 {
color: #1e6297;
font-weight: bold;
font-size: 17px;
margin: 20px 0 0;
}
h4 {
font-size: 15px !important;
font-size: 15px;
color: #3986c3;
font-weight: bold;
margin: 15px 0 0;
}
h5, h6 {
color: #5c8727 !important;
font-weight: bold !important;
font-size: 14px !important;
margin: 5px 0 0 !important;
h5 {
color: #5c8727;
font-weight: bold;
font-size: 14px;
margin: 5px 0 0;
}
h6 {
font-size: 13px !important;
font-size: 13px;
color: #5c8727;
font-weight: bold;
margin: 5px 0;
}
ul {
padding: 0;
margin: 0 0 0 17px;
}
......@@ -12,7 +12,7 @@
#view h3 {
margin-top: .25em;
}
#view p.view-description {
p.view-description {
margin: .5em .25em;
}
div.editview {
......@@ -29,27 +29,29 @@ div.editview {
}
#view table.filedata th {
width: 8em;
padding: 3px 0 0 0;
padding: 5px 0 0 0;
}
#top-pane {
background: #acc067 url(../images/toppane_corner_topright.gif) no-repeat right top;
background-color: #95a8b7;
}
#category-list {
background: #acc067 url(../images/toppane_corner_topleft.gif) no-repeat left top;
}
#category-list li {
background-color: #bacc7b;
background-color: #e0e8ee;
margin-right: 5px;
line-height: 25px;
padding: 5px 10px;
}
#category-list li a {
color: #1e6297;
}
#category-list li.current {
font-weight: bold;
background-color: #eef4da;
background-color: #f4f7f9;
}
#blocktype-list {
background-color: #eef4da;
background-color: #f4f7f9;
padding: 5px 5px 10px 5px;
margin-left: 5px;
}
......@@ -78,18 +80,31 @@ div.editview {
}
#layout-link {
font-size: smaller;
font-size: 11px;
background: url(../images/icon-change.png) no-repeat;
padding-left: 18px;
}
#layout-link.disabled {
color: #aaa;
}
#btn-displaymyview {
font-size: 11px;
background: url(../images/icon-display.png) no-repeat;
padding-left: 18px;
}
#bottom-pane {
#page #bottom-pane {
margin-top: 10px;
background: #eef4da url(../images/bottompane_corner_botright.gif) no-repeat right bottom;
border: 1px solid #ebebeb;
}
#column-container {
background: url(../images/bottompane_corner_botleft.gif) no-repeat left bottom;
padding: 0;
margin: 0;
}
#blocksinstruction {
padding: 5px 10px;
background: #ebebeb;
color: #8e8e8e;
}
.add-column-center {
......@@ -123,17 +138,16 @@ div.editview {
font-size: 12px;
}
.maincontent .blockinstance table {
font-size: 12px;
font-size: 11px;
}
.blockinstance-header h4 {
margin: 0;
padding: 3px 5px;
border-bottom: 1px solid #acc067;
background-color: #fff;
border-bottom: 1px solid #d2d2d2;
background-color: #FFF;
}
.blockinstance-header h4 a {
text-decoration: none;
color: inherit;
}
.blockinstance-controls input {
......@@ -147,12 +161,18 @@ div.editview {
.blockinstance-content {
padding: 5px;
}
.blockinstance-content .maharatable td {
padding: 0;
}
.blockinstance-content p {
margin: .25em 0 .5em;
font-size: 11px;
}
/* This rule is incredibly annoying, as it enforces the widths on a whole bunch of tables that don't need to be forced - like the blog attachments table and any tables the user generates by the wysiwyg editor. Can it be made more specific? */
.blockinstance-content table {
width: 100%;
}*/
.blockinstance-content table,
.blockinstance-content table th,
.blockinstance-content table td {
margin: 0;
padding: 2px;
text-align: left;
}
.blockinstance-content h1,
.blockinstance-content h2,
......@@ -160,7 +180,44 @@ div.editview {
.blockinstance-content h4,
.blockinstance-content h5,
.blockinstance-content h6 {
margin: .25em 0 0;
margin: 15px 0 0 0;
}
.blockinstance-content h2 {
font-size: 16px;
margin-top: 5px !important;
}
.blockinstance-content h3 {
font-size: 14px;
margin-top: 5px !important;
}
.blockinstance-content .tablerenderer,
.blockinstance-content table {
margin-top: 5px;
}
.blockinstance-content table tr.submitcancel td input.submit,
.blockinstance-content table tr.submitcancel td input.cancel {
height: 22px !important;
margin: 0;
padding: 0 10px;
}
.blockinstance-content table.cb,
.blockinstance-content table.cb th,
.blockinstance-content table.cb td {
padding: 2px 4px;
text-align: left;
margin: 0;
}
#artefactchooser-body table,
#artefactchooser-body table th,
#artefactchooser-body table td {
padding: 2px 0;
text-align: left;
color: #474220;
}
#artefactchooser-body table th label {
color: #95a8b6;
}
.column-content .add-button {
......@@ -181,7 +238,7 @@ body:last-child:not(:root:root) .newblockhere {
}
#block-placeholder {
border: 2px dashed #94BC62;
border: 2px dashed #bfbfbf;
margin-top: 1em;
}
......@@ -196,22 +253,31 @@ body:last-child:not(:root:root) .newblockhere {
}
/* styling the tabs for the artefact chooser */
.maincontent ul.artefactchooser-tabs {
list-style-type:none;
margin: 0 0 3px 0;
padding: 0;
text-align: left;
}
.maincontent ul.artefactchooser-tabs li {
margin: 0 3px 0 0;
padding: 0;
}
.maincontent ul.artefactchooser-tabs li a {
background-color: #BACC7B;
padding: 3px 1em;
background-color: #bfbfbf;
padding: 2px 1em;
text-decoration: none;
color: #FFF;
border-color: #D9DFEA #b2b2b2 #b2b2b2 #D9DFEA !important;
border-style: solid;
border-width: 1px;
}
.maincontent ul.artefactchooser-tabs li.current a {
background-color: #EEF4DA;
}
.maincontent div.artefactchooser-splitter {
border-top: 1px solid #e0e0e0;
background-color: #EEF4DA;
margin-top: 3px;
padding: .25em 0 .25em .5em;
padding: 0;
}
.blockinstance-content p.noartefacts {
background-color: #EEF4DA;
color: #808080;
text-align: center;
margin-top: 0;
......@@ -220,6 +286,9 @@ body:last-child:not(:root:root) .newblockhere {
.maincontent table.artefactchooser-data {
border: none;
margin-top: 0;
background-color: #EEF4DA;
padding: .5em .5em 0;
}
.blockinstance-content table p img {
padding: 10px 20px;
}
\ No newline at end of file
......@@ -19,21 +19,22 @@
<th>{str section='activity' tag='subject'}</th>
<th>{str section='activity' tag='type'}</th>
<th>{str section='activity' tag='date'}</th>
<th>{str section='activity' tag='read'}<br><a href="" onclick="{$selectallread}" class="s">{str section='activity' tag='selectall'}</a></th>
<th>{str tag='delete'}<br><a href="" onclick="{$selectalldel}" class="s">{str section='activity' tag='selectall'}</a></th>
<th>{str section='activity' tag='read'}<br><a href="" onclick="{$selectallread}">{str section='activity' tag='selectall'}</a></th>
<th>{str tag='delete'}<br><a href="" onclick="{$selectalldel}">{str section='activity' tag='selectall'}</a></th>
</tr>
</thead>
<tbody>
</tbody>
<tfoot>
<tr><td colspan="5" class="markasreadtd">
<div class="markasread">
<input class="submit" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit" type="button" value="{str tag='delete'}" onClick="{$markdel}" />
</div>
<div id="messagediv"></div></td>
</tr>
<tfoot>
<tr>
<td colspan="5" class="markasreadtd">
<div class="markasread">
<input class="submit" type="submit" value="{str tag='markasread' section='activity'}" />
<input class="submit btn-delete" type="button" value="{str tag='delete'}" onClick="{$markdel}" />
</div>
<div id="messagediv"></div></td>
</tr>
</tfoot>
</table>
</form>
......
......@@ -7,7 +7,7 @@
{$requestedform}
{$invitedform}
{if !empty($joinform)}
<h6>{str tag="requestmembershipofaninstitution"}</h6>
<h3>{str tag="requestmembershipofaninstitution"}</h3>
{$joinform}
{/if}
{include file="columnleftend.tpl"}
......
......@@ -9,7 +9,7 @@
<div id="runupgrade">
<div class="fr"><span class="upgradeicon"><a href="upgrade.php">{str tag=runupgrade section=admin}</a></span></div>
<h4>{str tag=thefollowingupgradesareready section=admin}</h4>
<table cellspacing="0">
<table cellspacing="0" id="upgradestable">
<tr>
<th>{str tag=Plugin section=admin}</th>
<th>{str tag=From}</th>
......
......@@ -5,7 +5,7 @@
<p>{str tag="adminfilespagedescription" section="admin" args=$descriptionstrargs}</p>
<div id="myfiles">
<div id="uploader"></div>
<table id="filelist" class="hidden tablerenderer">
<table id="filelist" class="hidden tablerenderer" cellpadding="0" cellspacing="0">
<thead><tr>
<th></th>
<th>{str tag=Name section=artefact.file}</th>
......
{include file="header.tpl"}
<div id="column-full">
<div class="content">
<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span class="cnr-bl"><span class="cnr-br">
<div class="maincontent">
<h2>{str tag="changepassword"}</h2>
<div class="maincontent">
<h2>{str tag="changepassword"}</h2>
<p>{str tag="changepasswordinfo"}</p>