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 140) +++ b/trunk/webapp/static/css/style.css (revision 141) @@ -1,70 +1,16 @@ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/MTP_ySUJH_bn48VBG8sNSnhCUOGz7vYGh680lGh-uXM.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 800; - src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hnhCUOGz7vYGh680lGh-uXM.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 300; - src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxh_xHqYgAV9Bl_ZQbYUxnQU.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 400; - src: local('Open Sans Italic'), local('OpenSans-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 600; - src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxn5HxGBcBvicCpTp6spHfNo.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 700; - src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxjqR_3kx9_hJXbbyU8S6IN0.woff) format('woff'); -} -@font-face { - font-family: 'Open Sans'; - font-style: italic; - font-weight: 800; - src: local('Open Sans Extrabold Italic'), local('OpenSans-ExtraboldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxkCDe67GEgBv_HnyvHTfdew.woff) format('woff'); -} +/* + * font-family: 'Droid Sans', sans-serif; + * font-family: 'Ubuntu', sans-serif; + * font-family: 'Open Sans', sans-serif; + * font-family: 'Open Sans Condensed', sans-serif; + * font-family: 'Roboto Condensed', sans-serif; + */ -body {font-size: 11px; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif} -article, aside, figure, footer, header, hgroup, nav, section { display:block; } +body { font-size: 11px; } header {border: 1px solid #fcc; font-size: 2em; height: 50px; text-align: center; line-height: 50px} #schema {margin: 0 auto; width: 980px; border: 1px solid #f00; padding: 10px 10px 10px 10px} #content {border: 1px solid #1cc; margin-top: 5px; margin-bottom: 5px} -#content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; font-family: Monaco;} +#content #leftcolumn {float: left;border: 1px solid #c55; width: 150px; } #content #maincolumn {float: left; border: 1px solid #000; width: 800px; padding-left: 20px;} footer {border: 1px solid #200; font-size: 0.9em; height: 30px; text-align: center; line-height: 20px} @@ -72,20 +18,26 @@ /****************************************************************************************/ /****** ESTILOS GENERALES *****************/ /****************************************************************************************/ -.mnu{ height: 22px; border: 1px solid #c55 !important;} +.mnu{ height: 22px; border: 0px solid #c55 !important;} .mnu li{ display:inline;} +.MnuVertical, .MnuHorizontal { font-family: 'Droid Sans', sans-serif; font-size: 1.2em; font-style: italic; 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 **********************************/ /****************************************************************************************/ -#content #infoProfiles {border: 1px solid #d00; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px} +#content #infoProfiles {border: 1px solid #d00 !important; width: 140px; margin: 0px; padding-top: 2px; padding-bottom: 2px} .lblInfo {padding-left: 12px; line-height: 20px;} #infoProfiles select {padding-left: 12px; line-height: 20px;margin-left: 12px} -#content nav {border: 0px solid #c55 !important; margin: 0px; font-family: Monaco; font-size: 1.2em;} -#content nav ul{list-style: none; list-style-type: none; margin: 0; padding-left: 20px; border: 0px solid #eee !important} -#content nav ul li{line-height: 22px; } +#content nav {border: 0px solid #c55 !important; margin: 0px;} + +#leftcolumn #mnuProfiles{ margin: 5px 0px; 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; padding: 2px; border: 0px solid #c55 !important; line-height: 22px} +#mnuProfiles a{ font-weight: normal; color: #1494F6; display: block; border: 0px solid #1cc !important; text-align: left} /****************************************************************************************/ /******** FORMULARIO DE PERFILES *************************************/ @@ -112,9 +64,18 @@ /****************************************************************************************/ /****** MENU DE NAVEGACION DE PATRONES **********************************/ /****************************************************************************************/ -#divMnuPattern{ width: 350px; height: 25px; display: block; border: 1px solid #1cc !important; float: right } +#divMnuPattern{ width: 280px; height: 25px; display: block; border: 0px solid #1cc !important; float: left; margin-left: 500px} +#divMnuPattern li{ float: left; 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: 1px solid #1494f6 !important, margin: 5px 2px; } -#navPatterns{ margin: 5px auto; padding: 2px; border: 1px solid #d00 !important; width: 400px; height: 25px} -#navPatterns ul li{ width: 50px; border: 1px solid #1cc !important} -#navPatterns a{ width: 50px; border: 0px solid #1cc !important} + +#navPatterns{ margin: 10px auto; border: 0px solid #d00 !important; width: 500px; height: 30px; font-family: 'Ubuntu', sans-serif; font-size: 14px; + padding: 10px 0px} #navPatternList{ margin: 0px auto; border: 1px 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: 25px} +.lnkPattern{ background-color: #ccc !important; color: #eee;} +.lnkPatternSelected{ background-color: #2cc !important; color: #fff;} 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 140) +++ b/trunk/webapp/templates/abscontrol/edit.html (revision 141) @@ -29,8 +29,8 @@