Merge branch 'release/version_1'

hakanersu · May 21, 2014 · 8e47448 · 8e47448
2 parents f717919 + 64a4e21
commit 8e47448
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 97 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,9 @@ lcov.info
 *.out
 *.pid
 *.gz
-
+index.html
+index.htm
+main.js
 pids
 logs
 results

diff --git a/README.md b/README.md
@@ -1,4 +1,9 @@
 [Demo & Documentation](http://hakanersu.github.io/AmaranJS/)
+
+### Important Change v0.2.0
+* "default" theme changed to "awesome"
+* Old default theme changed to "default" theme aka http://codepen.io/hakanersu/pen/Dxatp
+
 ### TODO
 * Default theme will change to http://codepen.io/hakanersu/pen/Dxatp
 * Callback functions will added to themes.

diff --git a/amaranjs.jquery.json b/amaranjs.jquery.json
@@ -9,7 +9,7 @@
         "jquery",
         "plugin"
     ],
-    "version": "0.1.7",
+    "version": "0.2.0",
     "author": {
         "name": "Hakan ERSU",
         "url": "http://blog.hakanersu.com/"

diff --git a/package.json b/package.json
@@ -4,5 +4,5 @@
   "description": "Stylish Notifications",
   "author": "Hakan ERSU",
   "homepage": "http://hakanersu.github.io/AmaranJS/",
-  "version": "0.1.7"
+  "version": "0.2.0"
 }
diff --git a/src/css/theme/awesome.css b/src/css/theme/awesome.css
@@ -0,0 +1,101 @@
+.amaran.awesome{
+	width:300px;
+	min-height: 65px;
+	background: #f3f3f3;
+	color:#222;
+	margin:15px;
+	padding-left:70px;
+	padding-right:5px;
+	padding-top:5px;
+	padding-bottom:5px;
+	font-family:'Open Sans',Helvetica,Arial;
+	font-size:16px;
+	font-weight:600;
+	box-shadow:1px 1px 1px #000;
+}
+.amaran.awesome .icon{
+	width:50px;
+	height:50px;
+	position: absolute;
+	top:50%;
+	left:10px;
+	background: #000;
+	margin-top:-25px;
+	border-radius: 50%;
+	text-align: center;
+	line-height: 50px; 
+	font-size:22px;
+}
+
+.amaran.awesome p {
+	padding:0;margin:0;
+}
+.amaran.awesome p.bold {}
+.amaran.awesome p span{
+	font-weight: 300;
+
+}
+.amaran.awesome p span.light {
+	font-size:13px;
+	display: block;
+	color:#777;
+}
+.amaran.awesome.error{}
+.amaran.awesome.warning{}
+
+/* OK*/
+.amaran.awesome.ok p.bold{
+	color:#178B13;
+}
+.amaran.awesome.ok .icon {
+	background-color:#178B13;
+	color:#fff;
+}
+/* ERROR */
+.amaran.awesome.error p.bold{
+	color:#D82222;
+}
+.amaran.awesome.error .icon {
+	background-color:#D82222;
+	color:#fff;
+}
+/* WARNING */
+.amaran.awesome.warning p.bold{
+	color:#9F6000;
+}
+.amaran.awesome.warning .icon {
+	background-color:#9F6000;
+	color:#fff;
+}
+/* YELLOW */
+.amaran.awesome.yellow p.bold{
+	color:#CFA846;
+}
+.amaran.awesome.yellow .icon {
+	background-color:#CFA846;
+	color:#fff;
+}
+/* BLUE */
+.amaran.awesome.blue p.bold{
+	color:#2980b9;
+}
+.amaran.awesome.blue .icon {
+	background-color:#2980b9;
+	color:#fff;
+}
+/* GREEN */
+.amaran.awesome.green p.bold{
+	color:#27ae60;
+}
+.amaran.awesome.green .icon {
+	background-color:#27ae60;
+	color:#fff;
+}
+/* PURPLE */
+.amaran.awesome.purple p.bold{
+	color:#5B54AA;
+}
+.amaran.awesome.purple .icon {
+	background-color:#5B54AA;
+	color:#fff;
+}
diff --git a/src/css/theme/default.css b/src/css/theme/default.css
@@ -1,101 +1,47 @@
 .amaran.default{
-	width:300px;
-	min-height: 65px;
-	background: #f3f3f3;
-	color:#222;
-	margin:15px;
-	padding-left:70px;
-	padding-right:5px;
-	padding-top:5px;
-	padding-bottom:5px;
-	font-family:'Open Sans',Helvetica,Arial;
-	font-size:16px;
-	font-weight:600;
-	box-shadow:1px 1px 1px #000;
-}
-.amaran.default .icon{
-	width:50px;
-	height:50px;
-	position: absolute;
-	top:50%;
-	left:10px;
-	background: #000;
-	margin-top:-25px;
-	border-radius: 50%;
-	text-align: center;
-	line-height: 50px; 
-	font-size:22px;
-}
+    width:300px;
+    min-height: 45px;
+    background:#1B1E24;
+    background: -webkit-linear-gradient(left, #111213, #111213 15%, #1B1E24 15%, #1B1E24);
+    background: -moz-linear-gradient(left, #111213, #111213 15%, #1B1E24 15%, #1B1E24);
+    background: -o-linear-gradient(left, #111213, #111213 15%, #1B1E24 15%, #1B1E24);
+    background: -ms-linear-gradient(left, #111213, #111213 15%, #1B1E24 15%, #1B1E24);
+    background: linear-gradient(left, #111213, #111213 15%, #1B1E24 15%, #1B1E24);
+    color:#fff;
+    font-family:'Open Sans',Helvetica,Arial;
+    font-size:13px;
+    font-weight:300;
+    margin:0 5px 5px 5px;
+    border-radius:0;
+    overflow:hidden;
+    border-bottom:1px solid #111213;
+    border-radius: 6px;
 
-.amaran.default p {
-	padding:0;margin:0;
 }
-.amaran.default p.bold {}
-.amaran.default p span{
-	font-weight: 300;
+.amaran.default .default-spinner {
+    width:45px;min-height:45px;display:block;float:left;position:relative;
 
 }
-.amaran.default p span.light {
-	font-size:13px;
-	display: block;
-	color:#777;
-}
-.amaran.default.error{}
-.amaran.default.warning{}
+.amaran.default .default-spinner span{
+    width:18px;
+    height:18px;
+    background:#27ae60;
+    display:block;
+    border-radius:50%;
+    position:absolute;
+    top:50%;
+    left:50%;
+    margin-left:-11px;
+    margin-top:-9px;
+}
+.amaran.default .default-message {
+    float:left;
 
-/* OK*/
-.amaran.default.ok p.bold{
-	color:#178B13;
-}
-.amaran.default.ok .icon {
-	background-color:#178B13;
-	color:#fff;
-}
-/* ERROR */
-.amaran.default.error p.bold{
-	color:#D82222;
-}
-.amaran.default.error .icon {
-	background-color:#D82222;
-	color:#fff;
-}
-/* WARNING */
-.amaran.default.warning p.bold{
-	color:#9F6000;
-}
-.amaran.default.warning .icon {
-	background-color:#9F6000;
-	color:#fff;
-}
-/* YELLOW */
-.amaran.default.yellow p.bold{
-	color:#CFA846;
-}
-.amaran.default.yellow .icon {
-	background-color:#CFA846;
-	color:#fff;
-}
-/* BLUE */
-.amaran.default.blue p.bold{
-	color:#2980b9;
-}
-.amaran.default.blue .icon {
-	background-color:#2980b9;
-	color:#fff;
-}
-/* GREEN */
-.amaran.default.green p.bold{
-	color:#27ae60;
-}
-.amaran.default.green .icon {
-	background-color:#27ae60;
-	color:#fff;
 }
-/* PURPLE */
-.amaran.default.purple p.bold{
-	color:#5B54AA;
+.amaran.default .default-message span {
+    padding:3px;
+    line-height:43px;
 }
-.amaran.default.purple .icon {
-	background-color:#5B54AA;
-	color:#fff;
+.amaran.default .default-message:after {
+    clear:both;
 }
diff --git a/src/js/jquery.amaran.js b/src/js/jquery.amaran.js
@@ -7,7 +7,7 @@
 			sticky:false,
 			inEffect:'fadeIn',
 			outEffect:'fadeOut',
-			theme:false,
+			theme:'default',
 			themeTemplate:null,
 			closeOnClick:true,
 			closeButton:false,
@@ -164,7 +164,12 @@
 		}	
 	};	
 	var themes={
-		defaultTheme:function(data){
+        defaultTheme:function(data){
+            var color = '';
+            if (typeof(data.color) !== 'undefined'){ color = data.color;}
+            return "<div class='default-spinner'><span style='background-color:"+data.color+"'></span></div><div class='default-message'><span>"+data.message+"</span></div>";
+        },
+		awesomeTheme:function(data){
 			return '<i class="icon '+data.icon+' icon-large"></i><p class="bold">'+data.message+'</p><p><span>'+data.size+'</span><span class="light">'+data.file+'</span></p>';
 		},
 		userTheme:function(data){