From 10c9811fc534a2738c19d8f74a447ed500b730a2 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Thu, 2 Jul 2015 00:10:20 +0800 Subject: Jump to 0.3.1 --- public/css/cover.css | 17 +- public/css/extra.css | 172 ++++++- public/css/index.css | 24 +- public/css/site.css | 6 + public/index.html | 34 +- public/js/cover.js | 130 ++++- public/js/extra.js | 293 ++++++++--- public/js/fb.js | 8 - public/js/history.js | 3 +- public/js/index.js | 541 +++++++++++++++++---- public/js/pretty.js | 84 +++- public/js/syncscroll.js | 13 +- .../codemirror/addon/comment/continuecomment.js | 2 +- public/vendor/codemirror/codemirror.min.js | 4 +- public/vendor/codemirror/lib/codemirror.js | 6 +- public/vendor/highlight-js/github-gist.min.css | 1 + public/vendor/highlight-js/github.min.css | 2 +- public/vendor/highlight-js/highlight.min.js | 4 +- .../codemirror.inline-attachment.js | 2 + .../vendor/inlineAttachment/inline-attachment.js | 2 +- .../jquery-textcomplete/jquery.textcomplete.js | 39 +- public/vendor/jquery.mousewheel.min.js | 8 + public/vendor/md-toc.js | 121 +++++ public/vendor/md5.min.js | 1 + public/vendor/showup/showup.css | 125 +++++ public/vendor/showup/showup.js | 87 ++++ public/views/body.ejs | 88 +++- public/views/foot.ejs | 5 + public/views/head.ejs | 8 +- public/views/header.ejs | 12 +- public/views/pretty.ejs | 35 +- 31 files changed, 1639 insertions(+), 238 deletions(-) delete mode 100644 public/js/fb.js create mode 100644 public/vendor/highlight-js/github-gist.min.css create mode 100755 public/vendor/jquery.mousewheel.min.js create mode 100755 public/vendor/md-toc.js create mode 100755 public/vendor/md5.min.js create mode 100755 public/vendor/showup/showup.css create mode 100755 public/vendor/showup/showup.js (limited to 'public') diff --git a/public/css/cover.css b/public/css/cover.css index 30d54d34..b5d82e01 100644 --- a/public/css/cover.css +++ b/public/css/cover.css @@ -223,10 +223,21 @@ input { border-radius: 5px; color: black; text-shadow: none; + min-height: 134px; + display: table; + min-width: 100%; +} +.list li .item .content { + display: table-cell; + vertical-align: middle; } -.list li .item .tags { +.list li .item .content .tags { line-height: 25px; } +.list li .item .content .tags span { + display: inline-block; + line-height: 15px; +} .form-inline { padding: 0 10px; } @@ -246,6 +257,10 @@ input { .ui-history-close:hover { opacity: 1; } +.ui-or { + margin-top: 5px; + margin-bottom: 5px; +} .modal-title { text-align: left; diff --git a/public/css/extra.css b/public/css/extra.css index 8b7eb884..6d9d137f 100644 --- a/public/css/extra.css +++ b/public/css/extra.css @@ -13,15 +13,21 @@ } .vimeo .icon, .youtube .icon { - opacity: 0.5; + opacity: 0.3; display: table-cell; vertical-align: middle; height: inherit; margin: 0 auto; + color: white; + -webkit-transition: opacity 0.2s; /* Safari */ + transition: opacity 0.2s; + } .vimeo:hover .icon, .youtube:hover .icon { opacity: 0.6; + -webkit-transition: opacity 0.2s; /* Safari */ + transition: opacity 0.2s; } h1:hover .header-link, h2:hover .header-link, @@ -44,4 +50,168 @@ h6:hover .header-link { -moz-transition: opacity 0.2s ease-in-out 0.1s; -o-transition: opacity 0.2s ease-in-out 0.1s; transition: opacity 0.2s ease-in-out 0.1s; +} + +.ui-infobar { + max-width: 758px; + margin-top: 25px; + margin-bottom: -25px; + color: #777; +} + +.ui-toc { + position: fixed; + bottom: 20px; + z-index: 10000; +} + +.ui-toc-label { + opacity: 0.3; + background-color: #ccc; + border: none; + -webkit-transition: opacity 0.2s; /* Safari */ + transition: opacity 0.2s; +} + +.ui-toc .open .ui-toc-label { + opacity: 1; + color: white; + -webkit-transition: opacity 0.2s; /* Safari */ + transition: opacity 0.2s; +} + +.ui-toc-label:focus { + opacity: 0.3; + background-color: #ccc; + color: black; +} + +.ui-toc-label:hover { + opacity: 1; + background-color: #ccc; + -webkit-transition: opacity 0.2s; /* Safari */ + transition: opacity 0.2s; +} + +.ui-toc-dropdown { + margin-top: 20px; + margin-bottom: 20px; + padding-left: 10px; + padding-right: 10px; + max-width: 45vw; + width: 25vw; + max-height: 65vh; + overflow: auto; +} + +.ui-toc-dropdown a { + overflow: hidden; + text-overflow: ellipsis; + white-space: pre; +} + +.ui-toc-dropdown .nav>li>a { + display: block; + padding: 4px 20px; + font-size: 13px; + font-weight: 500; + color: #767676; +} + +.ui-toc-dropdown .nav>li>a:focus,.ui-toc-dropdown .nav>li>a:hover { + padding-left: 19px; + color: black; + text-decoration: none; + background-color: transparent; + border-left: 1px solid black; +} + +.ui-toc-dropdown .nav>.active:focus>a,.ui-toc-dropdown .nav>.active:hover>a,.ui-toc-dropdown .nav>.active>a { + padding-left: 18px; + font-weight: 700; + color: black; + background-color: transparent; + border-left: 2px solid black; +} + +.ui-toc-dropdown .nav .nav { + display: none; + padding-bottom: 10px; +} + +.ui-toc-dropdown .nav>.active>ul { + display: block; +} + +.ui-toc-dropdown .nav .nav>li>a { + padding-top: 1px; + padding-bottom: 1px; + padding-left: 30px; + font-size: 12px; + font-weight: 400; +} + +.ui-toc-dropdown .nav .nav>li>ul>li>a { + padding-top: 1px; + padding-bottom: 1px; + padding-left: 40px; + font-size: 12px; + font-weight: 400; +} + +.ui-toc-dropdown .nav .nav>li>a:focus,.ui-toc-dropdown .nav .nav>li>a:hover { + padding-left: 29px; +} + +.ui-toc-dropdown .nav .nav>li>ul>li>a:focus,.ui-toc-dropdown .nav .nav>li>ul>li>a:hover { + padding-left: 39px; +} + +.ui-toc-dropdown .nav .nav>.active:focus>a,.ui-toc-dropdown .nav .nav>.active:hover>a,.ui-toc-dropdown .nav .nav>.active>a { + padding-left: 28px; + font-weight: 500; +} + +.ui-toc-dropdown .nav .nav>.active>.nav>.active:focus>a,.ui-toc-dropdown .nav .nav>.active>.nav>.active:hover>a,.ui-toc-dropdown .nav .nav>.active>.nav>.active>a { + padding-left: 38px; + font-weight: 500; +} + +.ui-affix-toc { + position: fixed; + top: 0; + max-width: 15vw; + max-height: 70vh; + overflow: auto; +} + +.back-to-top, .go-to-bottom { + display: block; + padding: 4px 10px; + margin-top: 10px; + margin-left: 10px; + font-size: 12px; + font-weight: 500; + color: #999; +} + +.back-to-top:hover, .back-to-top:focus, .go-to-bottom:hover, .go-to-bottom:focus { + color: #563d7c; + text-decoration: none; +} + +.go-to-bottom { + margin-top: 0; +} + +small span { + line-height: 22px; +} + +small .dropdown { + display: inline-block; +} + +small .dropdown a:focus, small .dropdown a:hover { + text-decoration: none; } \ No newline at end of file diff --git a/public/css/index.css b/public/css/index.css index f1f303ed..e1d5745f 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -177,11 +177,11 @@ div[contenteditable]:empty:not(:focus):before{ content:attr(data-ph); color: gray; } -.dropdown-menu { +.dropdown-menu.list { max-height: 80vh; overflow: auto; } -.dropdown-menu::-webkit-scrollbar { +.dropdown-menu.list::-webkit-scrollbar { display: none; } .dropdown-menu .emoji { @@ -201,6 +201,26 @@ div[contenteditable]:empty:not(:focus):before{ user-select: none; } +.btn-file { + position: relative; + overflow: hidden; +} +.btn-file input[type=file] { + position: absolute; + top: 0; + right: 0; + min-width: 100%; + min-height: 100%; + font-size: 100px; + text-align: right; + filter: alpha(opacity=0); + opacity: 0; + outline: none; + background: white; + cursor: inherit; + display: block; +} + .cm-trailing-space-a:before, .cm-trailing-space-b:before, .cm-trailing-space-new-line:before { diff --git a/public/css/site.css b/public/css/site.css index eed8b950..29426b15 100644 --- a/public/css/site.css +++ b/public/css/site.css @@ -13,4 +13,10 @@ body { } ::-moz-focus-inner { border: 0 !important; +} + +/* manual fix for bootstrap issue 14040, there is an unnecessary padding-right on modal open */ +body.modal-open { + overflow-y: auto; + padding-right: 0 !important; } \ No newline at end of file diff --git a/public/index.html b/public/index.html index 2eb76ddc..c314ebd9 100644 --- a/public/index.html +++ b/public/index.html @@ -52,7 +52,7 @@

Realtime collaborative markdown notes on all platforms.

- +

Start new note @@ -66,7 +66,7 @@

+ + + + + + \ No newline at end of file diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 8ef3cc21..0e808e6a 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -1,5 +1,6 @@ + @@ -13,6 +14,7 @@ + @@ -29,6 +31,9 @@ + + + + + + -- cgit v1.2.3