aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css25
-rw-r--r--view/css/mod_photos.css2
-rw-r--r--view/theme/redbasic/css/style.css42
-rwxr-xr-xview/tpl/jot.tpl15
-rwxr-xr-xview/tpl/photos_upload.tpl2
5 files changed, 42 insertions, 44 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 9063ffa60..92eafb4aa 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -19,20 +19,30 @@ code {
display:none;
}
+#jot-title-wrap,
+#jot-pagetitle-wrap,
+#jot-category-wrap {
+ border-bottom: 1px solid #ccc;
+}
+
+#jot-attachment-wrap {
+ border-top: 1px solid #ccc;
+}
+
#jot-title-wrap input,
#jot-pagetitle-wrap input {
- padding: 8px;
- margin-bottom: 5px;
+ padding: 10px;
}
.profile-jot-text {
height: 39px;
- padding: 8px;
+ padding: 11px;
width: 100%;
}
.jot-attachment {
- padding: 8px;
+ border: 0px;
+ padding: 11px;
width: 100%;
}
@@ -42,13 +52,18 @@ code {
}
#profile-jot-submit-wrapper {
- margin-top: 10px;
+ border-top: 1px solid #ccc;
+ padding: 10px;
}
#profile-jot-perms-end {
height: 30px;
}
+#profile-jot-form {
+ line-height: 1;
+}
+
#profile-jot-wrapper {
margin-bottom: 30px;
}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index ae250bc1c..72dd7ffe7 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -25,7 +25,7 @@
}
#photos-upload-choose {
- padding: 4px;
+ padding: 7px 10px;
width: 100%;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5dca2785c..82b6d0277 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -295,7 +295,7 @@ footer {
.vcard {
margin-bottom: 10px;
- padding: 10px;
+ padding: 0px 10px 10px 10px;
background-color: rgba(254,254,254,0.5);
border: 1px solid rgba(254,254,254,0.5);
-moz-border-radius: $radiuspx;
@@ -341,9 +341,7 @@ footer {
#profile-photo-wrapper {
width: 251px;
height: 251px;
- margin-top: -10px;
margin-bottom: 10px;
- border: 1px solid #ccc;
border-radius: $radiuspx;
}
@@ -1142,7 +1140,6 @@ img.mail-conv-sender-photo {
.jothidden {
font-weight: bold;
- border-radius: $radiuspx;
}
.jothidden input::-webkit-input-placeholder {
@@ -1153,27 +1150,18 @@ img.mail-conv-sender-photo {
font-weight: bold;
}
-.jothidden > input {
- border: 1px solid transparent;
- background-color: transparent;
-}
-.jothidden > input:hover,
-.jothidden > input:focus {
- border: 1px solid #cccccc;
- background-color: #fff;
-}
+
#profile-jot-wrapper {
- background-color: rgba(254,254,254,.5);
- border: 1px solid rgba(254,254,254,.5);
+ background-color: rgba(254,254,254,1);
+ border: 1px solid #ccc;
border-radius: $radiuspx;
}
#profile-jot-text {
- color:#000;
- border: 1px solid #cccccc;
- -moz-border-radius: $radiuspx;
+ resize: vertical;
+ border-width: 0px;
border-radius: $radiuspx;
}
@@ -1515,7 +1503,7 @@ nav .dropdown-menu {
.section-content-tools-wrapper {
padding: 7px 10px;
background-color: $comment_item_colour;
- border-bottom: 3px solid $comment_item_colour;
+ border-bottom: 1px solid #ccc;
}
.section-content-info-wrapper {
@@ -1709,9 +1697,8 @@ nav .badge.mail-update:hover {
.nav-tabs.nav-justified {
background-color: rgba(254,254,254,.5);
- border: 1px solid rgba(254,254,254,.5);
- border-top-left-radius: $radiuspx;
- border-top-right-radius: $radiuspx;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
}
.nav-tabs.nav-justified > .active > a,
@@ -1824,13 +1811,13 @@ nav .badge.mail-update:hover {
/* Modified original CSS to match input in Redbasic */
.jothidden .bootstrap-tagsinput {
- border-color: $bgcolour;
- background-color: $bgcolour;
+ border: 0px solid transparent;
+ margin-bottom: 0px;
box-shadow: none;
display: inline-block;
border-radius: $radiuspx;
cursor: text;
- padding: 0px 8px;
+ padding: 0px 10px;
width: 100%;
}
@@ -1838,11 +1825,6 @@ nav .badge.mail-update:hover {
font-size: 100%;
}
-.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
- border: 1px solid #ccc;
- background-color: #fff;
-}
-
/* Abusing theme-green is less work than makeing a new new one */
.theme-green .back-bar .selected-bar { background-color: #000000; background-image: none; !important }
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 32a08a9b3..4f1ecfef2 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,3 +1,10 @@
+{{$mimeselect}}
+{{$layoutselect}}
+{{if $id_select}}
+<div class="channel-id-select-div">
+ <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
+</div>
+{{/if}}
<div id="profile-jot-wrapper">
<form id="profile-jot-form" action="{{$action}}" method="post">
{{if $parent}}
@@ -17,13 +24,7 @@
<input type="hidden" name="preview" id="jot-preview" value="0" />
<input type="hidden" id="jot-consensus" name="consensus" value="{{if $consensus}}{{$consensus}}{{else}}0{{/if}}" />
{{if $showacl}}{{$acl}}{{/if}}
- {{$mimeselect}}
- {{$layoutselect}}
- {{if $id_select}}
- <div class="channel-id-select-div">
- <span class="channel-id-select-desc">{{$id_seltext}}</span> {{$id_select}}
- </div>
- {{/if}}
+
{{if $webpage}}
<div id="jot-pagetitle-wrap" class="jothidden">
<input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}">
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 11a08204d..5bcef5dc1 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -26,7 +26,7 @@
<div id="body-textarea">
{{include file="field_textarea.tpl" field=$body}}
</div>
- <div class="pull-right btn-group form-group">
+ <div class="pull-right btn-group">
<div class="btn-group">
{{if $lockstate}}
<button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">