[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/includes co... [dev_week]
|
From: |
Joshua Ferraro |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/includes co... [dev_week] |
|
Date: |
Tue, 12 Dec 2006 17:23:13 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <kados> 06/12/12 17:23:13
Modified files:
koha-tmpl/intranet-tmpl/npl/en/includes: colors.css intranet.css
Log message:
synching with rel_2_2 ... there were conflicts, so this should be
tested.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/colors.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.9&r2=1.1.2.4.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.17.2.11&r2=1.5.2.17.2.12
Patches:
Index: colors.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/colors.css,v
retrieving revision 1.1.2.4.2.9
retrieving revision 1.1.2.4.2.10
diff -u -b -r1.1.2.4.2.9 -r1.1.2.4.2.10
--- colors.css 5 Dec 2006 15:58:16 -0000 1.1.2.4.2.9
+++ colors.css 12 Dec 2006 17:23:13 -0000 1.1.2.4.2.10
@@ -43,7 +43,13 @@
color : #330099;
}
-a.current:visited {
+a.button {
+ background-color : #6699CC;
+ border: 2px outset #CCCCCC;
+ color : White;
+}
+
+a.current:link {
background-color : transparent;
color : #330099;
}
@@ -145,6 +151,29 @@
border-left : 1px solid #D9D9D9;
}
+div.basket {
+ background-color : #F0F0F0;
+}
+
+div.basket table {
+ background-color : White;
+ border-top : 1px solid #666666;
+ border-right : 1px solid #666666;
+}
+
+div.basket table td, div.basket table th {
+ border-left : 1px solid #666666;
+ border-bottom : 1px solid #666666;
+}
+
+div.box {
+ border: 1px solid #D9D9D9;
+}
+
+div.box table td {
+ background-color : #F0F0F0;
+}
+
div.compact th {
border-bottom : 1px solid #666666;
border-left : 1px solid #D9D9D9;
@@ -152,6 +181,10 @@
border-top : 0px;
}
+div.controls {
+ border-top : 1px solid #D9D9D9;
+}
+
div.data table col, div.data-main table col {
background-color : #CCCCCC;
}
@@ -198,8 +231,8 @@
}
div.details {
- background-color : #F0F0F0;
- border-bottom : 1px solid #CCCCCC;
+ border-bottom : 1px solid #B2B2B2;
+ border-top : 1px solid #F0F0F0;
}
div.details dt {
@@ -559,6 +592,10 @@
background-color : #FFFFFF;
}
+ul.notes {
+ font-size : 76%;
+}
+
.cancel {
background-color : #CC3300;
color : #FFFFCC;
@@ -787,50 +824,94 @@
background-color : #7EABD6;
}
-#sidebar fieldset {
- background-color: #F9F9FF;
-}
+/* MARC EDITOR */
-#sidebar legend {
- color : #003366;
+div.tabbed {
}
-#sidebar .submit {
- background-color: #6BA037;
- color: #FFFFFF;
+div.tabs {
}
-#sidebar h3 {
+div.tabs a {
+ background-color: #D8DEB8;
color: #000066;
+ border-bottom : 1px solid #666666;
+ border-left : 1px solid #666666;
+ border-right : 1px solid #FFFFCC;
+ border-top : 1px solid #EEEEEE;
}
-#submenu {
- background-color : #CBCBCB;
+div.tabs a:hover {
+ background-color : #CCFF99;
+ border-left : 1px solid #000066;
+ border-bottom : 1px solid #000066;
}
-#submenu dl {
- background-color : #D9D9D9;
+div.tab {
+ background-color : #EEEEEE;
+ border : 1px solid #E4E4E4;
+ border-top : 1px solid #EEEEEE;
+}
+
+div.displaytab {
+ background-color:transparent;
+}
+
+div.displaytab p {
+ border-top: 1px solid #D8DEB8;
+ border-bottom: 1px solid White;
}
-#topmenu {
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
color : #000000;
+ background-color : #EEEEEE;
+ border-top : 7px solid #EEEEEE;
+ border-bottom : thin solid #CCCCCC;
}
-#topmenu .submit {
- background-color : #7EABD6;
- color : #FFFFFF;
+div.displaytab .MARCtag {
+ color : #000066;
}
-#topmenu a:link {
- color : #3971A6;
+.labelsubfield { /* style for each subfield (like : a Publication year), just
before the biblio subfield */
+ background-color : #F0F0F0;
}
-#topmenu a:visited {
- color : #3971A6;
+div.displaytab .labelsubfield {
+ background-color : #FFFFFF;
+}
+
+#loading {
+ background-color: #FFFFFF;
+ border: 10px solid #7EABD6;
+ }
+
+input.mandatory {
+ background-color: #CCFF33;
+}
+
+div.tabs a.addbiblioTabOn {
+ background-color: #EEEEEE;
+ color: #000066;
}
-#topmenu a:hover {
+div.tabs a.addbiblioTabOff {
+ background-color: #CBCBCB;
+ color: #669999;
+}
+
+input.addbiblioInput {
+ background-color: #FFFFFF;
+}
+
+input.addbiblioInputFocus {
+ background-color: #FFFFE1;
+}
+
+input.indicator {
+ background-color: #FFFFFF;
}
-#topmenu a:active {
+input.indicatorFocus {
+ background-color: #FFFF00;
}
\ No newline at end of file
Index: intranet.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/intranet.css,v
retrieving revision 1.5.2.17.2.11
retrieving revision 1.5.2.17.2.12
diff -u -b -r1.5.2.17.2.11 -r1.5.2.17.2.12
--- intranet.css 5 Dec 2006 15:58:16 -0000 1.5.2.17.2.11
+++ intranet.css 12 Dec 2006 17:23:13 -0000 1.5.2.17.2.12
@@ -72,6 +72,14 @@
text-decoration: none;
}
+a.button {
+ font-size: 80%;
+ font-weight: bold;
+ margin : 2px 0;
+ padding : 3px;
+ text-decoration: none;
+}
+
body {
font-family: arial, geneva, sans-serif;
font-size: 16px;
@@ -90,16 +98,13 @@
text-align: left;
}
-div#controls {
- float: right;
- margin-left: .7em;
- width: 15%;
-}
-
-div#controls form {
- font-size: 80%;
- margin: .3em 0;
- padding: .3em;
+div.controls {
+ display : block;
+ font-size: 70%;
+ font-weight: bold;
+ margin-top: .4em;
+ margin-bottom : .4em;
+ padding-top : .4em;
}
div#help {
@@ -122,6 +127,40 @@
text-decoration: none;
}
+div.basket {
+ background-color : #F0F0F0;
+ padding : 5px;
+ margin-bottom : 10px;
+}
+
+div.basket table {
+ background-color : White;
+ border-collapse : collapse;
+ border-top : 1px solid #666666;
+ border-right : 1px solid #666666;
+}
+
+div.basket table td, div.basket table th {
+ border-left : 1px solid #666666;
+ border-bottom : 1px solid #666666;
+}
+
+div.basket table td.total {
+ text-align : right;
+}
+
+div.box {
+ width: 45%;
+ padding: 5px;
+ float: left;
+ margin : 3px;
+ font-size : 76%;
+}
+
+div.box table td {
+ padding : 2px;
+}
+
div.compact td {
font-size: 13px;
font-weight: normal;
@@ -178,7 +217,7 @@
}
div.details {
- margin-bottom: 5px;
+ margin-bottom: 10px;
padding: 5px;
}
@@ -353,7 +392,7 @@
display: inline;
}
-div.tabitem form {
+div.tabitem form, div.controls form {
display: inline;
white-space: nowrap;
}
@@ -390,6 +429,7 @@
}
form {
+ display : inline;
margin: 0px;
padding: 0px;
}
@@ -1052,7 +1092,7 @@
font-weight : bold;
text-decoration : none;
margin : 0 0 2px 0;
- padding: 10px 9px 10px 5px;
+ padding: 10px 5px 10px 5px;
}
div.tabs a:hover {
@@ -1062,26 +1102,40 @@
display: block;
visibility:hidden;
position : absolute;
- margin : 5px 0 0 25px;
+ margin : 5px 0 0 20px;
padding : 3px;
- width : 85%;
+ width : 70%;
/*margin-top:110px;*/
}
-/* style for tag definition (e.g. 700 - Statement of responsibility) */
-.MARCtag {
+div.tab p {
+ margin : 3px;
+}
+
+div.displaytab {
+ display: block;
+ float:left;
+ font-size: .8em;
+ width : 100%;
+}
+
+div.displaytab p {
+ margin : 0;
+ padding : 3px 0;
+}
+
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
clear : left;
font-weight : bold;
font-size : .8em;
margin-top : 5px;
}
-div.tab p {
- margin : 3px;
+div.displaytab .MARCtag {
+ font-size : 1em;
}
-/* style for each subfield (e.g.: Publication year), just before the biblio
subfield */
-.labelsubfield {
+.labelsubfield { /* style for each subfield (like : a Publication year), just
before the biblio subfield */
clear : left;
float : left;
font-size : .8em;
@@ -1091,6 +1145,11 @@
display : inline;
}
+div.displaytab .labelsubfield {
+ font-size : 1em;
+ font-weight: bold;
+}
+
#loading {
position: absolute;
top: 3em;
@@ -1123,151 +1182,3 @@
input.indicatorFocus {
}
-
-#receipt {
- font-family : serif;
- font-size : .9em;
- margin : -4px 0px 0px -5px;
- padding : 0px;
- position : relative;
-}
-
-#receipt a:link {
- text-decoration: none;
-}
-
-#receipt a:visited {
- text-decoration: none;
-}
-
-#receipt a:hover {
- text-decoration: none;
-}
-
-#receipt caption {
- font-weight : bold;
- margin-top : 5px;
- text-align : left;
-}
-
-#receipt div.table {
- font-weight: normal;
-}
-
-#receipt h3, #receipt caption {
- font-size : 1em;
- font-weight : bold;
- margin-bottom : 3px;
- margin-top : 3px;
-}
-
-#receipt table {
- border-collapse : collapse;
- width : auto;
-}
-
-#receipt td, #receipt th {
- font-size : 1em;
- font-weight : normal;
- padding : 1px;
- }
-
-#receipt th {
- font-weight : bold;
- text-align : left;
- }
-
-
-a.unHideSubfield {
- font-size: 80%;
- cursor: se-resize;
-}
-
-.upsubfield {
- cursor: crosshair;
- font-size: 80%;
-}
-
-input.flat {
-}
-
-a.clonesubfield {
- cursor: crosshair;
- font-size: 80%;
-}
-
-div#advanced-search {
- padding-right : 7%;
-}
-
-div#advanced-search, div#advanced-search input, div#advanced-search select,
div#sidebar, div#sidebar input, div#sidebar select {
- font-size : .8em;
-}
-
-div#advanced-search p {
- margin: .4em;
-}
-
-div#advanced-search table, div#advanced-search td, div#advanced-search th {
- margin : 0;
- padding : 0;
- width : auto;
-}
-
-div#advanced-search fieldset {
- margin-bottom: .3em;
- width : 100%;
-}
-
-div#advanced-search fieldset p {
- margin-left : 1em;
- white-space: nowrap;
-}
-
-table.itemtypes {
- border-collapse: separate;
- border-spacing: 3px;
- display: block;
- padding: 0;
- margin: 0;
-}
-
-div#advanced-search legend, div#sidebar legend {
- font-weight: bold;
-}
-
-div#advanced-search label, div#sidebar label {
- float : none;
- font-weight : normal;
- width : auto;
- margin : 0;
-}
-
-.count {
- font-weight: normal;
-}
-
-#main-sidebar {
- float: left;
- margin-left: 1%;
- width: 58%;
- }
-
-* html #main-sidebar {
- margin-left: .5%;
- }
-
-#sidebar
- {
- float: left;
- margin-top: .5em;
- width: 39%;
-}
-
-#breadcrumbs {
- font-size : .8em;
-}
-
-#breadcrumbs a {
- font-weight : bold;
-}
\ No newline at end of file