Skip to content

Commit

Permalink
Better colors for Relax theme
Browse files Browse the repository at this point in the history
  • Loading branch information
@needim
needim committed Nov 20, 2014
1 parent fc67dfb commit de923b7
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 38 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "noty",
"version" : "2.3.0",
"version" : "2.3.1",
"main" : "js/noty/packaged/jquery.noty.packaged.js",
"authors" : [
"Nedim Arabacı"
Expand Down
2 changes: 1 addition & 1 deletion demo/usingWithAnimate.css.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
function generateAll() {
generate('warning', notification_html[0]);
generate('error', notification_html[1]);
generate('alert', notification_html[2]);
generate('information', notification_html[2]);
generate('success', notification_html[3]);
// generate('notification');
// generate('success');
Expand Down
2 changes: 1 addition & 1 deletion js/noty/jquery.noty.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
@package noty - jQuery Notification Plugin
@version version: 2.3.0
@version version: 2.3.1
@contributors https://github.com/needim/noty/graphs/contributors
@documentation Examples and Documentation - http://needim.github.com/noty/
Expand Down
33 changes: 12 additions & 21 deletions js/noty/packaged/jquery.noty.packaged.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
!function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery'], factory);
} else {
factory(root.jQuery);
} }(this, function($) {

/*!
@package noty - jQuery Notification Plugin
@version version: 2.3.0
Expand Down Expand Up @@ -1278,8 +1271,7 @@ $.noty.themes.defaultTheme = {

$.noty.themes.relax = {
name : 'relax',
helpers : {
},
helpers : {},
modal : {
css: {
position : 'fixed',
Expand All @@ -1296,8 +1288,8 @@ $.noty.themes.relax = {
style : function() {

this.$bar.css({
overflow : 'hidden',
margin : '4px 0',
overflow : 'hidden',
margin : '4px 0',
borderRadius: '2px'
});

Expand Down Expand Up @@ -1349,6 +1341,7 @@ $.noty.themes.relax = {
borderBottom: '2px solid #eee',
borderLeft : '2px solid #eee',
borderRight : '2px solid #eee',
borderTop : '2px solid #eee',
boxShadow : "0 2px 4px rgba(0, 0, 0, 0.1)"
});
break;
Expand All @@ -1357,8 +1350,8 @@ $.noty.themes.relax = {
case 'bottomCenter':
case 'inline':
this.$bar.css({
border : '1px solid #eee',
boxShadow : "0 2px 4px rgba(0, 0, 0, 0.1)"
border : '1px solid #eee',
boxShadow: "0 2px 4px rgba(0, 0, 0, 0.1)"
});
this.$message.css({fontSize: '13px', textAlign: 'center'});
break;
Expand All @@ -1369,8 +1362,8 @@ $.noty.themes.relax = {
case 'centerLeft':
case 'centerRight':
this.$bar.css({
border : '1px solid #eee',
boxShadow : "0 2px 4px rgba(0, 0, 0, 0.1)"
border : '1px solid #eee',
boxShadow: "0 2px 4px rgba(0, 0, 0, 0.1)"
});
this.$message.css({fontSize: '13px', textAlign: 'left'});
break;
Expand All @@ -1379,6 +1372,7 @@ $.noty.themes.relax = {
borderTop : '2px solid #eee',
borderLeft : '2px solid #eee',
borderRight : '2px solid #eee',
borderBottom: '2px solid #eee',
boxShadow : "0 -2px 4px rgba(0, 0, 0, 0.1)"
});
break;
Expand All @@ -1400,16 +1394,16 @@ $.noty.themes.relax = {
this.$buttons.css({borderTop: '1px solid #FFC237'});
break;
case 'error':
this.$bar.css({backgroundColor: 'rgba(255, 1, 1, .5)', borderColor: 'rgba(139, 0, 0, .2)', color: '#FFF'});
this.$bar.css({backgroundColor: '#FF8181', borderColor: '#e25353', color: '#FFF'});
this.$message.css({fontWeight: 'bold'});
this.$buttons.css({borderTop: '1px solid darkred'});
break;
case 'information':
this.$bar.css({backgroundColor: 'rgba(87, 183, 226, .8)', borderColor: 'rgba(11, 144, 196, .3)', color: '#FFF'});
this.$bar.css({backgroundColor: '#78C5E7', borderColor: '#3badd6', color: '#FFF'});
this.$buttons.css({borderTop: '1px solid #0B90C4'});
break;
case 'success':
this.$bar.css({backgroundColor: 'rgba(144, 238, 144, .6)', borderColor: 'rgba(80, 194, 78, .3)', color: 'darkgreen'});
this.$bar.css({backgroundColor: '#BCF5BC', borderColor: '#7cdd77', color: 'darkgreen'});
this.$buttons.css({borderTop: '1px solid #50C24E'});
break;
default:
Expand All @@ -1426,6 +1420,3 @@ $.noty.themes.relax = {
}
}
};


});
2 changes: 1 addition & 1 deletion js/noty/packaged/jquery.noty.packaged.min.js
View file

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions js/noty/themes/relax.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$.noty.themes.relax = {
name : 'relax',
helpers : {
},
helpers : {},
modal : {
css: {
position : 'fixed',
Expand All @@ -18,8 +17,8 @@ $.noty.themes.relax = {
style : function() {

this.$bar.css({
overflow : 'hidden',
margin : '4px 0',
overflow : 'hidden',
margin : '4px 0',
borderRadius: '2px'
});

Expand Down Expand Up @@ -71,6 +70,7 @@ $.noty.themes.relax = {
borderBottom: '2px solid #eee',
borderLeft : '2px solid #eee',
borderRight : '2px solid #eee',
borderTop : '2px solid #eee',
boxShadow : "0 2px 4px rgba(0, 0, 0, 0.1)"
});
break;
Expand All @@ -79,8 +79,8 @@ $.noty.themes.relax = {
case 'bottomCenter':
case 'inline':
this.$bar.css({
border : '1px solid #eee',
boxShadow : "0 2px 4px rgba(0, 0, 0, 0.1)"
border : '1px solid #eee',
boxShadow: "0 2px 4px rgba(0, 0, 0, 0.1)"
});
this.$message.css({fontSize: '13px', textAlign: 'center'});
break;
Expand All @@ -91,8 +91,8 @@ $.noty.themes.relax = {
case 'centerLeft':
case 'centerRight':
this.$bar.css({
border : '1px solid #eee',
boxShadow : "0 2px 4px rgba(0, 0, 0, 0.1)"
border : '1px solid #eee',
boxShadow: "0 2px 4px rgba(0, 0, 0, 0.1)"
});
this.$message.css({fontSize: '13px', textAlign: 'left'});
break;
Expand All @@ -101,6 +101,7 @@ $.noty.themes.relax = {
borderTop : '2px solid #eee',
borderLeft : '2px solid #eee',
borderRight : '2px solid #eee',
borderBottom: '2px solid #eee',
boxShadow : "0 -2px 4px rgba(0, 0, 0, 0.1)"
});
break;
Expand All @@ -122,16 +123,16 @@ $.noty.themes.relax = {
this.$buttons.css({borderTop: '1px solid #FFC237'});
break;
case 'error':
this.$bar.css({backgroundColor: 'rgba(255, 1, 1, .5)', borderColor: 'rgba(139, 0, 0, .2)', color: '#FFF'});
this.$bar.css({backgroundColor: '#FF8181', borderColor: '#e25353', color: '#FFF'});
this.$message.css({fontWeight: 'bold'});
this.$buttons.css({borderTop: '1px solid darkred'});
break;
case 'information':
this.$bar.css({backgroundColor: 'rgba(87, 183, 226, .8)', borderColor: 'rgba(11, 144, 196, .3)', color: '#FFF'});
this.$bar.css({backgroundColor: '#78C5E7', borderColor: '#3badd6', color: '#FFF'});
this.$buttons.css({borderTop: '1px solid #0B90C4'});
break;
case 'success':
this.$bar.css({backgroundColor: 'rgba(144, 238, 144, .6)', borderColor: 'rgba(80, 194, 78, .3)', color: 'darkgreen'});
this.$bar.css({backgroundColor: '#BCF5BC', borderColor: '#7cdd77', color: 'darkgreen'});
this.$buttons.css({borderTop: '1px solid #50C24E'});
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion noty.jquery.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "noty",
"version" : "2.3.0",
"version" : "2.3.1",
"title" : "noty - a jquery notification plugin",
"description" : "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
"keywords" : ["noty", "notification", "plugin", "jquery", "javascript", "alert", "error", "warning", "information", "confirmation"],
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "noty",
"version": "2.3.0",
"version": "2.3.1",
"title": "noty - a jquery notification plugin",
"description": "noty is a jQuery plugin that makes it easy to create alert - success - error - warning - information - confirmation messages as an alternative the standard alert dialog. Each notification is added to a queue. (Optional)",
"homepage": "http://needim.github.com/noty",
Expand Down

0 comments on commit de923b7

Please sign in to comment.