Skip to content

improve theme compability #272

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

Merged
merged 1 commit into from
Nov 24, 2018
Merged

improve theme compability #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 25 additions & 40 deletions css/notes.css → css/notes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* Copyright (c) 2013, Jan-Christoph Borchardt http://jancborchardt.net
* and others
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING file.
*/
Expand All @@ -12,7 +13,7 @@
}

#app-navigation > ul > li.has-error a{
color:#f00;
color: var(--color-error);
}
.app-content-list-button {
display: block;
Expand All @@ -30,7 +31,7 @@
box-sizing: border-box;
white-space: nowrap;
text-overflow: ellipsis;
color: #000;
color: var(--color-main-text);
opacity: .57;
}

Expand Down Expand Up @@ -95,6 +96,7 @@
padding-top: 2ex;
}

/* old style search (before NC14) */
.note-search span {
background-position: 0 center;
background-origin: content-box;
Expand Down Expand Up @@ -142,6 +144,7 @@
/* enable clickthrough for links */
.CodeMirror-cursor {
pointer-events: none;
border-color: var(--color-main-text);
}

#app-content .note-meta {
Expand All @@ -150,7 +153,7 @@
width: 100%;
padding: 0 45px 0px 45px;
margin: -10px 0 0;
background-color: white; /* TODO Theming! */
background-color: var(--color-main-background);
-ms-user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
Expand All @@ -166,8 +169,8 @@

#app-content .note-meta > .note-error {
opacity: 1;
background-color: #e00;
color: #fff;
background-color: var(--color-error);
color: var(--color-primary-text);
border-radius: 0.5ex;
padding: 0.5ex 1ex;
}
Expand Down Expand Up @@ -242,6 +245,10 @@ form.category .icon-confirm {


/* markdown styling */
.CodeMirror {
background: transparent;
color: inherit;
}

.CodeMirror .CodeMirror-code {
width: 100%;
Expand Down Expand Up @@ -316,37 +323,18 @@ form.category .icon-confirm {
}

/* distraction free styles */
:-webkit-full-screen {
width: 100%;
background-color: white;
}
:-moz-full-screen {
width: 100%;
background-color: white;
}
:-ms-fullscreen {
width: 100%;
background-color: white;
}
:-webkit-full-screen,
:-moz-full-screen,
:-ms-fullscreen,
:fullscreen {
width: 100%;
background-color: white;
}
background-color: var(--color-main-background);

:-webkit-full-screen #app-content-container {
margin: 0 auto;
}
:-moz-full-screen #app-content-container {
margin: 0 auto;
}
:-ms-fullscreen #app-content-container {
margin: 0 auto;
}
:fullscreen #app-content-container {
margin: 0 auto;
#app-content-container {
margin: 0 auto;
}
}


/* larger screen sizes */
@media only screen and (min-width: 769px) {
/* use slightly more space on the left so all # signs of h3–h6 show */
Expand All @@ -358,20 +346,17 @@ form.category .icon-confirm {


/* icons for sidebar */
.nav-icon-emptyfolder {
background-image: url('../img/folder-empty.svg?v=1');
}
.nav-icon-files {
background-image: url('../img/folder.svg?v=1');
@include icon-color('folder', 'notes', $color-black);
}
.nav-icon-emptyfolder {
@include icon-color('folder-empty', 'notes', $color-black);
}
.nav-icon-recent {
background-image: url('../img/recent.svg?v=1');
@include icon-color('recent', 'notes', $color-black);
}
.nav-icon-search {
background-image: url('../img/search.svg?v=1');
}
.nav-icon-favorites {
background-image: url('../img/star.svg?v=1');
@include icon-color('search', 'notes', $color-black);
}


Expand Down
2 changes: 1 addition & 1 deletion img/folder-empty.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion img/folder.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion img/star.svg
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions templates/note.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="note-meta" ng-if="note!==false">
<span class="note-category" ng-class="{ uncategorized: !note.category }" title="<?php p($l->t('Category')); ?>" ng-show="!editCategory" ng-click="showEditCategory()">{{ note.category || '<?php p($l->t('Uncategorized')) ?>' | categoryTitle}} <input type="button" class="edit icon icon-rename" title="<?php p($l->t('Edit category')); ?>"></span>
<span class="note-category" title="<?php p($l->t('Edit category')); ?>" ng-show="editCategory"><form class="category" ng-submit="closeCategory()"><input type="text" id="category" name="category" ng-blur="closeCategory()" placeholder="<?php p($l->t('Uncategorized')); ?>"><input type="submit" class="icon-confirm" value=""></form></span>
<span class="note-word-count" ng-if="note.content.length > 0">{{note.content | wordCount}}</span>
<span class="note-unsaved" ng-if="note.unsaved" title="<?php p($l->t('The note has unsaved changes.')); ?>">*</span>
<span class="note-error" ng-if="note.error" ng-click="manualSave()" title="<?php p($l->t('Click here to try again')); ?>"><?php p($l->t('Saving failed!')); ?></span>
<span class="saving" ng-if="isManualSaving()" title="<?php p($l->t('Note saved')); ?>"></span>
<span class="note-word-count" ng-show="note.content.length > 0">{{note.content | wordCount}}</span>
<span class="note-unsaved" ng-show="note.unsaved" title="<?php p($l->t('The note has unsaved changes.')); ?>">*</span>
<span class="note-error" ng-show="note.error" ng-click="manualSave()" title="<?php p($l->t('Click here to try again')); ?>"><?php p($l->t('Saving failed!')); ?></span>
<span class="saving" ng-show="isManualSaving()" title="<?php p($l->t('Note saved')); ?>"></span>
<span class="note-meta-right">
<button class="icon-fullscreen has-tooltip btn-fullscreen" notes-tooltip ng-click="toggleDistractionFree()"></button>
</span>
Expand Down