Download as
Browse Code »

Commit 87628a98028856f3391b3d3f9fcbfab70b067814

Authored by Leandro Santos
1 parent 3052da32
Exists in master and in 3 other branches production, staging, working

refactoring da barra de pesquisa

Showing 6 changed files with 23 additions and 38 deletions   Show diff stats
cabecalho.css
  Diff comments   View file @87628a9
... ... @@ -544,7 +544,6 @@ text-decoration: none;
544 544 position: static;
545 545 background: none;
546 546 background-color: #eee;
547   - border-bottom: 1px solid #d3d7cf;
548 547 }
549 548  
550 549 #navigation ul {
... ...
header.css
  Diff comments   View file @87628a9
... ... @@ -2,10 +2,10 @@
2 2 Header
3 3 --------------------------------------------------------------*/
4 4 #theme-header{height: auto;}
5   -header { margin:0 auto; height: 195px; border-bottom:1px solid #eaeaea; }
6   -#logo { margin-top:55px; float:left; }
7   -#header-left { width:400px; }
8   -#header-right { float:right; width:530px; height:185px; }
  5 +header { margin: 0 auto; height: 200px; padding: 0px }
  6 +#logo { margin-top: 55px;}
  7 +#header-left { width: 400px; float: left }
  8 +#header-right { float: right; width: 530px; height: 185px; margin-top: 10px }
9 9 #header-right a { color:#ffffff; }
10 10  
11 11 #header-right-1 { float:right; width:258px; height:185px; }
... ...
header.html.erb
  Diff comments   View file @87628a9
... ... @@ -35,12 +35,12 @@
35 35 <li class='hide'><a href='http://agendanacional.portalcorporativo.serpro'>Agenda Nacional</a></li>
36 36 <li class='hide'><a href='http://www.gedig.serpro/'>Gerenciamento Eletrônico de Documentos Digitalizados</a></li>
37 37 <li class='hide'><a href='https://gmpsds.serpronet.serpro'>GM PSDS</a></li>
38   - <ul>
  38 + <li class='last'>
  39 + <label for="search">Pesquisar: </label>
  40 + <input placeholder="palavra chave" id="top-search-bar-input" type="text" />
  41 + </li>
  42 + </ul>
39 43  
40   - <div class='input-holder'>
41   - <label for="search">Outro: </label>
42   - <input placeholder="palavra chave" id="top-search-bar-input" type="text" />
43   - </div>
44 44  
45 45 <script>
46 46 (function ($, document, window) {
... ...
style-core.css
  Diff comments   View file @87628a9
1   -#wrap-2 #user {
2   - display: none;
3   -}
4   -
5   -#user .logged-in a.ctrl-panel {
6   - display: none;
7   -}
  1 +#wrap-2 #user, #user .logged-in a.ctrl-panel, #site-title { display: none;}
... ...
style.css
  Diff comments   View file @87628a9
... ... @@ -10,29 +10,19 @@ body, th, td, input {
10 10 font-family: Open Sans;
11 11 }
12 12  
13   -#wrap-2 {background-color:#ebeff2;}
  13 +body, #wrap-2{
  14 + background-color: #f6f6f6;
  15 + border: none;
  16 +}
  17 +
  18 +
  19 +/***** Leandro: Old Code ********/
  20 +
14 21  
15 22 #wrap-1 {
16 23 min-width: 800px;
17 24 }
18 25  
19   -#site-title {
20   - position: relative;
21   - top: 0;
22   - width: auto;
23   - height: auto;
24   - display: none;
25   - visibility: hidden;
26   -}
27   -
28   -#site-title a {
29   - display: block;
30   - width: auto;
31   - height: auto;
32   - position: relative;
33   - top: 0;
34   - left: 0;
35   -}
36 26  
37 27 /*largura dos blocos lateral e principal*/
38 28  
... ...
top-search-bar.css
  Diff comments   View file @87628a9
1   -#top-search-bar { height: 26px; }
  1 +#top-search-bar { border-bottom: 1px solid #eaeaea; height: 30px; font-family: 'Open Sans'; color: #4D4D4D; }
2 2 #top-search-bar .hide{ display: none;}
3   -#top-search-bar ul { margin: 0px; padding:0; list-style-type:none; list-style-position:outside; background:#ffffff; }
  3 +#top-search-bar ul { margin: 0px; padding-bottom: 10px; list-style-type:none; list-style-position:outside; background:#ffffff; }
4 4 #top-search-bar ul a:link, #top-search-bar ul a:active, #top-search-bar ul a:visited { display:block; padding:0; text-decoration:none; }
5   -#top-search-bar ul li { float:left; position:relative; background:none; padding:5px 12px; transition: all 300ms ease-in; }
  5 +#top-search-bar ul li { display: inline-block; position:relative; background:none; padding:5px 12px; transition: all 300ms ease-in; }
6 6 #top-search-bar ul li:hover { background:#257CAD; color: white; text-shadow: none; }
7 7 #top-search-bar ul li a:hover { color: white; }
  8 +#top-search-bar ul li.last { transition: none; }
  9 +#top-search-bar ul li.last:hover { background: none; color: inherit;}
... ...