Download as
Browse Code »

Commit 2f6862509f4f180879291c80127be5c20ff04c63

Authored by Victor Costa
1 parent 60f9d0ed
Exists in master and in 1 other branch dev-fixes

Set bootstrap theme

Showing 4 changed files with 20 additions and 10 deletions   Show diff stats
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 "angular-aria": "~1.4.2", 10 "angular-aria": "~1.4.2",
11 "restangular": "~1.5.1", 11 "restangular": "~1.5.1",
12 "angular-ui-router": "~0.2.15", 12 "angular-ui-router": "~0.2.15",
13 - "bootstrap-sass": "~3.3.5", 13 + "bootstrap-sass": "~3.3.6",
14 "angular-bootstrap": "~0.13.4", 14 "angular-bootstrap": "~0.13.4",
15 "malarkey": "yuanqing/malarkey#~1.3.1", 15 "malarkey": "yuanqing/malarkey#~1.3.1",
16 "angular-toastr": "~1.5.0", 16 "angular-toastr": "~1.5.0",
@@ -18,7 +18,8 @@ @@ -18,7 +18,8 @@
18 "animate.css": "~3.4.0", 18 "animate.css": "~3.4.0",
19 "angular": "~1.4.2", 19 "angular": "~1.4.2",
20 "font-awesome": "fontawesome#~4.5.0", 20 "font-awesome": "fontawesome#~4.5.0",
21 - "ngstorage": "~0.3.10" 21 + "ngstorage": "~0.3.10",
  22 + "bootswatch": "~3.3.6+1"
22 }, 23 },
23 "devDependencies": { 24 "devDependencies": {
24 "angular-mocks": "~1.4.2" 25 "angular-mocks": "~1.4.2"
src/app/components/navbar/navbar.html
  Diff comments   View file @2f68625
1 <nav class="navbar navbar-static-top navbar-inverse"> 1 <nav class="navbar navbar-static-top navbar-inverse">
2 <div class="container-fluid"> 2 <div class="container-fluid">
3 <div class="navbar-header"> 3 <div class="navbar-header">
  4 + <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
  5 + <span class="sr-only">Toggle navigation</span>
  6 + <span class="icon-bar"></span>
  7 + <span class="icon-bar"></span>
  8 + <span class="icon-bar"></span>
  9 + </button>
4 <a class="navbar-brand" ng-href="/"> 10 <a class="navbar-brand" ng-href="/">
5 <span class="noosfero-logo"><img src="assets/images/logo-noosfero.png"></span> Noosfero 11 <span class="noosfero-logo"><img src="assets/images/logo-noosfero.png"></span> Noosfero
6 </a> 12 </a>
7 </div> 13 </div>
8 14
9 - <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-6"> 15 + <div class="collapse navbar-collapse" id="navbar-collapse">
10 <ul class="nav navbar-nav"> 16 <ul class="nav navbar-nav">
11 <li class="active"><a ng-href="#">Home</a></li> 17 <li class="active"><a ng-href="#">Home</a></li>
12 </ul> 18 </ul>
src/app/components/noosfero-blocks/block.scss
  Diff comments   View file @2f68625
1 .block { 1 .block {
2 .panel-title { 2 .panel-title {
3 - font-size: 14px; 3 + font-size: 15px;
4 font-weight: bold; 4 font-weight: bold;
5 - color: rgb(30, 57, 72);  
6 } 5 }
7 .panel-heading { 6 .panel-heading {
8 background-color: transparent; 7 background-color: transparent;
src/app/index.scss
  Diff comments   View file @2f68625
@@ -2,12 +2,18 @@ @@ -2,12 +2,18 @@
2 * If you want to override some bootstrap variables, you have to change values here. 2 * If you want to override some bootstrap variables, you have to change values here.
3 * The list of variables are listed here bower_components/bootstrap-sass/assets/stylesheets/bootstrap/_variables.scss 3 * The list of variables are listed here bower_components/bootstrap-sass/assets/stylesheets/bootstrap/_variables.scss
4 */ 4 */
5 -$navbar-inverse-link-color: #5AADBB;  
6 $icon-font-path: "../../bower_components/bootstrap-sass/assets/fonts/bootstrap/"; 5 $icon-font-path: "../../bower_components/bootstrap-sass/assets/fonts/bootstrap/";
7 6
8 $fa-font-path: "../../bower_components/font-awesome/fonts"; 7 $fa-font-path: "../../bower_components/font-awesome/fonts";
9 @import "../../bower_components/font-awesome/scss/font-awesome.scss"; 8 @import "../../bower_components/font-awesome/scss/font-awesome.scss";
10 9
  10 +$navbar-height: 50px;
  11 +$brand-success: #039BE5;
  12 +$link-color: #007EBB;
  13 +$body-bg: #f5f8fa;
  14 +$page-header-border-color: #eee;
  15 +@import "../../bower_components/bootswatch/flatly/_variables.scss";
  16 +
11 /** 17 /**
12 * Do not remove the comments below. It's the markers used by wiredep to inject 18 * Do not remove the comments below. It's the markers used by wiredep to inject
13 * sass dependencies when defined in the bower.json of your dependencies 19 * sass dependencies when defined in the bower.json of your dependencies
@@ -35,13 +41,11 @@ $fa-font-path: &quot;../../bower_components/font-awesome/fonts&quot;; @@ -35,13 +41,11 @@ $fa-font-path: &quot;../../bower_components/font-awesome/fonts&quot;;
35 width: 20.83%; 41 width: 20.83%;
36 } 42 }
37 43
38 -body {  
39 - background-color: #f5f8fa;  
40 -}  
41 -  
42 /** 44 /**
43 * Do not remove the comments below. It's the markers used by gulp-inject to inject 45 * Do not remove the comments below. It's the markers used by gulp-inject to inject
44 * all your sass files automatically 46 * all your sass files automatically
45 */ 47 */
46 // injector 48 // injector
47 // endinjector 49 // endinjector
  50 +
  51 +@import "../../bower_components/bootswatch/flatly/_bootswatch.scss";