Download as
Browse Code »

Commit 1a437a5d5e10906b80e7f17bf01975a9cc603004

Authored by Carlos Coêlho
1 parent cf548efb
Exists in layout-fix

Alignment adjust 

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Melissa Wen <melissa.srw@gmail.com>
Showing 5 changed files with 120 additions and 96 deletions   Show diff stats
colab/proxy/noosfero/diazo.xml
  Diff comments   View file @1a437a5
@@ -12,7 +12,6 @@ @@ -12,7 +12,6 @@
12 <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" /> 12 <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" />
13 <drop theme="/html/head/script" /> 13 <drop theme="/html/head/script" />
14 <drop css:content="#barra-brasil" /> 14 <drop css:content="#barra-brasil" />
15 - <drop css:content="#user" />  
16 <drop css:content="#theme-footer" /> 15 <drop css:content="#theme-footer" />
17 <drop css:content="#homepage-link" /> 16 <drop css:content="#homepage-link" />
18 <drop css:content=".header-content" /> 17 <drop css:content=".header-content" />
colab/proxy/noosfero/static/noosfero/css/screen.css
  Diff comments   View file @1a437a5
@@ -61,3 +61,7 @@ @@ -61,3 +61,7 @@
61 div#main-content { 61 div#main-content {
62 margin-top: 100px; 62 margin-top: 100px;
63 } 63 }
  64 +
  65 +.colab-style .container {
  66 + width: 1020px;
  67 +}
colab/static/css/header.css
  Diff comments   View file @1a437a5
@@ -55,6 +55,31 @@ @@ -55,6 +55,31 @@
55 border-bottom: 1px dotted #2c66ce; 55 border-bottom: 1px dotted #2c66ce;
56 } 56 }
57 57
  58 +#colab-portal-siteactions .dropdown-menu li {
  59 + display: block;
  60 +}
  61 +
  62 +#colab-portal-siteactions .dropdown-menu a {
  63 + padding: 3px;
  64 +}
  65 +
  66 +#colab-portal-siteactions .dropdown-menu a:hover {
  67 + background: none;
  68 +}
  69 +
  70 +#colab-portal-siteactions .dropdown-menu a.btn-info,
  71 +#colab-portal-siteactions .dropdown-menu a.btn-default {
  72 + text-transform: capitalize;
  73 +}
  74 +
  75 +#colab-portal-siteactions .dropdown-menu a.btn-info:hover,
  76 +#colab-portal-siteactions .dropdown-menu a.btn-default:hover {
  77 + background: #5e82c6;
  78 +}
  79 +
  80 +#colab-siteaction-contraste a {
  81 + display: none;
  82 +}
58 /* User-bar */ 83 /* User-bar */
59 84
60 #user-menu a.btn { 85 #user-menu a.btn {
colab/templates/footer.html
  Diff comments   View file @1a437a5
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 </dl> 49 </dl>
50 <dl class="col-md-2 colab-footer-links"> 50 <dl class="col-md-2 colab-footer-links">
51 <dt>Navegação</dt> 51 <dt>Navegação</dt>
52 - <dd><a href="/social/spb/acessibilidade">Acessibilidade</a></dd> 52 + <dd><a href="https://www.secom.gov.br/acessibilidade">Acessibilidade</a></dd>
53 <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd> 53 <dd><a href="/social/spb/mapa-do-site">Mapa do site</a></dd>
54 </dl> 54 </dl>
55 </div> 55 </div>
colab/templates/header.html
  Diff comments   View file @1a437a5
@@ -11,71 +11,69 @@ @@ -11,71 +11,69 @@
11 <!-- end of barra-brasil --> 11 <!-- end of barra-brasil -->
12 <div id="first-nav"> 12 <div id="first-nav">
13 <div class="container"> 13 <div class="container">
14 - <div class="row">  
15 - <div class="col-md-12">  
16 - <ul id="accessibility" class="nav navbar-nav hidden-xs hidden-sm">  
17 - <li>  
18 - <a id="link-conteudo" href="#main-content" accesskey="1">Ir para o conteúdo <span class="label label-primary">1</span></a>  
19 - </li>  
20 - <li>  
21 - <a id="link-navegacao" href="#menu-spb" accesskey="2">Ir para o menu <span class="label label-primary">2</span></a>  
22 - </li>  
23 - <li> <a id="link-buscar" accesskey="3" href="#header-searchbox" title="Go to search">Ir para a busca <span class="label label-primary">3</span></a>  
24 - </li>  
25 - <li>  
26 - <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>  
27 - </li>  
28 - </ul> <!-- end of accesskeys -->  
29 - <ul id="colab-portal-siteactions" class="nav navbar-nav navbar-right">  
30 - <li id="colab-siteaction-accessibility">  
31 - <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a>  
32 - </li>  
33 - <li id="colab-siteaction-contraste">  
34 - <a href="#"><span>Alto Contraste</span></a>  
35 - </li>  
36 - <li id="colab-siteaction-mapadosite">  
37 - <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>  
38 - </li>  
39 - <!-- begin of user-menu -->  
40 - {% if not user.is_authenticated %}  
41 - <li class="dropdown hidden-xs hidden-lg">  
42 - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>  
43 - <ul class="dropdown-menu">  
44 - {% trans 'Login' as login_text %}  
45 - <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>  
46 - <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>  
47 - </ul>  
48 - </li> 14 + <div class="col-md-12">
  15 + <ul id="accessibility" class="nav navbar-nav hidden-xs hidden-sm">
  16 + <li>
  17 + <a id="link-conteudo" href="#main-content" accesskey="1">Ir para o conteúdo <span class="label label-primary">1</span></a>
  18 + </li>
  19 + <li>
  20 + <a id="link-navegacao" href="#menu-spb" accesskey="2">Ir para o menu <span class="label label-primary">2</span></a>
  21 + </li>
  22 + <li> <a id="link-buscar" accesskey="3" href="#header-searchbox" title="Go to search">Ir para a busca <span class="label label-primary">3</span></a>
  23 + </li>
  24 + <li>
  25 + <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>
  26 + </li>
  27 + </ul> <!-- end of accesskeys -->
  28 + <ul id="colab-portal-siteactions" class="nav navbar-nav navbar-right">
  29 + <li id="colab-siteaction-accessibility">
  30 + <a href="https://www.secom.gov.br/acessibilidade"><span>Acessibilidade</span></a>
  31 + </li>
  32 + <li id="colab-siteaction-contraste">
  33 + <a href="#"><span>Alto Contraste</span></a>
  34 + </li>
  35 + <li id="colab-siteaction-mapadosite">
  36 + <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>
  37 + </li>
  38 + <!-- begin of user-menu -->
  39 + {% if not user.is_authenticated %}
  40 + <li class="dropdown hidden-xs hidden-lg">
  41 + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
  42 + <ul class="dropdown-menu">
49 {% trans 'Login' as login_text %} 43 {% trans 'Login' as login_text %}
50 - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>  
51 - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>  
52 - {% else %}  
53 - <li id="user-menu" class="dropdown">  
54 - <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>  
55 - <ul class="dropdown-menu" role="menu">  
56 - <li>  
57 - <div class="wrapper">  
58 - <div class="thumbnail">{% gravatar user.email 100 %}</div>  
59 - <div class="user-info">  
60 - <span><b>{{ user.get_full_name }}</b></span>  
61 - <span class="quiet">{{ user.email }}</span>  
62 - </div>  
63 - <div>  
64 - <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>  
65 - {% trans 'Logout' as logout_text %}  
66 - <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a> 44 + <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
  45 + <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
  46 + </ul>
  47 + </li>
  48 + {% trans 'Login' as login_text %}
  49 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
  50 + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
  51 + {% else %}
  52 + <li id="user-menu" class="dropdown">
  53 + <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
  54 + <ul class="dropdown-menu" role="menu">
  55 + <li>
  56 + <div class="wrapper">
  57 + <div class="thumbnail">{% gravatar user.email 100 %}</div>
  58 + <div class="user-info">
  59 + <span><b>{{ user.get_full_name }}</b></span>
  60 + <span class="quiet">{{ user.email }}</span>
67 </div> 61 </div>
  62 + <div>
  63 + <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
  64 + {% trans 'Logout' as logout_text %}
  65 + <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a>
68 </div> 66 </div>
69 - </li>  
70 - </ul>  
71 - </li> <!-- end of user-menu -->  
72 - {% endif %}  
73 - </ul>  
74 - </div>  
75 - </div> <!-- end of access-menu -->  
76 - <div class="row" id="spb-logo-search"> 67 + </div>
  68 + </li>
  69 + </ul>
  70 + </li> <!-- end of user-menu -->
  71 + {% endif %}
  72 + </ul>
  73 + </div>
  74 + <div id="spb-logo-search">
77 <div class="col-md-6 logo-box"> 75 <div class="col-md-6 logo-box">
78 - <div id="logo"> 76 + <div id="logo" class="nav navbar-nav">
79 <a href="/" id="portal-logo"> 77 <a href="/" id="portal-logo">
80 <img class="img-responsive pull-left" src="{% static 'img/logo.svg' %}" /> 78 <img class="img-responsive pull-left" src="{% static 'img/logo.svg' %}" />
81 </a> 79 </a>
@@ -83,7 +81,7 @@ @@ -83,7 +81,7 @@
83 </div> 81 </div>
84 <div class="col-md-6"> 82 <div class="col-md-6">
85 <div class="input-group box-search navbar-right"> 83 <div class="input-group box-search navbar-right">
86 - <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-form" role="search"> 84 + <form action="{% url 'haystack_search' %}" method="GET" id="search-form" class="navbar-right" role="search">
87 <div class="form-group"> 85 <div class="form-group">
88 <label class="sr-only" for="header-searchbox">{% trans 'Search...' %}</label> 86 <label class="sr-only" for="header-searchbox">{% trans 'Search...' %}</label>
89 <input name="q" id="header-searchbox" 87 <input name="q" id="header-searchbox"
@@ -91,45 +89,43 @@ @@ -91,45 +89,43 @@
91 type="search" placeholder="{% trans 'Search...' %}" /> 89 type="search" placeholder="{% trans 'Search...' %}" />
92 </div> 90 </div>
93 <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button> 91 <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button>
94 - </form>  
95 - </div> 92 + </form>
  93 + </div>
96 </div> 94 </div>
97 </div> 95 </div>
98 </div> 96 </div>
99 </div><!-- end of first-nav --> 97 </div><!-- end of first-nav -->
100 <div id="second-nav"> 98 <div id="second-nav">
101 <div class="container"> 99 <div class="container">
102 - <div class="row">  
103 - <ul id="quick-links-sm" class="hidden-md hidden-lg">  
104 - <li id="link-faq">  
105 - <a href="/social/spb/ajuda">FAQ</a>  
106 - </li>  
107 - <li id="link-contact">  
108 - <a href="/social/spb/contato">Contato</a>  
109 - </li>  
110 - </ul>  
111 - <div class="navbar-header logo">  
112 - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">  
113 - <span class="icon-bar"></span>  
114 - <span class="icon-bar"></span>  
115 - <span class="icon-bar"></span>  
116 - </button>  
117 - </div>  
118 - <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">  
119 - <li>  
120 - <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>  
121 - </li>  
122 - {% proxy_menu %}  
123 - </ul>  
124 - <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">  
125 - <li id="link-faq">  
126 - <a href="/social/spb/ajuda">Perguntas Frequentes</a>  
127 - </li>  
128 - <li id="link-contact">  
129 - <a href="/social/spb/contato">Contato</a>  
130 - </li>  
131 - </ul> 100 + <ul id="quick-links-sm" class="hidden-md hidden-lg">
  101 + <li id="link-faq">
  102 + <a href="/social/spb/ajuda">FAQ</a>
  103 + </li>
  104 + <li id="link-contact">
  105 + <a href="/social/spb/contato">Contato</a>
  106 + </li>
  107 + </ul>
  108 + <div class="navbar-header logo">
  109 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
  110 + <span class="icon-bar"></span>
  111 + <span class="icon-bar"></span>
  112 + <span class="icon-bar"></span>
  113 + </button>
132 </div> 114 </div>
  115 + <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
  116 + <li>
  117 + <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
  118 + </li>
  119 + {% proxy_menu %}
  120 + </ul>
  121 + <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
  122 + <li id="link-faq">
  123 + <a href="/social/spb/ajuda">Perguntas Frequentes</a>
  124 + </li>
  125 + <li id="link-contact">
  126 + <a href="/social/spb/contato">Contato</a>
  127 + </li>
  128 + </ul>
133 </div> 129 </div>
134 </div> 130 </div>
135 </div> 131 </div>