Attachment #56731 for bug #16239

View | Details | Raw Unified | Return to bug 16239
Collapse All | Expand All

Lines 181-187 body { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css (-5 / +6 lines)
181	border: solid 2px #b9d8d9;	181	border: solid 2px #b9d8d9;
182	border-bottom-style: none;	182	border-bottom-style: none;
183	border-radius: 6px 6px 0 0;	183	border-radius: 6px 6px 0 0;
184	height: 18px;
185	margin-bottom: -32px;	184	margin-bottom: -32px;
186	overflow: auto;	185	overflow: auto;
187	padding: 4px;	186	padding: 4px;
Lines 206-219 body { Link Here
206		205
207	/> Search /	206	/> Search /
208		207
209	#advanced-search-ui, #search-results-ui, #macro-ui {	208	#advanced-search-ui .modal-lg, #search-results-ui .modal-lg, #macro-ui .modal-lg {
210	padding: 5px;
211	width: 90%;	209	width: 90%;
212	}	210	}
213		211
214	.modal-body {	212	.modal-body {
215	max-height: none;	213	max-height: none;
216	padding: 0;	214	}
		215
		216	.modal-lg .modal-body {
		217	overflow-y: auto;
217	}	218	}
218		219
219	#quicksearch-overlay {	220	#quicksearch-overlay {
Lines 282-288 body { Link Here
282	width: 14em;	283	width: 14em;
283	}	284	}
284		285
285	.icon-loading {	286	.fa.fa-spinner {
286	display: inline-block;	287	display: inline-block;
287	height: 16px;	288	height: 16px;
288	width: 16px;	289	width: 16px;

Lines 45-52 div.dataTables_info, Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/datatables.css (-1 / +19 lines)
45	div.dataTables_paginate {	45	div.dataTables_paginate {
46	float: left;	46	float: left;
47	padding : .3em .5em .3em .5em;	47	padding : .3em .5em .3em .5em;
		48	}
48		49
		50	div.dataTables_filter label,
		51	div.dataTables_length label,
		52	div.dataTables_info label,
		53	div.dataTables_paginate label,
		54	div.dataTables_filter input,
		55	div.dataTables_length input,
		56	div.dataTables_info input,
		57	div.dataTables_paginate input {
		58	padding: 0;
49	}	59	}
		60
50	div.dataTables_length {	61	div.dataTables_length {
51	border-right : 1px solid #686868;	62	border-right : 1px solid #686868;
52	line-height:1.9em;	63	line-height:1.9em;
Lines 60-67 div.dataTables_filter { Link Here
60	border-left : 1px solid #FFF;	71	border-left : 1px solid #FFF;
61	border-right : 1px solid #AAAAAA;	72	border-right : 1px solid #AAAAAA;
62	}	73	}
		74	div.dataTables_length label {
		75	display: inline;
		76	}
63	div.dataTables_filter {	77	div.dataTables_filter {
64	line-height : 1.9em;	78	line-height : inherit;
65	}	79	}
66	div.dataTables_paginate {	80	div.dataTables_paginate {
67	padding : 0;	81	padding : 0;
Lines 263-265 table.group tr.even td { Link Here
263	background-color: #FFF;	277	background-color: #FFF;
264	border-right : 1px solid #BCBCBC;	278	border-right : 1px solid #BCBCBC;
265	}	279	}
		280
		281	button.dt-button, div.dt-button, a.dt-button {
		282	margin: 3px 3px 0;
		283	}

Lines 22-27 html, body { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/humanmsg.css (+5 lines)
22	display: none;	22	display: none;
23	opacity: 0;	23	opacity: 0;
24	z-index: 100000;	24	z-index: 100000;
		25	padding: 20px;
25	}	26	}
26		27
27	.humanError {	28	.humanError {
Lines 47-52 html, body { Link Here
47	display: none;	48	display: none;
48	}	49	}
49		50
		51	.humanMsg ul li {
		52	list-style-type: none;
		53	}
		54
50	#humanMsgLog {	55	#humanMsgLog {
51	font: normal 10px Helvetica, Arial, Sans-Serif;	56	font: normal 10px Helvetica, Arial, Sans-Serif;
52	color: white;	57	color: white;

Lines 74-79 ul.biglinks-list li a.icon_general { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css (+1 lines)
74	/* Class used for each module link */	74	/* Class used for each module link */
75	background-image:url('../img/staff-home-icons-sprite.png');	75	background-image:url('../img/staff-home-icons-sprite.png');
76	display: block;	76	display: block;
		77	box-sizing: content-box;
77	float: left;	78	float: left;
78		79
79	width: 83%;	80	width: 83%;




::selection      { background:#538200; color:#ffffff; /* Safari and Opera */ }
::-moz-selection  { background:#538200; color:#ffffff; /* Firefox */ }

a, a:link, a:visited,
a.btn:link, a.btn:visited {
    color : #004d99;
    text-decoration: none;
}


input, textarea {
    padding : 2px 4px;
    line-height: normal;
}

input[type="checkbox"], input[type="radio"] {
    vertical-align: middle;
    margin: 0;
}

label, .label {
    font-weight: normal;
    font-size: inherit;
    padding: 0;
    color: black;
    margin-bottom: 0;
    vertical-align: middle;
}

label input[type="checkbox"],
label input[type="radio"],
.label input[type="checkbox"],
.label input[type="radio"] {
    margin-top: 0;
}


.subfield-label {
    font-style : italic;
}

}

legend {
    font-size : 123.1%;
    font-weight : bold;
    border:2px solid #b9d8d9;
    background-color:#ffffff;
    border-radius:3px;
    padding: 0.2em 0.5em;
    width: auto;
}

#floating-save {

	margin-top : 1em;
}

#header>.container-fluid {
    padding: 0;
}

div.justify {
    text-align: justify;
}

.btn-toolbar {
    background-color : #EDF4F6;
    padding: 5px 5px 5px 5px;
    margin: 0;
    border-radius: 5px 5px 0 0;
    border: 1px solid #E6F0F2;
}

float : left;
font-size : 90%;
clear : left;
margin: .9em 0 0 0;
padding: 0;
width: 100%; 
}

	width: 9em;  
}

.yui-b fieldset.rows td label, .yui-b fieldset.rows td span.label {
        width: auto;
}

.yui-b fieldset.rows div.hint {
	margin-left : 10.5em;
}

fieldset.rows ol.radio label {
	width : auto;
	float : none;
	margin-right : 30px;
        margin-left: 20px;
        padding-left: 0;
        vertical-align: middle;
}

fieldset.rows li.radio input + label {
    margin-left: 0;
    padding-left: 0;
}

fieldset.rows ol.radio input[type="checkbox"],
fieldset.rows ol.radio input[type="radio"] {
    margin-left: -20px;
}

fieldset.rows ol.radio label.radio {
	float : left;
	width : 9em;
	margin-right : 1em;
        margin-top: 0;
}

fieldset.rows caption {


fieldset.action, div.action {
    background-color: transparent;
    clear : both;
    float : none;
    border : 0px;
    margin: 0.9em 0 0 0;
    padding: 0;
    width: auto;
}

.btn-toolbar fieldset.action {
    margin-top: 0;
}

div.rows+div.rows {

div.rows span.label {  
	float: left;  
	font-weight : bold;
	width: 9em;
	margin-right: 1em;  
	text-align: left;
        padding-top: 0;
}

.rows .label {
    white-space: normal;
}

div.rows ol {  

fieldset.rows .inputnote {
	clear : left;
	float : left;
	margin : 1em 0 0 11em;
}

.checkedout {

    border : 0;
}

.btn-small .caret {
    margin-top : .6em;
}

#toolbar .btn,
#toolbar .dropdown-menu,
.btn-toolbar .btn,
.btn-toolbar .dropdown-menu {
    font-size: 13px;
}

a.btn:visited{
    color: #333333;
}

a.btn-link:hover {
    color : #538200;
}

.dropdown-menu li {
    list-style: none outside none;
}


.navbar {
    color: #333;
    min-height: 20px;
}

#header.navbar {
    margin-bottom: 0;
}

#header.navbar-default {
    background: #e6f0f2;
    box-shadow: none;
    border: none;
}

#changelanguage .navbar-text {
    margin: 0;
    padding: 0 0.6em;
}

#changelanguage .navbar-text span {
   padding: 0.4em 0.3em;
   display: block;
   line-height: 20px;
}

.navbar .nav > li > a, .loggedout {

    color: #538200;
}

.navbar .nav li.dropdown.open > .dropdown-toggle,
.navbar .nav li.dropdown.active > .dropdown-toggle,
.navbar .nav li.dropdown.open.active > .dropdown-toggle {
    background: transparent none;
}

.navbar-static-top .navbar-inner {
    background: #E6F0F2 none;
    border: 0;

    font-weight: bold;
    padding : .4em .3em;
}
.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle {
    background: transparent none;
}

.navbar .nav > li > a:focus,
.navbar .nav > li > a:hover {
    color: #538200;
}

.navbar .nav li.dropdown.open > .dropdown-toggle:focus,
.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
.navbar .nav li.dropdown.open.active > .dropdown-toggle:focus {
    background: #e6f0f2 none;
    box-shadow: none;
}

.tooltip.bottom .tooltip-arrow {

/* Redefine a new style for Bootstrap's class "close" since we use that already */
/* Use <a class="closebtn" href="#">&times;</a> */
.alert .closebtn{position:relative;top:-2px;right:-21px;line-height:20px;}
.modal-header .closebtn{margin-top:-2px;}
.closebtn{float: right;font-size: 21px;font-weight: bold;line-height: 1;color: #000;text-shadow: 0 1px 0 #fff;filter: alpha(opacity=20);opacity: .2;}.closebtn:hover,.closebtn:focus{color:#000;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50);}
button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}

.btn-group label,

#borrower_message {
    margin-top: 10px;
}

fieldset.rows + fieldset.action {
    padding-top: 20px;
}

.yui-u .rows li p label.widelabel {
    width: auto;
}

Return to bug 16239

Lines 9-15 input:focus, textarea:focus { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (-35 / +112 lines)
9	::selection { background:#538200; color:#ffffff; /* Safari and Opera */ }	9	::selection { background:#538200; color:#ffffff; /* Safari and Opera */ }
10	::-moz-selection { background:#538200; color:#ffffff; /* Firefox */ }	10	::-moz-selection { background:#538200; color:#ffffff; /* Firefox */ }
11		11
12	a, a:link, a:visited {	12	a, a:link, a:visited,
		13	a.btn:link, a.btn:visited {
13	color : #004d99;	14	color : #004d99;
14	text-decoration: none;	15	text-decoration: none;
15	}	16	}
Lines 107-114 em strong { Link Here
107		108
108	input, textarea {	109	input, textarea {
109	padding : 2px 4px;	110	padding : 2px 4px;
		111	line-height: normal;
		112	}
		113
		114	input[type="checkbox"], input[type="radio"] {
		115	vertical-align: middle;
		116	margin: 0;
		117	}
		118
		119	label, .label {
		120	font-weight: normal;
		121	font-size: inherit;
		122	padding: 0;
		123	color: black;
		124	margin-bottom: 0;
		125	vertical-align: middle;
110	}	126	}
111		127
		128	label input[type="checkbox"],
		129	label input[type="radio"],
		130	.label input[type="checkbox"],
		131	.label input[type="radio"] {
		132	margin-top: 0;
		133	}
		134
		135
112	.subfield-label {	136	.subfield-label {
113	font-style : italic;	137	font-style : italic;
114	}	138	}
Lines 328-339 fieldset.lastchecked { Link Here
328	}	352	}
329		353
330	legend {	354	legend {
331	font-size : 123.1%;	355	font-size : 123.1%;
332	font-weight : bold;	356	font-weight : bold;
333	border:2px solid #b9d8d9;	357	border:2px solid #b9d8d9;
334	background-color:#ffffff;	358	background-color:#ffffff;
335	border-radius:3px;	359	border-radius:3px;
336	padding: 0.2em 0.5em;	360	padding: 0.2em 0.5em;
		361	width: auto;
337	}	362	}
338		363
339	#floating-save {	364	#floating-save {
Lines 356-361 legend { Link Here
356	margin-top : 1em;	381	margin-top : 1em;
357	}	382	}
358		383
		384	#header>.container-fluid {
		385	padding: 0;
		386	}
		387
359	div.justify {	388	div.justify {
360	text-align: justify;	389	text-align: justify;
361	}	390	}
Lines 421-426 div#toolbar, Link Here
421	.btn-toolbar {	450	.btn-toolbar {
422	background-color : #EDF4F6;	451	background-color : #EDF4F6;
423	padding: 5px 5px 5px 5px;	452	padding: 5px 5px 5px 5px;
		453	margin: 0;
424	border-radius: 5px 5px 0 0;	454	border-radius: 5px 5px 0 0;
425	border: 1px solid #E6F0F2;	455	border: 1px solid #E6F0F2;
426	}	456	}
Lines 567-573 border:2px solid #b9d8d9; Link Here
567	float : left;	597	float : left;
568	font-size : 90%;	598	font-size : 90%;
569	clear : left;	599	clear : left;
570	margin: .9em 0 0 0;	600	margin: .9em 0 0 0;
571	padding: 0;	601	padding: 0;
572	width: 100%;	602	width: 100%;
573	}	603	}
Lines 603-608 fieldset.rows fieldset { Link Here
603	width: 9em;	633	width: 9em;
604	}	634	}
605		635
		636	.yui-b fieldset.rows td label, .yui-b fieldset.rows td span.label {
		637	width: auto;
		638	}
		639
606	.yui-b fieldset.rows div.hint {	640	.yui-b fieldset.rows div.hint {
607	margin-left : 10.5em;	641	margin-left : 10.5em;
608	}	642	}
Lines 651-663 fieldset.rows li.radio label { Link Here
651	fieldset.rows ol.radio label {	685	fieldset.rows ol.radio label {
652	width : auto;	686	width : auto;
653	float : none;	687	float : none;
654	margin-right : 0;	688	margin-right : 30px;
		689	margin-left: 20px;
		690	padding-left: 0;
		691	vertical-align: middle;
		692	}
		693
		694	fieldset.rows li.radio input + label {
		695	margin-left: 0;
		696	padding-left: 0;
		697	}
		698
		699	fieldset.rows ol.radio input[type="checkbox"],
		700	fieldset.rows ol.radio input[type="radio"] {
		701	margin-left: -20px;
655	}	702	}
656		703
657	fieldset.rows ol.radio label.radio {	704	fieldset.rows ol.radio label.radio {
658	float : left;	705	float : left;
659	width : 12em;	706	width : 9em;
660	margin-right : 1em;	707	margin-right : 1em;
		708	margin-top: 0;
661	}	709	}
662		710
663	fieldset.rows caption {	711	fieldset.rows caption {
Lines 693-704 fieldset.rows label.error { Link Here
693		741
694	fieldset.action, div.action {	742	fieldset.action, div.action {
695	background-color: transparent;	743	background-color: transparent;
696	clear : both;	744	clear : both;
697	float : none;	745	float : none;
698	border : 0px;	746	border : 0px;
699	margin: 0;	747	margin: 0.9em 0 0 0;
700	padding: .4em .4em .4em .1em;	748	padding: 0;
701	width: auto;	749	width: auto;
		750	}
		751
		752	.btn-toolbar fieldset.action {
		753	margin-top: 0;
702	}	754	}
703		755
704	div.rows+div.rows {	756	div.rows+div.rows {
Lines 717-725 width: 100%; Link Here
717	div.rows span.label {	769	div.rows span.label {
718	float: left;	770	float: left;
719	font-weight : bold;	771	font-weight : bold;
720	width: 9em;	772	width: 9em;
721	margin-right: 1em;	773	margin-right: 1em;
722	text-align: left;	774	text-align: left;
		775	padding-top: 0;
		776	}
		777
		778	.rows .label {
		779	white-space: normal;
723	}	780	}
724		781
725	div.rows ol {	782	div.rows ol {
Lines 760-766 fieldset.rows label.inline { Link Here
760	fieldset.rows .inputnote {	817	fieldset.rows .inputnote {
761	clear : left;	818	clear : left;
762	float : left;	819	float : left;
763	margin : .5em 0 0 11em;	820	margin : 1em 0 0 11em;
764	}	821	}
765		822
766	.checkedout {	823	.checkedout {
Lines 2314-2326 button, Link Here
2314	border : 0;	2371	border : 0;
2315	}	2372	}
2316		2373
2317	.btn-small .caret {
2318	margin-top : .6em;
2319	}
2320
2321	#toolbar .btn,
2322	#toolbar .dropdown-menu,	2374	#toolbar .dropdown-menu,
2323	.btn-toolbar .btn,
2324	.btn-toolbar .dropdown-menu {	2375	.btn-toolbar .dropdown-menu {
2325	font-size: 13px;	2376	font-size: 13px;
2326	}	2377	}
Lines 2328-2333 a.btn:link, Link Here
2328	a.btn:visited{	2379	a.btn:visited{
2329	color: #333333;	2380	color: #333333;
2330	}	2381	}
		2382
		2383	a.btn-link:hover {
		2384	color : #538200;
		2385	}
		2386
2331	.dropdown-menu li {	2387	.dropdown-menu li {
2332	list-style: none outside none;	2388	list-style: none outside none;
2333	}	2389	}
Lines 2341-2346 a.disabled { Link Here
2341		2397
2342	.navbar {	2398	.navbar {
2343	color: #333;	2399	color: #333;
		2400	min-height: 20px;
		2401	}
		2402
		2403	#header.navbar {
		2404	margin-bottom: 0;
		2405	}
		2406
		2407	#header.navbar-default {
		2408	background: #e6f0f2;
		2409	box-shadow: none;
		2410	border: none;
		2411	}
		2412
		2413	#changelanguage .navbar-text {
		2414	margin: 0;
		2415	padding: 0 0.6em;
		2416	}
		2417
		2418	#changelanguage .navbar-text span {
		2419	padding: 0.4em 0.3em;
		2420	display: block;
		2421	line-height: 20px;
2344	}	2422	}
2345		2423
2346	.navbar .nav > li > a, .loggedout {	2424	.navbar .nav > li > a, .loggedout {
Lines 2359-2370 a.disabled { Link Here
2359	color: #538200;	2437	color: #538200;
2360	}	2438	}
2361		2439
2362	.navbar .nav li.dropdown.open > .dropdown-toggle,
2363	.navbar .nav li.dropdown.active > .dropdown-toggle,
2364	.navbar .nav li.dropdown.open.active > .dropdown-toggle {
2365	background: transparent none;
2366	}
2367
2368	.navbar-static-top .navbar-inner {	2440	.navbar-static-top .navbar-inner {
2369	background: #E6F0F2 none;	2441	background: #E6F0F2 none;
2370	border: 0;	2442	border: 0;
Lines 2403-2421 a.disabled { Link Here
2403	font-weight: bold;	2475	font-weight: bold;
2404	padding : .4em .3em;	2476	padding : .4em .3em;
2405	}	2477	}
2406	.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle {
2407	background: transparent none;
2408	}
2409		2478
2410	.navbar .nav > li > a:focus,	2479	.navbar .nav > li > a:focus,
2411	.navbar .nav > li > a:hover {	2480	.navbar .nav > li > a:hover {
2412	color: #538200;	2481	color: #538200;
2413	}	2482	}
2414		2483
2415	.navbar .nav li.dropdown.open > .dropdown-toggle,	2484	.navbar .nav li.dropdown.open > .dropdown-toggle:focus,
2416	.navbar .nav li.dropdown.active > .dropdown-toggle,	2485	.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
2417	.navbar .nav li.dropdown.open.active > .dropdown-toggle {	2486	.navbar .nav li.dropdown.open.active > .dropdown-toggle:focus {
2418	background: transparent none;	2487	background: #e6f0f2 none;
		2488	box-shadow: none;
2419	}	2489	}
2420		2490
2421	.tooltip.bottom .tooltip-arrow {	2491	.tooltip.bottom .tooltip-arrow {
Lines 2457-2464 a.close:hover { Link Here
2457	/* Redefine a new style for Bootstrap's class "close" since we use that already */	2527	/* Redefine a new style for Bootstrap's class "close" since we use that already */
2458	/* Use <a class="closebtn" href="#">×</a> */	2528	/* Use <a class="closebtn" href="#">×</a> */
2459	.alert .closebtn{position:relative;top:-2px;right:-21px;line-height:20px;}	2529	.alert .closebtn{position:relative;top:-2px;right:-21px;line-height:20px;}
2460	.modal-header .closebtn{margin-top:2px;}	2530	.modal-header .closebtn{margin-top:-2px;}
2461	.closebtn{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.closebtn:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);}	2531	.closebtn{float: right;font-size: 21px;font-weight: bold;line-height: 1;color: #000;text-shadow: 0 1px 0 #fff;filter: alpha(opacity=20);opacity: .2;}.closebtn:hover,.closebtn:focus{color:#000;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50);}
2462	button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}	2532	button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}
2463		2533
2464	.btn-group label,	2534	.btn-group label,
Lines 2778-2780 div[class$="_table_controls"] { Link Here
2778	#borrower_message {	2848	#borrower_message {
2779	margin-top: 10px;	2849	margin-top: 10px;
2780	}	2850	}
2781	-	2851
		2852	fieldset.rows + fieldset.action {
		2853	padding-top: 20px;
		2854	}
		2855
		2856	.yui-u .rows li p label.widelabel {
		2857	width: auto;
		2858	}