Download as
Browse Code »

Commit 52aa653871a13e85a612361651148890bc990a12

Authored by Sidney Ricardo
1 parent 0430bef5
Exists in master and in 9 other branches bootstrap_modal, bug_fix_40, code_block, design_41_backup, event_block, master_with_pkg_fixes, pkg_fixes, r4, r5_design

Adjustments of notification balloons. Translation options inserted. General 

corrections.
Showing 4 changed files with 32 additions and 59 deletions   Show diff stats
cabecalho-cinza-theme.css
  Diff comments   View file @52aa653
... ... @@ -136,6 +136,7 @@ background-repeat: no-repeat;
136 136  
137 137 #portal-siteactions li {
138 138 display: inline;
  139 + margin: 0 5px 0 0;
139 140 }
140 141  
141 142 #portal-siteactions li a:hover {
... ... @@ -165,9 +166,11 @@ background-repeat: no-repeat;
165 166 }
166 167  
167 168 #siteaction-accessibility,
168   -#siteaction-contraste {
  169 +#siteaction-contraste,
  170 +li#siteaction-mapadosite {
169 171 margin: 0px 15px 0px 0px;
170 172 }
  173 +
171 174 /* */
172 175  
173 176 /* Top links */
... ... @@ -282,11 +285,13 @@ width: 13em;
282 285 }
283 286  
284 287 #content input.searchField {
285   -margin-bottom: 1em;
  288 + margin-bottom: 1em;
286 289 }
  290 +
  291 +/* Removendo css de campo de busca especifico do firefox
287 292 input.searchField {
288   --moz-appearance: searchfield;
289   -}
  293 + -moz-appearance: searchfield;
  294 +}*/
290 295  
291 296 #header input.searchButton {
292 297 background-image: url("images/search-button.png");
... ... @@ -633,7 +638,7 @@ color:#000000;
633 638 max-width: 960px;
634 639 margin: 0 auto;
635 640 text-align: left;
636   - padding: 19px;
  641 + padding: 5px;
637 642 }
638 643  
639 644 #footer-license p {
... ...
cadastro.css
  Diff comments   View file @52aa653
... ... @@ -47,7 +47,7 @@ color: #4A4A4A;
47 47 /*padding: 7px 7% 10px 3%; */
48 48 /*height: 30px !important;*/
49 49 width: 50%;
50   - float:center;
  50 + /*center:float;*/
51 51 margin:3px 2px 3px 0px;
52 52 }
53 53  
... ... @@ -64,8 +64,8 @@ color: #4A4A4A;
64 64 }
65 65  
66 66 #signup-login {
67   - width:188px;
68   - margin-bottom:5px;
  67 + width:188px;
  68 + margin-bottom:5px;
69 69 }
70 70  
71 71 #signup-form .formfield input,
... ... @@ -77,8 +77,13 @@ color: #4A4A4A;
77 77 #signup-form small#password-confirmation-balloon,
78 78 #signup-form small#email-balloon,
79 79 #signup-form small#name-balloon{
80   - left:90%;
  80 + left:100%;
81 81 }
  82 +/*
  83 +#signup-form a#add_new_institution {
  84 + margin-left: 252px;
  85 +}
  86 +*/
82 87  
83 88 /*#content a.button.with-text {
84 89 line-height: 50px !important;
... ... @@ -156,4 +161,4 @@ margin:10px;
156 161 #institution_dialog .formfield.type-text:hover,
157 162 #institution_dialog .formfield.type-radio:hover {
158 163 background: url(images/hdot2.gif) repeat-x bottom #f1e5dc;
159   -}
160 164 \ No newline at end of file
  165 +}
... ...
footer.html.erb
  Diff comments   View file @52aa653
... ... @@ -104,28 +104,8 @@
104 104  
105 105  
106 106 <!-- fim div#wrapper -->
107   - <!-- scripts principais -->
108   -
109   - <noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
110   - <noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
111   - <script src="{{ STATIC_URL }}js/template.js" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
112   - <script src="{{ STATIC_URL }}third-party/jplayer/jquery.jplayer.min.js" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
113   - <script type="text/javascript">
114   - //<![CDATA[
115   - jQuery(document).ready(function(){
116   - urls = {mp3:"http://tv1-lnx-04.grupotv1.com/portalmodelo/conteudos-de-marcacao/audio-1-titulo-do-audio-1/audio-1-nome-do-audio.mp3"};
117   - playAudio("#jquery_jplayer_1", urls, "mp3", "jplayer/");
118   - });
119   - //]]>
120   - </script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
121   - <!-- Script do portal Brasil deve ficar preferencialmente no rodape para nao atrasar o carregamento da pagina principal -->
122   - <script src="http://barra.brasil.gov.br/barra.js?cor=verde" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
123 107  
124 108 <!--fim footer colab01-->
125   -
126   -
127   -
128   -
129 109  
130 110  
131 111 <div id="footer-content">
... ... @@ -146,6 +126,6 @@
146 126 </div><!-- end id="footer-license" -->
147 127 </div>
148 128  
149   -<!-- <script type="text/javascript" src="http://barra.brasil.gov.br/barra.js?cor=verde"></script> -->
150   -<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript"></script>
  129 + <!-- Script do portal Brasil deve ficar preferencialmente no rodape para nao atrasar o carregamento da pagina principal -->
  130 + <script src="http://barra.brasil.gov.br/barra.js?cor=verde" type="text/javascript"></script><noscript>&nbsp;<!-- item para fins de acessibilidade --></noscript>
151 131  
... ...
header.html.erb
  Diff comments   View file @52aa653
... ... @@ -38,15 +38,7 @@
38 38 </a>
39 39 </li>
40 40 </ul>
41   - <!--<div class="span6 language-and-actions-container"> -->
42   - <!-- <ul id="language" class="pull-left">
43   - <li class="language-en">
44   - <a href="#">ENGLISH</a>
45   - </li>
46   - <li class="language-es">
47   - <a href="#">ESPAÑOL</a>
48   - </li>
49   - </ul> -->
  41 +
50 42  
51 43 <ul id="portal-siteactions">
52 44 <li id="siteaction-accessibility">
... ... @@ -58,18 +50,16 @@
58 50 <li id="siteaction-mapadosite">
59 51 <a href="/search">Mapa do Site</a>
60 52 </li>
  53 +
  54 + <li id="siteaction-languages-pt">
  55 + <a href="?lang=pt" title="Português">Português</a>
  56 + </li>
  57 + <li id="siteaction-languages-en">
  58 + <a href="?lang=en" title="English">English</a>
  59 + </li>
61 60 </ul>
62 61  
63   -<!--<div class="language-and-actions-container">
64   - <ul id="language" class="pull-left">
65   - <li class="language-en">
66   - <a href="#">ENGLISH</a>
67   - </li>
68   - <li class="language-es">
69   - <a href="#">ESPAÑOL</a>
70   - </li>
71   - </ul>
72   -</div> -->
  62 +
73 63 <div id="logo">
74 64  
75 65 <a title="Software Público" href="/">
... ... @@ -112,7 +102,6 @@
112 102 </div>
113 103  
114 104 </div>
115   -
116 105  
117 106 </div>
118 107 </div>
... ... @@ -140,8 +129,7 @@
140 129  
141 130 </li>
142 131  
143   - </ul>
144   -
  132 + </ul>
145 133  
146 134 </div>
147 135  
... ... @@ -152,10 +140,5 @@
152 140 <!--
153 141 <div id="barra-psocial">
154 142  
155   -
156   -<div id="participa-languages">
157   - <a href="?lang=pt" class="flag-pt" title="Português"><span>Português</span></a>
158   - <a href="?lang=en" class="flag-en" title="English"><span>English</span></a>
159   - </div>
160 143 </div>-->
161 144  
... ...