Merge branch 'develop' of github.com:modularcode/modular-admin-html into develop

AramManukyan · AramManukyan · commit 031f25475017 · 2016-01-12T01:34:27.000+04:00
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 .deploy
 node_modules
 bower_components
+bin
 
 *~
 *#
diff --git a/README.md b/README.md
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
-  "name": "modularus",
-  "version": "0.0.1",
+  "name": "modular-admin-html",
+  "version": "1.0.0-beta",
   "devDependencies": {},
   "dependencies": {
     "animate.css": "~3.4.0",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "modular-admin-html",
-  "version": "0.0.3",
+  "version": "1.0.0-beta",
   "description": "ModularAdmin: Free Dashboard Theme; html version",
   "repository": {
     "type": "git",
diff --git a/src/_themes/green-theme.scss b/src/_themes/green-theme.scss
@@ -1,4 +1,5 @@
-$color-primary: #4bcf99;
+$color-primary: #85CE36;
+$dashboard-stat-icon-color: #BDBDBD;
 
 // $link-color: darken($color-primary, 5%);
 $link-color: #969696;
diff --git a/src/_themes/seagreen-theme.scss b/src/_themes/seagreen-theme.scss
@@ -0,0 +1,9 @@
+$color-primary: #4bcf99;
+
+// $link-color: darken($color-primary, 5%);
+$link-color: #969696;
+$link-transition: initial;
+$link-decoration: underline;
+
+$link-hover-color: darken($color-primary, 8%);
+$link-hover-decoration: underline;
diff --git a/src/_variables.scss b/src/_variables.scss
@@ -92,7 +92,7 @@ $item-list-color-border: lighten($color-divider, 6%) !default;
 
 // Charts
 $chart-color-primary: $color-primary !default;
-$chart-color-secondary: lighten($color-primary, 10%) !default;
+$chart-color-secondary: lighten($chart-color-primary, 10%) !default;
 
 
 
diff --git a/src/app/_common/sidebar/customize/customize.hbs b/src/app/_common/sidebar/customize/customize.hbs
@@ -77,6 +77,9 @@
 							<li>
 								<span class="color-item color-green" data-theme="green"></span>
 							</li>
+							<li>
+								<span class="color-item color-seagreen" data-theme="seagreen"></span>
+							</li>
 							<li>
 								<span class="color-item color-blue active" data-theme=""></span>
 							</li>
diff --git a/src/app/_common/sidebar/customize/customize.scss b/src/app/_common/sidebar/customize/customize.scss
@@ -91,8 +91,8 @@
 
 				li {
 					display: inline-block;
-					margin-left: 8px;
-					margin-right: 8px;
+					margin-left: 5px;
+					margin-right: 5px;
 
 					.color-item {
 						display: block;
@@ -112,6 +112,11 @@
 						}
 
 						&.color-green {
+							background-color: #8CDE33;
+							border-color: #8CDE33;
+						}
+
+						&.color-seagreen {
 							background-color: #4bcf99;
 							border-color: #4bcf99;
 						}
diff --git a/src/app/_common/sidebar/header/header.hbs b/src/app/_common/sidebar/header/header.hbs
@@ -1,6 +1,6 @@
 <div class="sidebar-header">
 	<div class="brand">
 		{{> _common/logo/logo}}
-		{{themeTitle}}
+		Modular Admin
 	</div>
 </div>
diff --git a/src/app/dashboard/index-page.hbs b/src/app/dashboard/index-page.hbs
@@ -41,8 +41,6 @@ items:
 tasks:
   - title: Meeting with embassador
     done: true
-  - title: Cheating with neighbours wifey
-    done: true
   - title: Confession
     done: true
   - title: Time to start building an ark
@@ -57,13 +55,15 @@ tasks:
     done: false
   - title: Meeting with embassador
     done: true
-  - title: Cheating with neighbours wifey
-    done: true
   - title: Confession
     done: true
   - title: Time to start building an ark
     done: false
   - title: Beer time with dudes
+    done: false  
+  - title: Meeting new girls
+    done: true
+  - title: Remember damned home address
     done: false 
 ---
 <section class="section">

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "name": "modularus",`
`3`		`- "version": "0.0.1",`
	`2`	`+ "name": "modular-admin-html",`
	`3`	`+ "version": "1.0.0-beta",`
`4`	`4`	`"devDependencies": {},`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"animate.css": "~3.4.0",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "modular-admin-html",`
`3`		`- "version": "0.0.3",`
	`3`	`+ "version": "1.0.0-beta",`
`4`	`4`	`"description": "ModularAdmin: Free Dashboard Theme; html version",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`