[Mageia-sysadm] [236] - merge style with trunk, revert local modification

root at mageia.org root at mageia.org
Thu Jan 6 21:29:08 CET 2011


Revision: 236
Author:   misc
Date:     2011-01-06 21:29:08 +0100 (Thu, 06 Jan 2011)
Log Message:
-----------
- merge style with trunk, revert local modification 

Modified Paths:
--------------
    identity/CatDap/branches/live/root/static/style/ttsite.css
    identity/CatDap/branches/live/root/static/style/yui/reset-fonts-grids.css

Modified: identity/CatDap/branches/live/root/static/style/ttsite.css
===================================================================
--- identity/CatDap/branches/live/root/static/style/ttsite.css	2011-01-06 20:27:12 UTC (rev 235)
+++ identity/CatDap/branches/live/root/static/style/ttsite.css	2011-01-06 20:29:08 UTC (rev 236)
@@ -1,16 +1,103 @@
+/*     begin changes obgr_seneca     */
 html, body {
-    background: #ccc;
+	background: #ddd;
 }
 
 #doc {
-    -webkit-box-shadow: 0 0 10px #aaa;
-    -moz-box-shadow: 0 0 10px #aaa;
-    box-shadow: 0 0 10px #aaa;
-    background: #fff; 
+    -webkit-box-shadow: 0 0 10px #444;
+    -moz-box-shadow: 0 0 10px #444;
+    box-shadow: 0 0 10px #444;
+    -webkit-border-radius: 10px;
+    -moz-border-radius: 10px;
+	border-radius: 10px;
+	margin-top: 20px;
 }
 
 #hd, #ft, #nav, #content, .inside { padding: 0 1em 0.5em 0; }
 
+#hd {
+    background: #aaa;
+	padding: 10px 20px 4px 20px;
+	text-align: center;
+    -webkit-border-radius: 10px 10px 0 0;
+    -moz-border-radius: 10px 10px 0 0;
+	border-radius: 10px 10px 0 0;
+}
+
+#bd {
+    background: #fff;
+	padding: 2px 20px 2px 20px;
+	text-align: center;
+}
+
+#bd h1 {
+	margin: 0.2em 0;
+}
+
+#ft {
+    background: #aaa;
+	padding: 2px 20px 10px 20px;
+}
+
+#input_form {
+    display: block; 
+    width: 250px; 
+    text-align:left;
+	padding: 10px;
+    -webkit-border-radius: 0.6em;
+    -moz-border-radius: 0.6em;
+}
+
+
+#input_form input {
+	background: #fff;
+	border: inset 1px;
+}
+
+#input_form input:focus {
+	background: #ddf;
+}
+
+#input_form button {
+	background: #eef;
+    border: 2px outset #dde;
+    -webkit-border-radius: 0.4em;
+    -moz-border-radius: 0.4em;
+	border-radius: 0.4em;
+	padding: 4px;
+}
+
+#login_form label  {
+    text-align:left;
+    float: left;
+    width: 140px;
+}
+
+#login_form {
+    display: block; 
+    float: left;
+    margin-bottom: 2.5em;
+}
+
+#login_form_inputs {
+    margin-bottom: 1.5em;
+}
+
+#login_form input:focus {
+	background: #ddf;
+}
+
+#login_form_line span {
+    float: left;
+    padding-top:5px;
+}
+
+#login_form button {
+    float: right;
+}    
+
+/*     End changes obgr_seneca     */
+
 .message {
     color: #000;
 }

Modified: identity/CatDap/branches/live/root/static/style/yui/reset-fonts-grids.css
===================================================================
--- identity/CatDap/branches/live/root/static/style/yui/reset-fonts-grids.css	2011-01-06 20:27:12 UTC (rev 235)
+++ identity/CatDap/branches/live/root/static/style/yui/reset-fonts-grids.css	2011-01-06 20:29:08 UTC (rev 236)
@@ -4,4 +4,308 @@
 http://developer.yahoo.com/yui/license.html
 version: 2.8.2r1
 */
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea,button{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre
 ,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}body{text-align:center;}#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;}#doc2{width:73.076em;*width:71.25em;}#doc3{margin:auto 10px;width:auto;}#doc4{width:74.923em;*width:73.05em;}.yui-b{position:relative;}.yui-b{_position:static;}#yui-main .yui-b{position:static;}#yui-main,.yui-g .yui-u .yui-g{width:100%;}.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{float:right;margin-left:-25em;}.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{float:left;margin-right:-25em;}.yui-t1 .yui-b{float:left;width:12.30769em;*width:12.00em;}.yui-t1 #yui-main .yui-b{margin-left:13.30769em;*margin-left:13.05em;}.yui-t2 .yui-b{float:left;width:13.8461em;*width:13.50em;}.yui-t2 #yui-main .yui-b{margin-left:14.8461em;*margin-left:14.55em;}.yui-t3 .yui-b{float:left;width:23.0769em;*width:22.50em;}.yui-t3 #yui-main .yui-b{margin-l
 eft:24.0769em;*margin-left:23.62em;}.yui-t4 .yui-b{float:right;width:13.8456em;*width:13.50em;}.yui-t4 #yui-main .yui-b{margin-right:14.8456em;*margin-right:14.55em;}.yui-t5 .yui-b{float:right;width:18.4615em;*width:18.00em;}.yui-t5 #yui-main .yui-b{margin-right:19.4615em;*margin-right:19.125em;}.yui-t6 .yui-b{float:right;width:23.0769em;*width:22.50em;}.yui-t6 #yui-main .yui-b{margin-right:24.0769em;*margin-right:23.62em;}.yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}#yui-main .yui-b{float:none;width:auto;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{float:right;}.yui-g div.first,.yui-gb div.first,.yui-gc div.f
 irst,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first,.yui-g .yui-gc div.first,.yui-g .yui-ge div.first,.yui-gc div.first div.first{float:left;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{width:49.1%;}.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{width:32%;margin-left:1.99%;}.yui-gb .yui-u{*margin-left:1.9%;*width:31.9%;}.yui-gc div.first,.yui-gd .yui-u{width:66%;}.yui-gd div.first{width:32%;}.yui-ge div.first,.yui-gf .yui-u{width:74.2%;}.yui-ge .yui-u,.yui-gf div.first{width:24%;}.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{margin-left:0;}.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{width:49%;*width:48.1%;*margin-left:0;}.yui-g .yui-g .yui-u{width:48.1%;}.yui-g .yu
 i-gb div.first,.yui-gb .yui-gb div.first{*margin-right:0;*width:32%;_width:31.7%;}.yui-g .yui-gc div.first,.yui-gd .yui-g{width:66%;}.yui-gb .yui-g div.first{*margin-right:4%;_margin-right:1.3%;}.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{*margin-right:0;}.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{*margin-left:1.8%;_margin-left:4%;}.yui-g .yui-gb .yui-u{_margin-left:1.0%;}.yui-gb .yui-gd .yui-u{*width:66%;_width:61.2%;}.yui-gb .yui-gd div.first{*width:31%;_width:29.5%;}.yui-g .yui-gc .yui-u,.yui-gb .yui-gc .yui-u{width:32%;_float:right;margin-right:0;_margin-left:0;}.yui-gb .yui-gc div.first{width:66%;*float:left;*margin-left:0;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{margin:0;}.yui-gb .yui-gb .yui-u{_margin-left:.7%;}.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{*margin-left:0;}.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{*width:48.1%;*margin-left:0;}.yui-gb .yui-gd div.first{width:32%;}.yui-g .yui-gd div.first{_width:29.9%;}.yui-ge .yui-g{width:24%;}.y
 ui-gf .yui-g{width:74.2%;}.yui-gb .yui-ge div.yui-u,.yui-gb .yui-gf div.yui-u{float:right;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf div.first{float:left;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf div.first{*width:24%;_width:20%;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}.yui-ge div.first .yui-gd .yui-u{width:65%;}.yui-ge div.first .yui-gd div.first{width:32%;}#hd:after,#bd:after,#ft:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#hd,#bd,#ft,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;}
\ No newline at end of file
+html{
+	color:#000;
+	background:#FFF;
+}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{
+	margin:0;
+	padding:0;
+}
+table{
+	border-collapse:collapse;border-spacing:0;
+}
+fieldset,img{
+	border:0;
+}
+address,caption,cite,code,dfn,em,strong,th,var,optgroup{
+	font-style:inherit;font-weight:inherit;
+}
+del,ins{
+	text-decoration:none;
+}
+li{
+	list-style:none;
+}
+caption,th{
+	text-align:left;
+}
+h1,h2,h3,h4,h5,h6{
+	font-size:100%;
+	font-weight:normal;
+}
+q:before,q:after{	content:'';}
+abbr,acronym{
+	border:0;
+	font-variant:normal;
+}
+sup{
+	vertical-align:baseline;
+}
+sub{
+	vertical-align:baseline;
+}
+legend{
+	color:#000;
+}
+input,button,textarea,select,optgroup,option{
+	font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;
+}
+input,button,textarea,select{
+	*font-size:100%;
+}
+body{
+	font:13px/1.231 arial,helvetica,clean,
+	sans-serif;
+	*font-size:small;
+	*font:x-small;
+}
+select,input,button,textarea,button{
+	font:99% arial,helvetica,clean,sans-serif;
+}
+table{
+	font-size:inherit;
+	font:100%;
+}
+pre,code,kbd,samp,tt{
+	font-family:monospace;
+	*font-size:108%;
+	line-height:100%;
+}
+body{
+	text-align:center;
+}
+#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{
+	margin:auto;
+	text-align:left;
+	/*
+	 * FIXME:
+	 * It would be better to use 30.00em for the index page and an othe size for the other pages
+	 * this would allow us to not waste space.
+	 */
+	width:57.69em;
+	*width:56.25em;
+}
+#doc2{
+	width:73.076em;
+        *width:71.25em;
+}
+#doc3{
+	margin:auto 10px;
+	width:auto;
+}
+#doc4{
+	width:74.923em;
+	*width:73.05em;
+}
+.yui-b{
+	position:relative;
+}
+.yui-b{
+	_position:static;
+}
+#yui-main .yui-b{
+	position:static;
+}
+#yui-main,.yui-g .yui-u .yui-g{
+	width:100%;
+}
+.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{
+	float:right;margin-left:-25em;
+}
+.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{
+	float:left;
+	margin-right:-25em;
+}
+.yui-t1 .yui-b{
+	float:left;
+	width:12.30769em;
+	*width:12.00em;
+}
+.yui-t1 #yui-main .yui-b{
+	margin-left:13.30769em;
+	*margin-left:13.05em;
+}
+.yui-t2 .yui-b{
+	float:left;
+	width:13.8461em;
+	*width:13.50em;
+}
+.yui-t2 #yui-main .yui-b{
+	margin-left:14.8461em;
+	*margin-left:14.55em;
+}
+.yui-t3 .yui-b{
+	float:left;
+	width:23.0769em;
+	*width:22.50em;
+}
+.yui-t3 #yui-main .yui-b{
+	margin-left:24.0769em;
+	*margin-left:23.62em;
+}
+.yui-t4 .yui-b{
+	float:right;
+	width:13.8456em;
+	*width:13.50em;
+}
+.yui-t4 #yui-main .yui-b{
+	margin-right:14.8456em;
+	*margin-right:14.55em;
+}
+.yui-t5 .yui-b{
+	float:right;
+	width:18.4615em;
+	*width:18.00em;
+}
+.yui-t5 #yui-main .yui-b{
+	margin-right:19.4615em;
+	*margin-right:19.125em;
+}
+.yui-t6 .yui-b{
+	float:right;
+	width:23.0769em;
+        *width:22.50em;
+}
+.yui-t6 #yui-main .yui-b{
+	margin-right:24.0769em;
+	*margin-right:23.62em;
+}
+.yui-t7 #yui-main .yui-b{
+	display:block;
+	margin:0 0 1em 0;
+}
+#yui-main .yui-b{
+	float:none;
+	width:auto;
+}
+.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{
+	float:left;
+}
+.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{
+	float:right;
+}
+.yui-g div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first,.yui-g .yui-gc div.first,.yui-g .yui-ge div.first,.yui-gc div.first div.first{
+	float:left;
+}
+.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{
+	width:49.1%;
+}
+.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{
+	width:32%;
+	margin-left:1.99%;
+}
+.yui-gb .yui-u{
+	*margin-left:1.9%;
+	*width:31.9%;
+}
+.yui-gc div.first,.yui-gd .yui-u{
+	width:66%;
+}
+.yui-gd div.first{
+	width:32%;
+}
+.yui-ge div.first,.yui-gf .yui-u{
+	width:74.2%;
+}
+.yui-ge .yui-u,.yui-gf div.first{
+	width:24%;
+}
+.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{
+	margin-left:0;
+}
+.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{
+	width:49%;
+	*width:48.1%;
+	*margin-left:0;
+}
+.yui-g .yui-g .yui-u{
+	width:48.1%;
+}
+.yui-g .yui-gb div.first,.yui-gb .yui-gb div.first{
+	*margin-right:0;
+	*width:32%;
+	_width:31.7%;
+}
+.yui-g .yui-gc div.first,.yui-gd .yui-g{
+	width:66%;
+}
+.yui-gb .yui-g div.first{
+	*margin-right:4%;
+	_margin-right:1.3%;
+}
+.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{
+	*margin-right:0;
+}
+.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{
+	*margin-left:1.8%;
+	_margin-left:4%;
+}
+.yui-g .yui-gb .yui-u{
+	_margin-left:1.0%;
+}
+.yui-gb .yui-gd .yui-u{
+	*width:66%;
+	_width:61.2%;
+}
+.yui-gb .yui-gd div.first{
+	*width:31%;
+	_width:29.5%;
+}
+.yui-g .yui-gc .yui-u,.yui-gb .yui-gc .yui-u{
+	width:32%;
+	_float:right;
+	margin-right:0;
+	_margin-left:0;
+}
+.yui-gb .yui-gc div.first{
+	width:66%;
+	*float:left;
+	*margin-left:0;
+}
+.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{
+	margin:0;
+}
+.yui-gb .yui-gb .yui-u{
+	_margin-left:.7%;
+}
+.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{
+	*margin-left:0;
+}
+.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{
+	*width:48.1%;
+	*margin-left:0;
+}
+.yui-gb .yui-gd div.first{
+	width:32%;
+}
+.yui-g .yui-gd div.first{
+	_width:29.9%;
+}
+.yui-ge .yui-g{
+	width:24%;
+}
+.yui-gf .yui-g{
+	width:74.2%;
+}
+.yui-gb .yui-ge div.yui-u,.yui-gb .yui-gf div.yui-u{
+	float:right;
+}
+.yui-gb .yui-ge div.first,.yui-gb .yui-gf div.first{
+	float:left;
+}
+.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf div.first{
+	*width:24%;
+	_width:20%;
+}
+.yui-gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{
+	*width:73.5%;
+	_width:65.5%;
+}
+.yui-ge div.first .yui-gd .yui-u{
+	width:65%;
+}
+.yui-ge div.first .yui-gd div.first{
+	width:32%;
+}
+#hd:after,#bd:after,#ft:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#hd,#bd,#ft,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110106/ca1768d5/attachment-0001.html>


More information about the Mageia-sysadm mailing list