Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@brittohalloran
brittohalloran committed Aug 20, 2011
2 parents 2946878 + 83c3917 commit 9fef1a5
Show file tree
Hide file tree
Showing 13 changed files with 256 additions and 138 deletions.
35 changes: 19 additions & 16 deletions +/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<link rel="icon" href="../favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
<!-- STYLESHEETS -->
<link href="../scripts/keyboard/shortcuts.css" type="text/css" media="screen" />
<link rel="stylesheet" href="../styles/themes.php" type="text/css" media="screen" />
<link rel="stylesheet" href="../styles/structure.css" type="text/css" media="screen" />
<link href="../js/keyboard/shortcuts.css" type="text/css" media="screen" />
<link rel="stylesheet" href="../css/themes.php" type="text/css" media="screen" />
<link rel="stylesheet" href="../css/structure.css" type="text/css" media="screen" />
<!-- FONTS -->
<link href="http://fonts.googleapis.com/css?family=Droid+Sans:regular,bold&v1" rel='stylesheet' type='text/css' />
<link href="../fonts/fonts.css" rel='stylesheet' type='text/css' />
Expand All @@ -45,9 +45,9 @@
<div id='sidebar' class='sidebar'>
<div id="searchbar" class='search'>
<input type="text" name="q" />
<div class='tags button' title="Tags"><div class='inner'></div></div>
<div class='addnote button' title="New Note"><div class='inner'></div></div>
<div class='reload button' title="Sync"><div class='inner'></div></div>
<div class='tags button' title="Tags (t) or (l)"><div class='inner'></div></div>
<div class='addnote button' title="New Note (c)"><div class='inner'></div></div>
<div class='reload button' title="Sync (s)"><div class='inner'></div></div>
</div>
<div id="note-list" class="list">
<div class="filter-status"></div>
Expand All @@ -57,6 +57,9 @@
</div>
</div>
<div id="note-window" class="window ">
<div class="msg">
<div class='inner'>Working...</div>
</div>
<div class='toolbar'>
<div class='status-div'>
<div class='status-icon'></div>
Expand All @@ -67,10 +70,10 @@
</div>
<div class='bottom-toolbar'>
<div class='notestack-info'>
Notestack <a href="/CHANGELOG.txt" target="_blank">v0.8.2 beta</a> | <a href="http://github.com/brittohalloran/notestack/issues" target="_blank">Report bug / Request feature</a>
Notestack <a href="/CHANGELOG.txt" target="_blank">v0.8.3 beta</a> | <a href="http://github.com/brittohalloran/notestack/issues" target="_blank">Report bug / Request feature</a>
</div>
</div>

<div class="notes-placeholder"></div>
<!-- notes will be inserted here -->
</div><!-- notes window -->
<div class="settings">
Expand Down Expand Up @@ -234,11 +237,11 @@
</div>
</div>
<div class='note-directions'><p>esc to save</p></div>
<div class='pin-button' title='toggle pin'>pin</div>
<div class='markdown-button' title='toggle markdown'># #</div>
<div class='versions-button' title='view old versions'>history</div>
<div class='maximize' title='fullscreen mode'>focus</div>
<div class='delete' title='delete note'>x</div>
<div class='pin-button' title='Toggle pin (p)'>pin</div>
<div class='markdown-button' title='Toggle markdown (m)'># #</div>
<div class='versions-button' title='View old versions (v)'>history</div>
<div class='maximize' title='Fullscreen mode (f)'>focus</div>
<div class='delete' title='Delete note'>x</div>

<div class='message'></div>
</div>
Expand All @@ -259,7 +262,7 @@
<span>filtered by tag: </span>
<span class="tag-filter-label"></span>
</div>
<div class="clear-tag-filter">x</div>
<div class="clear-tag-filter" title="clear filter (a)">x</div>
</div>
</div>
<!-- SCRIPTS -->
Expand All @@ -268,12 +271,12 @@
<?php
if ($subdomain == "dev"){
?>
<script src="../scripts/stack.js" type="text/javascript"></script>
<script src="../js/stack.js" type="text/javascript"></script>
<?php
}
else{
?>
<script src="../scripts/stack.min.js" type="text/javascript"></script>
<script src="../js/stack.min.js" type="text/javascript"></script>
<?php
};
?>
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ [email protected]

// CHANGE HISTORY

2011-08-20 - v0.8.3
- major speed improvements, especially in label filter / unfilter
- make animations smoother and use less memory
- fixed: not being able to turn markdown off
- fixed: filtering with no tag selected

2011-08-15 - v0.8.2
- enabled markdown support
- added pin and markdown buttons to each note
- switched to github issue tracking (from getsatisfaction because their free plan is restricted)
- switched to github issue tracking (from getsatisfaction because their free plan is too restricted)
- minor speed improvements

2011-08-06 - v0.8.1
Expand Down
14 changes: 7 additions & 7 deletions cache.manifest
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# Notestack v0.8.2
# Notestack v0.8.3

CACHE:
+/index.php
Expand Down Expand Up @@ -87,12 +87,12 @@ images/rsz_pin.png
images/settings.png
images/simplenote.png
images/tag.png
scripts/stack.min.js
scripts/login.min.js
styles/960-grid.css
styles/home.css
styles/structure.css
styles/themes.php
js/stack.min.js
js/login.min.js
css/960-grid.css
css/home.css
css/structure.css
css/themes.php
CHANGELOG.txt
favicon.ico
index.php
Expand Down
0 styles/960-grid.css → css/960-grid.css
View file
File renamed without changes.
0 styles/home.css → css/home.css
View file
File renamed without changes.
8 changes: 6 additions & 2 deletions styles/structure.css → css/structure.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@
.tag-filter .list {
top: 55px;
}
.listnote-holder { width: 100%; } .listnote { position: relative; width: 100%; height: 40px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; cursor: pointer; } .listnote .title, .listnote .preview { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; position: absolute; left: 35px; right: 10px; cursor: inherit; } .listnote .title { top: 5px; } .listnote .preview { bottom: 5px; } .listnote .pinboard { position: absolute; top: 0px; height: 100%; left: 0px; width: 35px; cursor: pointer; } .listnote .contents, .listnote .contents textarea { display: none; visibility: hidden; }.window { overflow: hidden; position: absolute; left: 350px; right: 0; top: 0; height: 100%; display: block;} .note { display: none; width: 600px; position: absolute; left: 50%; top: 40px; bottom: 30px; min-height: 200px; -webkit-transition: all 0.25s ease-in-out; -moz-transition: all 0.25s ease-in-out; -o-transition: all 0.25s ease-in-out; transition: all 0.25s ease-in-out; } .textarea { position: absolute; top: 20px; bottom: 20px; left: 20px; right: 20px;
.listnote-holder { width: 100%; } .listnote { position: relative; width: 100%; height: 40px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; cursor: pointer; }

.listnote:hover {
background: rgba(0,0,0,0.1);
} .listnote .title, .listnote .preview { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; position: absolute; left: 35px; right: 10px; cursor: inherit; } .listnote .title { top: 5px; } .listnote .preview { bottom: 5px; } .listnote .pinboard { position: absolute; top: 0px; height: 100%; left: 0px; width: 35px; cursor: pointer; } .listnote .contents, .listnote .contents textarea { display: none; visibility: hidden; }.window { overflow: hidden; position: absolute; left: 350px; right: 0; top: 0; height: 100%; display: block;} .note { display: none; width: 600px; position: absolute; left: 50%; top: 40px; bottom: 30px; min-height: 200px; -webkit-transition: all 0.25s ease-out; -moz-transition: all 0.25s ease-out; -o-transition: all 0.25s ease-out; transition: all 0.25s ease-out; } .no-animation .note { -webkit-transition: none; -moz-transition: none; -o-transition: none; transition: none; } .textarea { position: absolute; top: 20px; bottom: 20px; left: 20px; right: 20px;
padding: 5px 5px 5px 10px; } .textarea textarea, .markdown {
position: absolute; left: 10px; right: 5px; top: 5px; bottom: 42px;
border: none;
Expand Down Expand Up @@ -119,7 +123,7 @@

.settings .data table {
margin: 0px auto;
} .settings .close { position: absolute; height: 30px; width: 30px; right: 5px; top: 2px; background: url('../images/close.png') no-repeat bottom left; cursor: pointer; z-index: 55; } .help { height: 100%; width: 100%; top: 0; left: 0;}.overlay { position: absolute; height: 100%; width: 100%; top: 100%; left: 0; z-index: 100; background: rgba(0,0,0,0);}.overlay.show { top: 0; -webkit-transition: background 0.3s linear; -moz-transition: background 0.3s linear; -o-transition: background 0.3s linear; transition: background 0.3s linear; background: rgba(0,0,0,0.7);}.labels { display: none; position: absolute; width: 500px; left: 50%; margin-left: -250px; height: 500px; top: 50%; margin-top: -250px; background: gray; z-index: 101; -moz-border-radius: 10px; -webkit-border-radius: 10px; -o-border-radius: 10px; border-radius: 10px;} .labels .inner { position: absolute; top: 20px; left: 20px; right: 20px; bottom: 20px; } .labels .inner input { position: absolute; top: 12px; right: 12px; left: 12px; } .labels .items { position: absolute; top: 38px; right: 0px; left: 0px; bottom: 0px; overflow: auto; } .labels .item { width: 437px; position: relative; font-size: 18px; margin: 4px auto; background: rgba(0,0,0,0.2); height: 25px; cursor: pointer;
} .settings .close { position: absolute; height: 30px; width: 30px; right: 5px; top: 2px; background: url('../images/close.png') no-repeat bottom left; cursor: pointer; z-index: 55; } .help { height: 100%; width: 100%; top: 0; left: 0;}.msg { display: none; position: absolute; top: 5px; width: 100%; z-index: 50;} .msg .inner { height: 25px; z-index: 50; width: 100px; line-height: 25px; font-size: 14px; text-align: center; background: #FEF7CB; border: 1px solid #FFE475; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; margin: 0px auto; }.overlay { position: absolute; height: 100%; width: 100%; top: 100%; left: 0; z-index: 100; background: rgba(0,0,0,0);}.overlay.show { top: 0; -webkit-transition: background 0.3s linear; -moz-transition: background 0.3s linear; -o-transition: background 0.3s linear; transition: background 0.3s linear; background: rgba(0,0,0,0.7); background: -webkit-radial-gradient(rgba(127, 127, 127, 0.5), rgba(127, 127, 127, 0.5) 35%, rgba(0, 0, 0, 0.7));}.labels { display: none; position: absolute; width: 500px; left: 50%; margin-left: -250px; height: 500px; top: 50%; margin-top: -250px; background: gray; z-index: 101; -moz-border-radius: 10px; -webkit-border-radius: 10px; -o-border-radius: 10px; border-radius: 10px;} .labels .inner { position: absolute; top: 20px; left: 20px; right: 20px; bottom: 20px; } .labels .inner input { position: absolute; top: 12px; right: 12px; left: 12px; } .labels .items { position: absolute; top: 38px; right: 0px; left: 0px; bottom: 0px; overflow: auto; } .labels .item { width: 437px; position: relative; font-size: 18px; margin: 4px auto; background: rgba(0,0,0,0.2); height: 25px; cursor: pointer;
-moz-border-radius: 3px; -webkit-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; } .labels .item .name { position: absolute; left: 35px; } .labels .item .notecount { position: absolute; right: 35px; } .labels .close { position: absolute; height: 30px; width: 30px; right: -10px; top: -10px; background: url('../images/close.png') no-repeat bottom left; cursor: pointer; }
.versions {
display: none;
Expand Down
0 styles/themes.php → css/themes.php
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions index.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html><?php $subdomain = preg_replace('/^(?:([^\.]+)\.)?notestack\.me$/', '\1', $_SERVER['SERVER_NAME']); if ($subdomain == "dev"){?><html><?php } else{?><html manifest="/cache.manifest"><?php };?>
<head> <!-- NOTESTACK HOMEPAGE --> <!-- META --> <title>Notestack</title>
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <!-- STYLESHEETS --> <link href='/styles/960-grid.css' rel='stylesheet' type='text/css'> <link href='/styles/home.css' rel='stylesheet' type='text/css'> <!-- GOOGLE FONTS --> <link href='http://fonts.googleapis.com/css?family=Vollkorn&v1' rel='stylesheet' type='text/css'>
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <!-- STYLESHEETS --> <link href='/css/960-grid.css' rel='stylesheet' type='text/css'> <link href='/css/home.css' rel='stylesheet' type='text/css'> <!-- GOOGLE FONTS --> <link href='http://fonts.googleapis.com/css?family=Vollkorn&v1' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Hammersmith+One&v2' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=Droid+Sans&v1' rel='stylesheet' type='text/css'> <link href="../fonts/fonts.css" rel='stylesheet' type='text/css' />
<!-- GOOGLE ANALYTICS -->
<script type="text/javascript">
Expand All @@ -22,8 +22,8 @@
</form>
<div class='login_message'></div>
</div><!--login_inner--> </div><!--login--> <div class="under_login grid_4 alpha omega"> <div class="inner"> <span class='under_message'><a href="https://simple-note.appspot.com/create/" target="_blank">Create a Simplenote account</a></span> </div><!--inner--> </div><!--under_login--> </div><!--right--> <div class='clear pad_50'></div> <div class='grid_12 alpha omega cards'> <div class='grid_4 alpha html5 feature card'> <div class='inner'> <div class='content'> <div class='image'></div> <h2>HTML5 & CSS3</h2> <p>Animations, gradients, local storage, and other things your old browser couldn't do.</p> </div> </div> </div> <div class='grid_4 keyboard feature card'> <div class='inner'> <div class='content'> <div class='image'></div> <h2>Keyboard Shortcuts</h2> <p>Navigate with the keyboard shortcuts you already know and love.</p> </div> </div> </div> <div class='grid_4 omega simplenote feature card'> <div class='inner'> <div class='content'> <div class='image'></div> <h2>Simplenote Sync</h2> <p>Take your notes with you on any platform. <a href="http://simplenoteapp.com/" target="_blank">Learn more</a> or find an <a href="http://simplenoteapp.com/downloads/" target="_blank">app for your platform</a>.</p> </div> </div> </div> </div> <div class='clear pad_50'></div>
<div class='grid_12 alpha omega footer'> <div class='footer_inner'> <span class='footer_left'>design and code by <a href="http://about.me/brittohalloran" target="_blank">britt o'halloran</a> | <a href="http://getsatisfaction.com/notestack" target="_blank">report bugs / request features</a></span> <span class='footer_right'></span> </div> </div> </div> </div><!--container_12--></div><!--fullwindow--> <!-- SCRIPTS -->
<div class='grid_12 alpha omega footer'> <div class='footer_inner'> <span class='footer_left'>design and code by <a href="http://about.me/brittohalloran" target="_blank">britt o'halloran</a> | <a href="http://github.com/brittohalloran/notestack" target="_blank">report bugs / request features</a></span> <span class='footer_right'></span> </div> </div> </div> </div><!--container_12--></div><!--fullwindow--> <!-- SCRIPTS -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script> <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js"></script>
<?php if ($subdomain == "dev"){ ?> <script src="../scripts/login.js" type="text/javascript"></script> <?php } else{ ?> <script src="../scripts/login.min.js" type="text/javascript"></script> <?php }; ?>
<?php if ($subdomain == "dev"){ ?> <script src="../js/login.js" type="text/javascript"></script> <?php } else{ ?> <script src="../js/login.min.js" type="text/javascript"></script> <?php }; ?>
</body>
</html>
Expand Down
0 scripts/login.js → js/login.js
View file
File renamed without changes.
0 scripts/login.min.js → js/login.min.js
View file
File renamed without changes.
Loading

0 comments on commit 9fef1a5

Please sign in to comment.