# SVN changeset patch # User jsalyrosas # Date 2013-05-24 22:45:01.347251 # Revision 189 - Estandarizando css. Index: trunk/webapp/static/css/style.css =================================================================== diff --git a/trunk/webapp/static/css/style.css b/trunk/webapp/static/css/style.css --- a/trunk/webapp/static/css/style.css (revision 188) +++ b/trunk/webapp/static/css/style.css (revision 189) @@ -6,135 +6,462 @@ * font-family: 'Roboto Condensed', sans-serif; */ -body { font-size: 12px; } -header {width: 980px; border: 0px solid #fcc !important; height: 50px; text-align: center; line-height: 50px} -#schema {margin: 0 auto; width: 980px; border: 0px solid #f00 !important; padding: 10px 10px 10px 10px} -#content {border: 0px solid #1cc; margin-top: 5px; margin-bottom: 5px} -#content #topcolumn {float: left; border: 1px solid #ddd !important; width: 980px; height: 40px; line-height: 35px; - margin: 2px 0px; box-shadow: 2px 2px 5px #888;} -#content #maincolumn {float: left; border: 1px solid #ddd !important; width: 980px; margin: 2px 0px; padding: 0px 0px; - box-shadow: 2px 2px 5px #666;} -footer {border: 0px solid #200 !important; height: 30px; text-align: center; line-height: 30px; - margin: 2px 0px; box-shadow: 2px 2px 5px #888;} - -.cleardivs {clear: both; border: 0px solid #400; height: 0px} +body { + padding: 0; + margin: 0; + font-size: 12px; } + +header { + width: 980px; + height: 50px; + text-align: center; + line-height: 50px; + border: 0px solid #fcc !important; } + +#schema { + margin: 0 auto; + width: 980px; + padding: 10px 10px; + border: 0px solid #f00 !important; } + +#content { + margin: 5px 0px; + border: 0px solid #1cc; } + +#topcolumn { + float: left; + width: 980px; + height: 40px; + line-height: 35px; + margin: 2px 0px; + border: 1px solid #ddd !important; + box-shadow: 2px 2px 5px #888; } + +#maincolumn { + float: left; + width: 980px; + margin: 2px 0px; + padding: 0px 0px; + border: 1px solid #ddd !important; + box-shadow: 2px 2px 5px #666; } + +footer { + height: 30px; + line-height: 30px; + text-align: center; + margin: 0px 0px; + border: 0px solid #200 !important; + box-shadow: 2px 2px 5px #888; } + +.cleardivs { + clear: both; + border: 0px solid #400; + height: 0px; } + +textarea { + resize: none; + overflow: hidden; } + /****************************************************************************************/ /****** ESTILOS GENERALES *****************/ /****************************************************************************************/ -.mnu{ height: 22px; border: 0px solid #c55 !important;} -.mnu li{ display:inline;} -.MnuVertical, .MnuHorizontal { font-family: 'Droid Sans', sans-serif; font-size: inherit; - font-style: normal; text-shadow: 2px 2px #eee;} -.MnuHorizontal ul{ list-style: none; list-style-type: none; margin: 0;} - -/*.MnuHorizontal{ display: -webkit-box; -webkit-box-orient:horizontal;}*/ -/*.MnuHorizontal a{ display:block; padding:10px; -webkit-box-flex:1; text-align:center; }*/ - -/****************************************************************************************/ -/****** MENU DE NAVEGACION DE PERFILES **********************************/ -/****************************************************************************************/ -#infoProfiles {border: 0px solid #1cc !important; width: 300px; margin: 0px; padding-top: 2px; padding-bottom: 2px; - float: left;} -#infoProfiles label {padding: 10px 10px 10px 12px; margin: 10px 0} -#infoProfiles select {padding: 4px 0px; margin: 0; font-family: 'Droid Sans', sans-serif; - font-size: 12px; letter-spacing: 0.029em; width: 200px;} -#mnuProfiles{margin: 0px 0px 0px 0px; border: 0px solid #1494F6 !important; float: right; padding: 2px 10px} -#mnuProfiles ul{list-style: none; list-style-type: none; margin: 0; padding-left: 20px; border: 0px solid #f00 !important} -#mnuProfiles li{ width: 80px; padding: 2px; border: 0px solid #c55 !important; float: left; } -#mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: center; - border-bottom: 1px solid #1494F6 !important; text-decoration: none; padding: 0px 4px; - line-height: 18px; margin: 6px 6px;} +.mnu { + height: 22px; + border: 0px solid #c55 !important; } + +.mnu li { + display:inline; } + +.MnuVertical, .MnuHorizontal { + font-family: 'Droid Sans', sans-serif; + font-size: inherit; + font-style: normal; + text-shadow: 2px 2px #eee; } + +.MnuHorizontal ul { + list-style: none; + list-style-type: none; + margin: 0; } + +/*.MnuHorizontal{ + display: -webkit-box; + -webkit-box-orient:horizontal; } + +.MnuHorizontal a{ + display:block; + padding:10px; + -webkit-box-flex:1; + text-align:center; }*/ + +/****************************************************************************************/ +/****** MENU DE NAVEGACION DE PERFILES *************/ +/****************************************************************************************/ +#infoProfiles { + float: left; + width: 300px; + margin: 0px; + padding: 2px 0px; + border: 0px solid #1cc !important; } + +#infoProfiles label { + padding: 10px 10px 10px 12px; + margin: 10px 0; } + +#infoProfiles select { + padding: 4px 0px; margin: 0; + font-family: 'Droid Sans', sans-serif; + font-size: 12px; + letter-spacing: 0.029em; + width: 200px; } + +#mnuProfiles { + margin: 0; + float: right; + padding: 2px 10px; + border: 0px solid #1494F6 !important; } + +#mnuProfiles ul { + list-style: none; + list-style-type: none; + margin: 0; + padding-left: 20px; + border: 0px solid #f00 !important; } + +#mnuProfiles li { + width: 80px; + float: left; + padding: 2px; + border: 0px solid #c55 !important; } + +#mnuProfiles a { + font-weight: normal; + color: #1494F6; + display: block; + text-align: center; + border-bottom: 1px solid #1494F6 !important; + text-decoration: none; + padding: 0px 4px; + line-height: 18px; + margin: 6px; } /****************************************************************************************/ /******** FORMULARIO DE PERFILES *************************************/ /****************************************************************************************/ -#divProfile { border: 0px solid #dff !important; margin: 10px 0px; padding: 10px 10px; width: 500px } - - -#divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit]{ - font-family: 'Open Sans', sans-serif; font-size: inherit; } -#divPattern textarea {resize: none; overflow: hidden} -.antenna{ border: 0px solid #fee !important; box-shadow: 1px 1px 2px #666; padding: 5px; margin: 10px auto; - width: 520px; display: block} -.NewAntenna{ border: 0px solid #fee !important; box-shadow: 1px 1px 2px #666; padding: 5px; margin: 10px auto; - width: 620px; display: block} -.flsAntenna { margin: 0; padding: 0px; border: 1px solid #fee !important; width: 510px} -.NewFlsAntenna { margin: 0; padding: 0px; border: 1px solid #dee !important; width: 610px} -.legendAntenna{ font-family: 'Roboto Condensed', sans-serif; font-size: inherit; text-align: center; - margin-left: 10px} -.infoAntenna{ border: 0px solid #f00 !important; width: 480px; float: left} -.overJRO{ border: 0px solid #1cc !important; width: 250px; float: left; margin: 0px 5px} -.divAntenna { float: left; margin: 10px; border: 0px solid #fcc !important; width: 220px } -.NewDivAntenna { float: left; margin: 10px; border: 0px solid #fcc !important; width: 290px } -.titleField{ display: block; text-align: center;} -.txtAntenna { width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 4px; - border: 2px solid #eee !important; /*font-family: "Ubuntu"; font-size: inherit;*/ - text-align: justify; margin: 0 auto; line-height: 20px} -.divAntenna p{ width: 175px; max-width: 180px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px; - border: 1px solid #eee !important; font-family: "Ubuntu"; font-size: inherit; - text-align: justify; margin: 0 auto; line-height: 20px} -.boxAntenna{ width: 280px; border: 2px solid #eee !important; text-align: center; display: block; - float: left; margin: 0; padding: 0;} -.lineInputs{ width: 262px; text-align: center; border: 0px solid #1cc !important; line-height: 18px; - padding: 0; height: 20px; margin: 0 auto; display: block;} -.lineInputs label{ border: 0px solid #bbb !important; float: left; margin: 0px 2px} -.divValuesAntenna{ width: 230px; border: 0px solid #bbb !important; float: left; display: block; margin: 0 auto} -.divValuesAntenna input[type=text]{ width: 18px; border: 0px; border-bottom: 1px solid #666 !important; - line-height: 20px} -.lblSign{ width: 8px; font-family: 'Roboto Condensed', sans-serif; font-size: 1.1em; color: #666} -#lblSignLeft, #lblSignRight{ margin: 0; line-height: 18px; height: 20px; float: left; padding: 0} - -.divTx { display: block; float: left; margin: 10px; border: 0px solid #f00 !important} -.divTx label{ display: block } -.divTx textarea{ width: 100px; max-width: 100px; height: 160px; max-height: 165px; text-align: justify; - border: 2px solid #eee !important; font-family: "Ubuntu"; font-size: inherit; - line-height: 20px} - -.divTx p{ width: 100px; max-width: 105px; height: 160px; max-height: 165px; background: #fdfdfb; padding: 2px; - border: 1px solid #eee !important; font-family: 'Ubuntu', sans-serif; font-size: inherit; - text-align: justify; margin: 0 auto; line-height: 20px;} - -.divUes { display: block; margin: 10px} -.divUes input[type=text] { width: 240px; max-width: 240px; font-family: 'Ubuntu', sans-serif; font-size: inherit;} - -.overJRO img{width: 400px; height: 200px; text-align: center; vertical-align: middle; margin: 40px 5px 5px 5px; - display: block; background: #fdfdfb; border: 1px solid #eee !important;} -.overJRO a{ text-align: center; margin: 0 auto; display: block} +#divProfile { + margin: 10px 0px; + padding: 10px 10px; + width: 500px; + border: 0px solid #dff !important; } + +#divPattern textarea,input[type=text],label,input[type=file],input[type=button],input[type=submit] { + font-family: 'Open Sans', sans-serif; + font-size: inherit; } + +.antenna, .NewAntenna { + box-shadow: 1px 1px 2px #666; + padding: 5px; + margin: 10px auto; + width: 520px; + display: block; + border: 0px solid #fee !important; } + +.antenna { + width: 520px; } + +.NewAntenna { + width: 620px; } + +.flsAntenna, .NewFlsAntenna { + margin: 0; + padding: 0px; + border: 1px solid #fee !important; + width: 510px; } + +.flsAntenna { + width: 510px; } + +.NewFlsAntenna { + width: 610px; } + +.legendAntenna { + font-family: 'Roboto Condensed', sans-serif; + font-size: inherit; + text-align: center; + margin-left: 10px; } + +.infoAntenna { + width: 480px; + float: left; + border: 0px solid #f00 !important; } + +.overJRO { + width: 250px; + float: left; + margin: 0px 5px; + border: 0px solid #1cc !important; } + +.divAntenna { + width: 220px; + float: left; + margin: 10px; + border: 0px solid #fcc !important; } + +.NewDivAntenna { + width: 290px; + float: left; + margin: 10px; + border: 0px solid #fcc !important; } + +.titleField { + display: block; + text-align: center; } + +.txtAntenna, .view-textAntenna { + width: 175px; + max-width: 180px; + height: 160px; + max-height: 165px; + background: #fdfdfb; + border: 2px solid #eee !important; + text-align: justify; + margin: 0 auto; + line-height: 20px; } + +.txtAntenna { + padding: 4px; +} + +.view-textAntenna { + padding: 2px; + font-family: "Ubuntu"; + font-size: inherit; } + +.boxAntenna { + width: 280px; + border: 2px solid #eee !important; + text-align: center; + display: block; + float: left; + margin: 0; + padding: 0; } + +.lineInputs { + width: 262px; + text-align: center; + line-height: 18px; + padding: 0; + height: 20px; + margin: 0 auto; + display: block; + border: 0px solid #1cc !important; } + +.lineInputs label { + float: left; + margin: 0px 2px; + border: 0px solid #bbb !important; } + +.divValuesAntenna { + width: 230px; + border: 0px solid #bbb !important; + float: left; + display: block; + margin: 0 auto; } + +.divValuesAntenna input[type=text] { + width: 18px; + border: 0px; + border-bottom: 1px solid #666 !important; + line-height: 20px; } + +.lblSign { + width: 8px; + font-family: 'Roboto Condensed', sans-serif; + font-size: 1.1em; + color: #666; } + +#lblSignLeft, #lblSignRight { + margin: 0; + line-height: 18px; + height: 20px; + float: left; + padding: 0; } + +.divTx { + display: block; + float: left; + margin: 10px; + border: 0px solid #f00 !important; } + +.divTx label { + display: block; } + +.divTx textarea { + width: 100px; + max-width: 100px; + height: 160px; + max-height: 165px; + text-align: justify; + border: 2px solid #eee !important; + font-family: "Ubuntu"; + font-size: inherit; + line-height: 20px; } + +.divTx p { + width: 100px; + max-width: 105px; + height: 160px; + max-height: 165px; + background: #fdfdfb; + padding: 2px; + border: 1px solid #eee !important; + font-family: 'Ubuntu', sans-serif; + font-size: inherit; + text-align: justify; + margin: 0 auto; + line-height: 20px; } + +.divUes { + display: block; + margin: 10px; } + +.divUes input[type=text] { + width: 240px; + max-width: 240px; + font-family: 'Ubuntu', sans-serif; + font-size: inherit; } + +.overJRO img { + width: 400px; + height: 200px; + text-align: center; + vertical-align: middle; + margin: 40px 5px 5px 5px; + display: block; + background: #fdfdfb; + border: 1px solid #eee !important; } + +.overJRO a { + text-align: center; + margin: 0 auto; + display: block; } /****************************************************************************************/ /****** MENU DE NAVEGACION DE PATRONES **********************************/ /****************************************************************************************/ -#divMnuPattern{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: right; - margin: 5px 40px 5px 0px;} -#divMnuPattern li{ float: right; display: block; width: 60px; border: 0px solid #2cc !important} -#divMnuPattern a{ display: block; line-height: 22px; text-decoration: none; padding: 0px 5px; - border-bottom: 1px solid #1494F6 !important; margin: 0px 2px; text-align: center; color: #1494F6 - } -#infoPattern{ display: block; border: 0px solid #1494f6 !important; margin: 0px 25px; } - -#navPatterns{ margin: 0 auto; border: 0px solid #d00 !important; width: 700px; height: 30px; - font-family: 'Ubuntu', sans-serif; font-size: 14px; padding: 5px 0px} -#navPatternList{ margin: 0 auto; border: 0px solid #ecc !important} -#navPatternList ul{ list-style: none; list-style-type: none; margin: 0;} -#navPatternList ul li{ float: left; width: 50px; border: 1px solid #eee !important; } -#navPatternList a{ width: 50px; border: 0px solid #1cc !important; display: block; text-align: center; line-height: 30px; padding: 1px 0px} -.lnkPattern{ background-color: #ccc !important; color: #eee;} -.lnkPatternSelected{ background-color: #2cc !important; color: #fff;} - -.divListofPatterns{ width: 650px; display: block; border: 1px solid #1cc !important; margin: 0 auto} -.divPattern{ width: 600px; display: block; border: 1px solid #f00 !important; margin: 2px auto; } +#divMnuPattern { + width: 280px; + height: 25px; + display: block; + float: right; + margin: 5px 40px 5px 0px; + border: 0px solid #1cc !important; } + +#divMnuPattern li { + float: right; + display: block; + width: 60px; + border: 0px solid #2cc !important; } + +#divMnuPattern a { + display: block; + line-height: 22px; + text-decoration: none; + padding: 0px 5px; + margin: 0px 2px; + text-align: center; + color: #1494F6; + border-bottom: 1px solid #1494F6 !important; } + +#infoPattern { + display: block; + margin: 0px 25px; + border: 0px solid #1494f6 !important; } + +#navPatterns { + margin: 0 auto; + width: 700px; + height: 30px; + border: 0px solid #d00 !important; + font-family: 'Ubuntu', sans-serif; + font-size: 14px; + padding: 5px 0px; } + +#navPatternList { + margin: 0 auto; + border: 0px solid #ecc !important; } + +#navPatternList ul { + list-style: none; + list-style-type: none; + margin: 0; } + +#navPatternList ul li { + float: left; + width: 50px; + border: 1px solid #eee !important; } + +#navPatternList a { + width: 50px; + display: block; + text-align: center; + line-height: 30px; + padding: 1px 0px; + border: 0px solid #1cc !important; } + +.lnkPattern { + background-color: #ccc !important; + color: #eee; } + +.lnkPatternSelected { + background-color: #2cc !important; + color: #fff; } + +.divListofPatterns { + width: 650px; + display: block; + border: 1px solid #1cc !important; + margin: 0 auto; } + +.divPattern { + width: 600px; + display: block; + border: 1px solid #f00 !important; + margin: 2px auto; } /****************************************************************************************/ /****** HEADER *************/ /****************************************************************************************/ -header nav{width: 960px; border: 0px solid #1cc !important; margin: 0 auto; height: 100%} -header nav a{font-family: 'Roboto Condensed', sans-serif; font-size: 1.98em; text-transform: uppercase; width: 232px; - padding: 2px; text-align: center; border: 1px solid #ddd !important; box-shadow: 1px 1px 2px #ddd; display: block; - float: left; height: 45px; text-decoration: none; background: #eee; line-height: 45px; - color: #15425d; margin: 0px 1px} -header nav a.selected{ background: #666; color: #fff } +header nav { + width: 960px; + margin: 0 auto; + height: 100%; + border: 0px solid #1cc !important; } + +header nav a { + font-family: 'Roboto Condensed', sans-serif; + font-size: 1.98em; + text-transform: uppercase; + width: 232px; + padding: 2px; + text-align: center; + border: 1px solid #ddd !important; + box-shadow: 1px 1px 2px #ddd; + display: block; + float: left; + height: 45px; + text-decoration: none; + background: #eee; + line-height: 45px; + color: #15425d; + margin: 0px 1px; } + +header nav a.selected { + background: #666; + color: #fff; } + /****************************************************************************************/ /****** FOOTER *************/ /****************************************************************************************/ -footer p{font-family: 'Roboto Condensed', sans-serif; font-size: 0.98em} - +footer p { + font-family: 'Roboto Condensed', sans-serif; + font-size: 0.98em; } \ No newline at end of file Index: trunk/webapp/templates/abscontrol/edit.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/edit.html b/trunk/webapp/templates/abscontrol/edit.html --- a/trunk/webapp/templates/abscontrol/edit.html (revision 188) +++ b/trunk/webapp/templates/abscontrol/edit.html (revision 189) @@ -71,7 +71,7 @@