Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Group new document buttons #221

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Group new document buttons #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4722ad7
Merge pull request #1 from leanote/master
redeian Jan 5, 2017
aa0bee4
group new documents buttons
redeian Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions note.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,22 @@
</div>

<div id="newMyNote">
<a id="newNoteBtn" title="New note">
<span class="new-note-text" title="New note">+</span>
</a>
<span class="new-split">|</span>
<a id="newNoteMarkdownBtn" title="New markdown note">
<span class="new-markdown-text" title="New markdown note">+M</span>
</a>

<!-- Split button -->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle btn-xs"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-file" aria-hidden="true"></i> <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a id="newNoteBtn" href="#">New Document</a></li>
<li><a id="newNoteMarkdownBtn" href="#">New Markdown</a></li>
</ul>
</div>

<span id="curNotebookForNewNote" notebookId="" style="display: none"></span>


</div>

</div>
Expand Down
47 changes: 26 additions & 21 deletions public/themes/basic.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,28 +1563,33 @@ h3 {
color: #ccc;
display: none;
}
#newNoteBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
text-align: center;
height: 25px;
width: 20px;
line-height: initial;
padding-top: 3px;
}
#newNoteMarkdownBtn {
display: inline-block;
border: 1px solid #eee;
border-radius: 5px;
/* width: 100px; */
margin-left: 1px;
padding: 0 1px;
height: 25px;
line-height: initial;
text-align: center;
padding-top: 3px;
button{
padding: 5px;
background-color: #fafafa;
border: none;
}
// #newNoteBtn {
// display: inline-block;
// border: 1px solid #eee;
// border-radius: 5px;
// text-align: center;
// height: 25px;
// width: 20px;
// line-height: initial;
// padding-top: 3px;
// }
// #newNoteMarkdownBtn {
// display: inline-block;
// border: 1px solid #eee;
// border-radius: 5px;
// /* width: 100px; */
// margin-left: 1px;
// padding: 0 1px;
// height: 25px;
// line-height: initial;
// text-align: center;
// padding-top: 3px;
// }
}

#myNotebookNavForListNav {
Expand Down
3 changes: 0 additions & 3 deletions public/themes/default.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,9 +763,6 @@ body {
// font-family: '微软雅黑';
}

#newMyNote * {
font-family: 'Arial';
}

html,
body,
Expand Down
12 changes: 11 additions & 1 deletion public/themes/themes/night/theme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,17 @@
}

#newMyNote #newNoteMarkdownBtn, #newMyNote #newNoteBtn {
border: 1px solid #615E5E;
// border: 1px solid #615E5E;

color:@itemHoverBg;
// background-color: @noteBgLess;
}

#newMyNote {
button{
color:@txtcolor;
background-color: @noteBgLess;
}
}

@noteBg: rgb(39, 38, 38);
Expand Down