Skip to content

Commit e504932

Browse files
JLiscomJLiscom
committed
Fade in and simplicity theme-
1 parent e0fe4fa commit e504932

File tree

12 files changed

+821
-22
lines changed

12 files changed

+821
-22
lines changed

‎Gruntfile.js‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ module.exports = function(grunt) {
1414
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
1515
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
1616
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
17-
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
17+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
18+
19+
"OpenNote/openNote/style/simplicity/dark/style.css": "OpenNote/openNote/style/simplicity/style.less",
20+
"OpenNote/openNote/style/simplicity/dark/note.css": "OpenNote/openNote/style/simplicity/note.less",
21+
"OpenNote/openNote/style/simplicity/dark/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
22+
"OpenNote/openNote/style/simplicity/dark/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
1823

1924
}
2025
},
@@ -29,7 +34,12 @@ module.exports = function(grunt) {
2934
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
3035
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
3136
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
32-
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
37+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
38+
39+
"OpenNote/openNote/style/simplicity/light/style.css": "OpenNote/openNote/style/simplicity/style.less",
40+
"OpenNote/openNote/style/simplicity/light/note.css": "OpenNote/openNote/style/simplicity/note.less",
41+
"OpenNote/openNote/style/simplicity/light/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
42+
"OpenNote/openNote/style/simplicity/light/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
3343
}
3444
},
3545
prodDark: {
@@ -44,7 +54,13 @@ module.exports = function(grunt) {
4454
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
4555
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
4656
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
47-
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
57+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
58+
59+
"OpenNote/openNote/style/simplicity/dark/style.css": "OpenNote/openNote/style/simplicity/style.less",
60+
"OpenNote/openNote/style/simplicity/dark/note.css": "OpenNote/openNote/style/simplicity/note.less",
61+
"OpenNote/openNote/style/simplicity/dark/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
62+
"OpenNote/openNote/style/simplicity/dark/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
63+
4864
}
4965
},
5066
prodLight: {
@@ -59,7 +75,12 @@ module.exports = function(grunt) {
5975
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
6076
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
6177
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
62-
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
78+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less",
79+
80+
"OpenNote/openNote/style/simplicity/light/style.css": "OpenNote/openNote/style/simplicity/style.less",
81+
"OpenNote/openNote/style/simplicity/light/note.css": "OpenNote/openNote/style/simplicity/note.less",
82+
"OpenNote/openNote/style/simplicity/light/alertify.css": "OpenNote/openNote/style/simplicity/alertify.less",
83+
"OpenNote/openNote/style/simplicity/light/intojs.css": "OpenNote/openNote/style/simplicity/introjs.less"
6384
}
6485
}
6586
},

‎OpenNote/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<link rel="stylesheet" href="bower_components/alertify/themes/alertify.core.css">
2020

2121
<!-- Theme -->
22-
<link rel="stylesheet" type="text/css" href="openNote/style/invert/light/intojs.css">
23-
<link rel="stylesheet" type="text/css" href="openNote/style/invert/light/alertify.css">
24-
<link rel="stylesheet" type="text/css" href="openNote/style/invert/light/style.css">
22+
<link rel="stylesheet" type="text/css" href="openNote/style/simplicity/dark/intojs.css">
23+
<link rel="stylesheet" type="text/css" href="openNote/style/simplicity/dark/alertify.css">
24+
<link rel="stylesheet" type="text/css" href="openNote/style/simplicity/dark/style.css">
2525

2626
<link rel="stylesheet" type="text/css" href="openNote/style/animations.css">
2727

@@ -69,7 +69,7 @@
6969
<body>
7070
<div id="menu" class="ng-hide fadeIn" ng-show="showMenu" ng-include="'openNote/partials/navBarPartial.html'"></div>
7171

72-
<div class="col-lg-2 col-md-3 col-sm-4" ng-include="'openNote/partials/listPartial.html'"></div>
72+
<div class="col-lg-2 col-md-3 col-sm-4 hidden-xs" ng-include="'openNote/partials/listPartial.html'"></div>
7373

7474
<div class="col-lg-10 col-md-9 col-sm-8" ng-view data-intro="{{helpContent.viewArea}}"> </div>
7575
</body>

‎OpenNote/openNote/controllers/folderController.js‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ openNote.controller("folderController", function( $scope,
1515
$rootScope.buttons.push({
1616
text: "New note",
1717
action: function(){
18-
$scope.fadeOutFolders(function(){
18+
$scope.fadeOutFoldersAndNotes(function(){
1919
$location.url("/note/").search("folderID",$scope.currentFolder.id);
2020
});
2121
},
@@ -81,13 +81,24 @@ openNote.controller("folderController", function( $scope,
8181
/**
8282
* fade out all folders
8383
*/
84-
$scope.fadeOutFolders = function(callback){
85-
if($scope.currentFolder.foldersInside !=null && $scope.currentFolder.foldersInside.length>0)
86-
$(".folder").fadeOut(config.fadeSpeedShort(),function(){
84+
$scope.fadeOutFoldersAndNotes = function(callback){
85+
if( ( $scope.currentFolder.foldersInside !=null
86+
&& $scope.currentFolder.foldersInside.length>0)
87+
|| ( $scope.currentFolder.notesInside !=null
88+
&& $scope.currentFolder.notesInside.length>0)){
89+
90+
$(".note").fadeTo(config.fadeSpeedShort(),0,function(){
91+
$scope.$apply(function(){
92+
callback();
93+
});
94+
});
95+
96+
$(".folder").fadeTo(config.fadeSpeedShort(),0,function(){
8797
$scope.$apply(function(){
8898
callback();
8999
});
90100
});
101+
}
91102
else
92103
callback();
93104
};
@@ -97,7 +108,7 @@ openNote.controller("folderController", function( $scope,
97108
* @param folder- the folder to load
98109
*/
99110
$scope.loadFolder = function(folder){
100-
$scope.fadeOutFolders(function(){
111+
$scope.fadeOutFoldersAndNotes(function(){
101112
$location.url("/folder/"+folder.id);
102113
});
103114
};
@@ -107,7 +118,7 @@ openNote.controller("folderController", function( $scope,
107118
* @param note - load a note
108119
*/
109120
$scope.loadNote = function(note){
110-
$scope.fadeOutFolders(function(){
121+
$scope.fadeOutFoldersAndNotes(function(){
111122
$location.url("/note/"+note.id);
112123
});
113124
};

‎OpenNote/openNote/directives/randomFadeInDirective.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ openNote.directive("randomFadeInDirective", function($timeout,config) {
55
return {
66
restrict: "C",//class
77
link: function(scope, element, attrs) {
8-
element.hide().fadeIn(config.fadeSpeedLong());
8+
element.hide().stop().fadeTo(config.fadeSpeedLong(),1);
99
}
1010
};
1111
});

‎OpenNote/openNote/openNote.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,6 @@ openNote.value("config", {
8888
* See if we are dark or light
8989
*/
9090
isDarkTheme: function(){
91-
return false;
91+
return true;
9292
}
9393
});

‎OpenNote/openNote/partials/folderPartial.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
</div>
99

10-
<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden randomFadeInDirective box folder jstree-draggable" ng-click="loadFolder(folder);">
10+
<div ng-Repeat="folder in currentFolder.foldersInside" class="startHidden randomFadeInDirective box folder" ng-click="loadFolder(folder);">
1111
<h4>
1212
{{folder.name}}
1313
</h4>
@@ -17,7 +17,7 @@ <h4>
1717
</p>
1818
</div>
1919

20-
<div ng-Repeat="note in currentFolder.notesInside" class="box randomFadeInDirective note startHidden jstree-draggable" ng-click="loadNote(note);">
20+
<div ng-Repeat="note in currentFolder.notesInside" class="startHidden box randomFadeInDirective note" ng-click="loadNote(note);">
2121
<h4>
2222
{{note.title}}
2323
</h4>

‎OpenNote/openNote/partials/loginPartial.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ <h1 ng-click="resetButtons();">OpenNote</h1>
99
<form>
1010
<p>
1111
<label>Username</label>
12-
<input type="text" ng-model="userName"/>
12+
<input class="form-control" type="text" ng-model="userName"/>
1313
</p>
1414

1515
<p>
1616
<label>Password</label>
17-
<input type="password" ng-model="password"/>
17+
<input class="form-control" type="password" ng-model="password"/>
1818
</p>
1919

2020
<p>
@@ -27,12 +27,12 @@ <h1 ng-click="resetButtons();">OpenNote</h1>
2727
<form>
2828
<p>
2929
<label>Choose a username</label>
30-
<input type="text" ng-model="userName" ng-keyup="checkAvailability();"/> <span id="availability">{{isAvailable}}</span>
30+
<input class="form-control" type="text" ng-model="userName" ng-keyup="checkAvailability();"/> <span id="availability">{{isAvailable}}</span>
3131
</p>
3232

3333
<p>
3434
<label>Choose a password</label>
35-
<label><input type="password" ng-model="password"/></label>
35+
<input class="form-control"type="password" ng-model="password"/>
3636
</p>
3737

3838
<p>

‎OpenNote/openNote/style/simplicity/.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Ignore everything
2+
*
3+
4+
#Except
5+
!*.less
6+
!.gitignore

‎OpenNote/openNote/style/simplicity/alertify.less‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
/**
2+
* Twitter Bootstrap Look and Feel
3+
* Based on http://twitter.github.com/bootstrap/
4+
*/
5+
6+
/** offset all the other colors */
7+
@offset: #000000;
8+
9+
.alertify,
10+
.alertify-log {
11+
font-family: inherit;
12+
}
13+
.alertify {
14+
background: negation(#000, @offset);
15+
border-radius: 6px;
16+
top: 100px; /*how far down to appear*/
17+
-webkit-background-clip: padding; /* Safari 4? Chrome 6? */
18+
-moz-background-clip: padding; /* Firefox 3.6 */
19+
background-clip: padding-box; /* Firefox 4, Safari 5, Opera 10, IE 9 */
20+
}
21+
.alertify-dialog {
22+
padding: 0;
23+
}
24+
.alertify-inner {
25+
text-align: left;
26+
}
27+
.alertify-message {
28+
padding: 15px;
29+
margin: 0;
30+
}
31+
.alertify-text-wrapper {
32+
padding: 0 15px;
33+
}
34+
.alertify-text {
35+
color: negation(#CCC, @offset);
36+
37+
padding: 8px;
38+
border: 1px solid negation(#CCC, @offset);
39+
}
40+
.alertify-text:focus {
41+
outline: 0;
42+
}
43+
44+
.alertify-buttons {
45+
padding: 14px 15px 15px;
46+
text-align: right;
47+
}
48+
.alertify-button,
49+
.alertify-button:hover,
50+
.alertify-button:focus,
51+
.alertify-button:active {
52+
margin-left: 10px;
53+
border-radius: 4px;
54+
font-weight: inherit;
55+
padding: 4px 12px;
56+
text-decoration: none;
57+
}
58+
.alertify-button:focus {
59+
outline: none;
60+
}
61+
.alertify-button:active {
62+
position: relative;
63+
}
64+
.alertify-button-cancel,
65+
.alertify-button-cancel:hover,
66+
.alertify-button-cancel:focus,
67+
.alertify-button-cancel:active {
68+
color: negation(#CCC, @offset);
69+
}
70+
.alertify-button-cancel:hover,
71+
.alertify-button-cancel:focus,
72+
.alertify-button-cancel:active {
73+
color: negation(#000, @offset);
74+
background: negation(#fff, @offset);
75+
}
76+
.alertify-button-ok,
77+
.alertify-button-ok:hover,
78+
.alertify-button-ok:focus,
79+
.alertify-button-ok:active {
80+
color: negation(#CCC, @offset);
81+
}
82+
.alertify-button-ok:hover,
83+
.alertify-button-ok:focus,
84+
.alertify-button-ok:active {
85+
color: negation(#000, @offset);
86+
background: negation(#fff, @offset);
87+
}
88+
89+
.alertify-log {
90+
background: negation(#000, @offset);
91+
padding: 8px 14px;
92+
border-radius: 4px;
93+
color: negation(#CCC, @offset);
94+
border: none;
95+
}
96+
.alertify-log-error {
97+
color: #CC0000; /*Always red never offset*/
98+
}
99+
.alertify-log-success {
100+
color: negation(#CCC, @offset);
101+
}
102+
103+
.alertify-cover {
104+
transition: opacity 1s ease-out, width 0s;
105+
background-color: negation(#555, @offset);
106+
height: 100%;
107+
position: fixed;
108+
width: 100%;
109+
top: 0;
110+
opacity: 0.8;
111+
right:0;
112+
}
113+
114+
.alertify-cover.alertify-cover-hidden{/*For animation*/
115+
display: block;
116+
opacity: 0;
117+
width:0;
118+
}

0 commit comments

Comments
 (0)