diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-20 00:02:18 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-20 00:02:18 -0400 |
| commit | 83683b516ec058d0e5fdd0d4a1defbd22a60c322 (patch) | |
| tree | ec970c671a945a6f64543b62ebdd37647abc89d6 /view/theme/diabook-red | |
| parent | ccdac0cd99edafdae4348709fcd23f446d1aee18 (diff) | |
| parent | c88dd1485f31a129f6e00bf92afee241708e7da9 (diff) | |
| download | volse-hubzilla-83683b516ec058d0e5fdd0d4a1defbd22a60c322.tar.gz volse-hubzilla-83683b516ec058d0e5fdd0d4a1defbd22a60c322.tar.bz2 volse-hubzilla-83683b516ec058d0e5fdd0d4a1defbd22a60c322.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes
* master:
Diffstat (limited to 'view/theme/diabook-red')
| -rw-r--r-- | view/theme/diabook-red/jot.tpl | 1 | ||||
| -rw-r--r-- | view/theme/diabook-red/nav.tpl | 2 | ||||
| -rw-r--r-- | view/theme/diabook-red/style-wide.css | 2 | ||||
| -rw-r--r-- | view/theme/diabook-red/style.css | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/view/theme/diabook-red/jot.tpl b/view/theme/diabook-red/jot.tpl index bd43994b5..982201f56 100644 --- a/view/theme/diabook-red/jot.tpl +++ b/view/theme/diabook-red/jot.tpl @@ -14,6 +14,7 @@ <input type="hidden" name="post_id" value="$post_id" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"> + <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div> <div id="character-counter" class="grey"></div> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea> diff --git a/view/theme/diabook-red/nav.tpl b/view/theme/diabook-red/nav.tpl index 0453ec7ee..5f316bcdd 100644 --- a/view/theme/diabook-red/nav.tpl +++ b/view/theme/diabook-red/nav.tpl @@ -36,8 +36,6 @@ <span id="mail-update" class="nav-notify"></span></a> <ul id="nav-messages-menu" class="menu-popup"> <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li> - <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li> - <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li> <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li> </ul> </li> diff --git a/view/theme/diabook-red/style-wide.css b/view/theme/diabook-red/style-wide.css index adb19b90d..9962a9520 100644 --- a/view/theme/diabook-red/style-wide.css +++ b/view/theme/diabook-red/style-wide.css @@ -1939,7 +1939,7 @@ body .pageheader{ #jot #jot-tools li.loading img { margin-top: 10px; } -#profile-jot-form #jot-title { +#profile-jot-form #jot-title, #profile-jot-form #jot-category { border-radius: 5px 5px 5px 5px; font-weight: bold; diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 051871d10..af49e7d88 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1931,7 +1931,7 @@ body .pageheader{ #jot #jot-tools li.loading img { margin-top: 10px; } -#profile-jot-form #jot-title { +#profile-jot-form #jot-title, #profile-jot-form #jot-category { border-radius: 5px 5px 5px 5px; font-weight: bold; |