From db3fd1b1738809febf010fc06f22f66955de0c49 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 22 Apr 2014 17:55:48 -0500 Subject: [PATCH] update errores ref. Chamilo #6999 --- main/css/base.css | 2 +- main/css/chamilo/default.css | 102 ++++++++++++------- main/css/chamilo/images/accept_data.png | Bin 916 -> 610 bytes main/css/chamilo/images/error.png | Bin 575 -> 0 bytes main/template/default/layout/main.tpl | 5 +- main/template/default/layout/main_footer.tpl | 2 + main/template/default/layout/main_header.tpl | 5 +- 7 files changed, 75 insertions(+), 41 deletions(-) delete mode 100644 main/css/chamilo/images/error.png diff --git a/main/css/base.css b/main/css/base.css index a49038edcc..7a37f8b394 100644 --- a/main/css/base.css +++ b/main/css/base.css @@ -564,7 +564,7 @@ a.tag { width: 47%; } #settings .span6 .well_border{ - min-height: 265px; + min-height: 300px; } #settings .form-search .span3 { float: left; diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index 4068b1341e..ac38b8210e 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -6,6 +6,11 @@ @import url('../base_chamilo.css'); /* the following for regular elements */ +body { + + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; +} a { text-decoration: none; color :#6E6E6E; @@ -30,15 +35,20 @@ a:active { color: #FFFFFF; } .subnav .navbar-inner { - background-color: #0191C7; /* Old browsers */ - background-repeat: repeat-x; /* Repeat the gradient */ - background-image: none; - border: none; + background: #4fb2ea; /* Old browsers */ +background: -moz-linear-gradient(top, #4fb2ea 0%, #0191c7 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4fb2ea), color-stop(100%,#0191c7)); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, #4fb2ea 0%,#0191c7 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, #4fb2ea 0%,#0191c7 100%); /* Opera 11.10+ */ +background: -ms-linear-gradient(top, #4fb2ea 0%,#0191c7 100%); /* IE10+ */ +background: linear-gradient(to bottom, #4fb2ea 0%,#0191c7 100%); /* W3C */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4fb2ea', endColorstr='#0191c7',GradientType=0 ); /* IE6-9 */ + border: 1px solid #178ACC; } .subnav .nav > li > a { - border-left: 1px solid #0191C7; - border-right: 1px solid #0191C7; + border-left: none; + border-right: none; color: white; font-weight: normal; font-size: 13px; @@ -48,8 +58,8 @@ a:active { .subnav .nav > #current > a, .subnav .nav > #current > a:hover { color: #fff; - background-color: #0f466a; - border-right-color: #0f466a; + background-color: #178ACC; + border-right-color: #178ACC; } .subnav li a { @@ -58,7 +68,7 @@ a:active { /* Green hover */ .subnav .navbar-inner li a:hover { - background: none repeat scroll 0 0 #FD6600; + background: #178ACC; color: #fff; } .well .nav-list > li > a:hover { @@ -684,12 +694,17 @@ a.thumbnail:hover{ * FOOTER STYLES * *****************************************************/ footer { - height: 10em; - background-color: #0191C7; - background-image: none; - background-repeat:repeat-x; + height: 7em; + background: #4fb2ea; /* Old browsers */ + background: -moz-linear-gradient(top, #4fb2ea 0%, #0191c7 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#4fb2ea), color-stop(100%,#0191c7)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #4fb2ea 0%,#0191c7 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #4fb2ea 0%,#0191c7 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #4fb2ea 0%,#0191c7 100%); /* IE10+ */ + background: linear-gradient(to bottom, #4fb2ea 0%,#0191c7 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4fb2ea', endColorstr='#0191c7',GradientType=0 ); /* IE6-9 */ color:#ffffff; - border-top: none; + border-top: 1px solid #0191C7; } footer .container .row { padding-top: 5px; @@ -744,25 +759,48 @@ footer a:link, footer a:visited { * CSS CHAT END * *****************************************************/ .normal-message { - color: #00407F; - border: 1px solid #CDE6F5; + background-color: #D9EDF7; + color: #3A87AD; + padding: 15px; + margin-bottom: 15px; + border-top: 1px solid #BCE8F1; + border-left: 1px solid #BCE8F1; + border-right: 1px solid #BCE8F1; + border-bottom: 3px solid #BCE8F1; + border-radius: 10px; } .warning-message { - border: 1px solid #FFB30F; - color: #000; + background-color: #FCF8E3; + color: #C09853; + padding: 10px; + margin-bottom: 15px; + border-top: 1px solid #FBEED5; + border-left: 1px solid #FBEED5; + border-right: 1px solid #FBEED5; + border-bottom: 3px solid #FBEED5; + border-radius: 10px; } .confirmation-message { - border: 1px solid #1F8323; - color:#1F8323; - background: url("images/accept_data.png") no-repeat scroll 5px center #CAF0C7; - padding-left: 45px; + background-color: #DFF0D8; + color: #468847; + padding: 10px; + margin-bottom: 15px; + border-top: 1px solid #D6E9C6; + border-left: 1px solid #D6E9C6; + border-right: 1px solid #D6E9C6; + border-bottom: 3px solid #D6E9C6; + border-radius: 10px; } .error-message { - border: 1px solid #FA5858; - color: #000; - padding-top: 5px; - background: url("images/error.png") no-repeat scroll 5px center #F6CECE; - padding-left: 45px; + background-color: #F2DEDE; + color: #B94A48; + padding: 10px; + margin-bottom: 15px; + border-top: 1px solid #EED3D7; + border-left: 1px solid #EED3D7; + border-right: 1px solid #EED3D7; + border-bottom: 3px solid #EED3D7; + border-radius: 10px; } .error-message strong{ font-weight: normal; @@ -1022,10 +1060,7 @@ END INSTALL CHAMILO background: url("images/icon-chamilo.png") no-repeat 0 -618px; padding-left: 40px; } - .forum-btn{ - background: url("images/icon-chamilo.png") no-repeat 0 -666px; - padding-left: 40px; - } + /*+++++++++++++++++++++++++++++++++ RESPONSIVE CSS @@ -1155,11 +1190,6 @@ RESPONSIVE CSS padding-left: 30px; background-size: 25px auto; } - .forum-btn { - background: url("images/icon-chamilo.png") no-repeat scroll 0 -552px / 25px auto rgba(0, 0, 0, 0); - padding-left: 30px; -} - } @media (min-width: 321px) and (max-width: 480px){ footer { diff --git a/main/css/chamilo/images/accept_data.png b/main/css/chamilo/images/accept_data.png index 75e34377587d88c22ef9032106f14db0c673b019..252ce9d25e0e9291f8644bbfbaad8bb9e5143393 100644 GIT binary patch delta 546 zcmV+-0^R+T2jT=FiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9SCJu1e*xb~ zL_t(IjjfbDOjBVLhM#lGBq7*I2$6&vQery6EhfbQVv7bPVY;n@iyCzy{tPS-WkAE= zzyOK5P)SfjyEs!C;{YaT9F&3v2Nz6?n%G1`800YY-nQP}C?&q*d%p90=leNFR28q{ z8HtJzL+J)0j{O?pl`6R;gmXc00=;flZ(XCLaJ4< zJ%$LeS|EewRc7L=40leKJP~4s^ThkoS@R0ltosPUmtUXC0j1lZ{7(Qle^l2%qGJR@ z0)Ifxn3uV3JwOm<-;I*~aIZ2Psq^kS7G2(^ghN8+?L9OK!?X}^4jLMofki~qMpvbGjPNjiajLqtis6Tom?r;EcVsedAh kYr<~lgJ&MOI>=z#19XbEA1Me~+5i9m07*qoM6N<$g3##oI{*Lx delta 855 zcmV-d1E~Ds1e6CMiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPP$f!mi1_cRSNQ74fiI8b_ zQ3M5j+^XFDk=!FCW%Jbtht@@cCn$d={(IX{KL68=Y8Ju`}2N2 zk5EcsM70lvH5j1Eq*JF03I#Zce>?zw1%9b`qe*(LSqykxDrn@tVkrYP-NLEqw4kU5 zatyhJDFj_6No(JJd!WL&By5LeZ=ZRDnWdYGCsOc6?P2&T}ul9e{w8=z%-+twn0GdwA ze}n^MMwtkg7i;Jj;}}0=4D0x&3zXQ)x#T;_#P6@M%~O_a>@pajDjo2X#T^_gYN5nl z&Xw{(R@v6ZhU5eTR7sOge_cA@hYQZlzUSp^q-gcdxHyweozw+|>4XD3_;`zFUwY$W zbwQyNb2r+eGE2*{;5S}2qKH581vn*37}#R3z_a%o^@Yue!u}Z^l~XR(0RY`(~$g0rcF1Cf(((fit-xekl8&b~JkU*^EZrj)?}ziES;e}e+nFVy<}`wJ{G zgJS!x*>Bq&d-yps!Mn+!<-$?$T2$ZVwi2956xg`!I{WfZ&+Dl85gaGix+ZBjfKc3# znk0UI#OUU$Gd%j#IoA=fY&d`>>6O+j27swVfeOXd=M6mmd~d<_WZ=M*HH!i1b*UhN zuBD=NrP1N5=gH{(e^kIh(B*Zhpad{UT8Si(38kqpmwZQf`lV-iaF~uV=Tfq2k7xtV z8|iJ98RX|~<=y0PGH`(Qez$6dc^OeSKpWsQ(mSlr@OE-2S-3CC0#;H|3NYwaV+v{o zjHUywpfJ%=P)K~z|U&6hoH!axv(Khj`)0yshnE|HEZ7jVZ#kY&yQ*GLI6 zk?6QVBwC8}Ac|Bkh3#OQ{X+qnk*1rS_w0GIGux9yko9_f;0<^OUV%~R0N_Li9qH&7)4T&_yLlnh;_$hO#(%$+0`CJ(rP71 z(rji=Jew6UtCf$$S!Ih>1Qyod!9ZHC)i4u@3cRxQx;Semu_y>YU$#qTFp%{oFdOPh^3 zalOtqeQY*G4l{Up70WY>Oe9S8ZR^AhF8vK71&rf530GY!z4*af<5&R;NgVs?dC`p< zT)J9F^b9MRx?V~zBsyHnn}4FChe=Zt9X-vOL>~G$?MVt7n-6-P{{mUD_a_<9in{;+ N002ovPDHLkV1jt;?T7#X diff --git a/main/template/default/layout/main.tpl b/main/template/default/layout/main.tpl index d0dc15c1aa..e4565f0acf 100644 --- a/main/template/default/layout/main.tpl +++ b/main/template/default/layout/main.tpl @@ -11,12 +11,11 @@ {% block footer %} {# Footer #} {% if show_footer == true %} -
- - + {% endif %} + {% include "default/layout/main_footer.tpl" %} {% endblock %} diff --git a/main/template/default/layout/main_footer.tpl b/main/template/default/layout/main_footer.tpl index 195a0763c4..b0b6aa415b 100644 --- a/main/template/default/layout/main_footer.tpl +++ b/main/template/default/layout/main_footer.tpl @@ -1,3 +1,5 @@ + + {% if show_footer == true %} {% include "default/layout/footer.tpl" %} {% endif %} diff --git a/main/template/default/layout/main_header.tpl b/main/template/default/layout/main_header.tpl index 306aaefb7c..59dfbdf64d 100644 --- a/main/template/default/layout/main_header.tpl +++ b/main/template/default/layout/main_header.tpl @@ -16,7 +16,9 @@
  • {{ "WCAGGoContent"|get_lang }}
    • +
    +
    {# Bug and help notifications #}