Download as
Browse Code »

Commit d6ea8765782c80500bd1c7010244fe9b3f589feb

Authored by Victor Costa
2 parents 9ae229e6 e215f0c1
Exists in master and in 35 other branches activities_block, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, coverage, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, helpers-evolution, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile-view, profile_description_block_component, profile_page_improvements, profile_search, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Merge branch 'ngforward' of softwarepublico.gov.br:noosfero-themes/angular-theme into ngforward

Showing 3 changed files with 9 additions and 7 deletions   Show diff stats
gulp/server.js
  Diff comments   View file @d6ea876
... ... @@ -36,6 +36,7 @@ function browserSyncInit(baseDir, browser) {
36 36 browserSync.instance = browserSync.init({
37 37 startPath: '/',
38 38 server: server,
  39 + port: 3001,
39 40 browser: browser
40 41 });
41 42 }
... ...
karma.conf.js
  Diff comments   View file @d6ea876
... ... @@ -110,8 +110,10 @@ module.exports = function (config) {
110 110 ],
111 111  
112 112 coverageReporter: {
113   - type: 'html',
114   - dir: 'coverage/'
  113 + reporters:[
  114 + {type: 'html', dir:'coverage/'},
  115 + {type: 'text-summary'}
  116 + ]
115 117 },
116 118  
117 119 reporters: ['spec', "coverage"],
... ... @@ -126,8 +128,7 @@ module.exports = function (config) {
126 128 // It was not possible to do it there because karma doesn't let us now if we are
127 129 // running a single test or not
128 130 configuration.preprocessors = {
129   - 'src/**/*.js': ['sourcemap'],
130   - 'src/**/*.ts': ['sourcemap']
  131 + 'src/noosfero.js': ['sourcemap', 'coverage']
131 132 };
132 133 // 'src/**/*.js': ['sourcemap'],
133 134 // 'src/**/*.[sS]pec.ts': ['sourcemap']
... ...
src/app/components/navbar/navbar.html
  Diff comments   View file @d6ea876
1 1 <nav class="navbar navbar-static-top navbar-inverse">
2 2 <div class="container-fluid">
3 3 <div class="navbar-header">
4   - <button type="button" class="navbar-toggle collapsed" (ng-click)="isCollapsed = !isCollapsed">
  4 + <button type="button" class="navbar-toggle collapsed" ng-click="isCollapsed = !isCollapsed">
5 5 <span class="sr-only">Toggle navigation</span>
6 6 <span class="icon-bar"></span>
7 7 <span class="icon-bar"></span>
... ... @@ -18,7 +18,7 @@
18 18  
19 19 <ul class="nav navbar-nav navbar-right">
20 20 <li ng-show="!ctrl.currentUser">
21   - <a ng-href="#" (ng-click)="ctrl.openLogin()">Login</a>
  21 + <a ng-href="#" ng-click="ctrl.openLogin()">Login</a>
22 22 </li>
23 23  
24 24 <li class="dropdown profile-menu" ng-show="ctrl.currentUser" dropdown>
... ... @@ -35,7 +35,7 @@
35 35 </li>
36 36 <li class="divider"></li>
37 37 <li>
38   - <a href="#" (ng-click)="ctrl.logout()"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
  38 + <a href="#" ng-click="ctrl.logout()"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
39 39 </li>
40 40 </ul>
41 41 </li>
... ...