Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / templates / disorder.css

diff --git a/templates/disorder.css b/templates/disorder.css
index 578297506de52507bb63f306c2b2986bd8950322..66e6f6a539ecae943880faf48375310758e94300 100644 (file)
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -8,7 +8,7 @@ body {
   font-variant: normal
 }
 
-input {
+input,button {
   font-family: helvetica,sans-serif;
   font-weight: normal;
   font-size: 12pt;
@@ -175,15 +175,19 @@ div.filesdirectories a:active {
 }
 
 /* all files */
-div.filesdirectories p.all {
+div.filesdirectories div.allfiles {
   margin-left: 1em              /* indent play all button only one step */
 }
 
 /* buttons *******************************************************************/
 
+form.button {
+  display: inline
+}
+
 /* Buttons and links that look like buttons share the same formatting */
-button,a.button {
-  padding: 1px;
+a.button {
+  padding-top: 2px;
   border-width: 3px;
   border-color: #fefefe;       /* Off-white */
   border-style: inset;
@@ -193,7 +197,13 @@ button,a.button {
   font-family: helvetica,sans-serif;
   font-weight: normal;
   font-variant: normal;
-  font-size: 12pt
+  font-size: 12pt;
+  cursor: pointer
+}
+
+a.button {
+  padding-left: 4px;
+  padding-right: 4px;
 }
 
 a.button:active,button:active {
@@ -209,59 +219,56 @@ img.button {
 
 /* searching *****************************************************************/
 
-span.search_artist {
-  font-weight: bold             /* Artist in bold */
-}
-
-div.search_album {
-  margin-left: 1em             /* Indent album one step */
-}
-
-div.search_title {
-  margin-left: 1em             /* Indent title two steps */
+div.search {
+  border: 1px solid black;     /* Give the search box a border */
+  padding: 0.2em;
 }
 
-div.search_title p {
-  margin-top: 0;               /* Titles are compressed relative to ... */
-  margin-bottom: 0              /* ...artists and albums */
+form.search, form.search p {
+  display: inline
 }
 
-div.search_title a {
-  color: black
-}
+/* menu bar *******************************************************************/
 
-div.search_title a:active {
-  color: red
+div.top {
+  background-color: #e0e0e0;
+  border: 1px solid black
 }
 
-form.search {
-  border: 1px solid black;     /* Give the search box a border */
-  padding: 0.2em
+div.logo {
+  float:right;
+  margin-top:4px;
+  margin-right:4px
 }
 
-/* menu bar *******************************************************************/
-
 /* p.menubar is the menu bar at the top */
 p.menubar {
-  word-spacing: 1em            /* Space out menu items */
+  float:left;
+  margin-left: 4px;
+  word-spacing: 0px
 }
 
 /* Subelements are A for usable menus or SPAN for unusable ones */
 p.menubar a, p.menubar span {
   font-family: helvetica,sans-serif;
-  font-weight: bold;
-  font-size: 14pt;
-  text-decoration: none
+  font-size: 24px;
+  text-decoration: none;
+  padding: 4px
 }
 
 /* a.activemenu is the current menu item */
-a.activemenu {
-  color: red;
+img.activemenu, a.activemenu {
+  background-color: #d0d0d0;
+  color: black;
+  padding: 4px;
+  border: none
 }
 
 /* a.inactivemenu is a non-current but choosable menu item */
-a.inactivemenu {
-  color: black
+img.inactivemenu, a.inactivemenu {
+  color: black;
+  padding:4px;
+  border:none 
 }
 
 /* span.invaliemenu is a non-choosable menu item */
@@ -297,6 +304,20 @@ table.prefs input {
   font-family: monospace
 }
 
+/* text with sectiosn *******************************************************/
+
+/* h2.sectiontitle is used for subsection headings */
+h2.sectiontitle {
+  background-color: #e0ffe0;   /* Black on pastel green */
+  color: black;
+  padding: 0.2em
+}
+
+/* There is a div.section for each subsection */
+div.section {
+  margin-left: 1em
+}
+
 /* help **********************************************************************/
 
 /* table.helpbuttons is used for various tables of buttons */
@@ -309,18 +330,6 @@ table.helpbuttons {
   margin-right: 2em
 }
 
-/* h2.helptitle is used for help subsection headings */
-h2.helptitle {
-  background-color: #e0ffe0;   /* Black on pastel green */
-  color: black;
-  padding: 0.2em
-}
-
-/* There is a div.helpsection for each subsection */
-div.helpsection {
-  margin-left: 1em
-}
-
 /* span.configuration marks configuration directives */
 span.configuration {
   font-family: monospace
@@ -402,18 +411,16 @@ p.credits {
 This file is part of DisOrder.
 Copyright (C) 2003-2008 Richard Kettlewell
 
-This program is free software; you can redistribute it and/or modify
+This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */