aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/schema/bluegrid.css57
-rwxr-xr-xview/tpl/404.tpl2
-rw-r--r--view/tpl/chat.tpl2
-rw-r--r--view/tpl/chatroom_new.tpl4
-rw-r--r--view/tpl/chatrooms.tpl2
-rw-r--r--view/tpl/cloud_actionspanel.tpl4
-rw-r--r--view/tpl/locmanage.tpl3
-rwxr-xr-xview/tpl/profile_photo.tpl2
8 files changed, 60 insertions, 16 deletions
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 9638e4696..a2b795be9 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -11,7 +11,7 @@ body {
border: 1px solid #FFF;
}
-.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label {
+.generic-content-wrapper-styled a:hover, .generic-content-wrapper-styled a:focus, .generic-content-wrapper-styled .field.checkbox:hover label, .generic-content-wrapper-styled .field.checkbox:focus label, .allcontact-link:hover, .allcontact-link:focus {
color: rgba(255,255,255,.8);
}
@@ -20,9 +20,18 @@ body {
}
.generic-content-wrapper {
+ background-color: rgba(255,255,255,.8);
+ color: #4d4d4d;
+}
+
+.wall-item-content-wrapper {
background-color: #FFF;
}
+.hide-comments-outer, .wall-item-content-wrapper.comment, .wall-item-comment-wrapper {
+ background-color: transparent;
+}
+
.generic-content-wrapper-styled .generic-content-wrapper {
color: #4d4d4d;
}
@@ -76,7 +85,7 @@ input#jot-title:hover, input#jot-title:focus {
}
nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dropdown-menu {
- background-color: rgba(67,72,138,.95);
+ background-color: rgba(67,72,138,.97);
color: #fff;
border-radius: 0;
border: none;
@@ -89,6 +98,23 @@ nav .dropdown-menu, .wall-item-tools .dropdown-menu, .section-title-wrapper .dro
text-decoration: underline;
}
+.vcard .dropdown-menu {
+ background-color: rgba(255,255,255,.97);
+ border-radius: 0;
+ border: none;
+ box-shadow: 0px 6px 12px rgba(169,169,169,.176);
+}
+
+.vcard .dropdown-menu a, .fc-today {
+ color: #43488A;
+}
+
+.vcard .dropdown-menu > li > a:focus, .vcard .dropdown-menu > li > a:hover {
+ color: #43488A;
+ background-color: rgba( 255,255,255,.7);
+ text-decoration: underline;
+}
+
nav .badge {
background-color: rgba(255,255,255,.8);
color: #43488A;
@@ -173,10 +199,6 @@ nav .badge:hover, nav .badge:focus {
text-shadow: none !important;
}
-.fc-today {
- color: #43488A;
-}
-
div.rateme {
border-radius: 0px;
font-weight: 400;
@@ -197,8 +219,12 @@ div.rateme:hover, div.rateme:focus, a.rateme:hover, a.rateme:focus {
color: #43488A !important;
}
+.notice {
+ background: rgba(215,43,52,.7) url("/images/hz-white-32.png") no-repeat scroll 15px center !important;
+ color: #FFF !important;
+}
+
input {
- -moz-border-radius: 0px;
border-radius: 0px;
}
@@ -211,9 +237,18 @@ input {
border: 1px solid rgba(255,255,255,.5);
}
-.contact-entry-edit a:hover, .contact-entry-edit a:focus {
+.contact-entry-edit a:hover, .contact-entry-edit a:focus, .generic-content-wrapper-styled > p > span.btn.btn-default > a:hover,.generic-content-wrapper-styled > p > span.btn.btn-default > a:focus, div#profile-edit-links a:hover, div#profile-edit-links a:focus {
color: #43488A;
-}
+}
+
+.profile-edit-side-link, input#profile-photo-upload, .allcontact-link {
+ color: #FFF;
+}
+
+.profile-edit-side-link:hover, .profile-edit-side-link:focus {
+ color: #FFF;
+ text-decoration: none;
+}
.btn, #event-edit-form .btn {
border: 1px solid #FFF;
@@ -252,7 +287,7 @@ input {
border-color: #398439;
}
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit {
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit {
background-color: #FFF;
color: #43488A;
border-radius: 0px;
@@ -261,7 +296,7 @@ input {
transition: all .3s ease-in-out;
}
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus {
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus {
border-color: #FFF;
background-color: #43488A;
color: #FFF;
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
index 518ad1d29..c9b51a63b 100755
--- a/view/tpl/404.tpl
+++ b/view/tpl/404.tpl
@@ -1 +1,3 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$message}}</h1>
+</div>
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 9f95d2999..003e0192b 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$room_name}}</h1>
<div id="chatContainer">
@@ -33,6 +34,7 @@
</div>
</div>
+</div>
<script>
var room_id = {{$room_id}};
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
index 1317b672b..c64f21c97 100644
--- a/view/tpl/chatroom_new.tpl
+++ b/view/tpl/chatroom_new.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$header}}</h1>
<form action="chat" method="post" >
@@ -10,5 +11,4 @@
<br />
<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" />
</form>
-
-
+</div>
diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl
index 836923231..570aef1c7 100644
--- a/view/tpl/chatrooms.tpl
+++ b/view/tpl/chatrooms.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h2>{{$header}}</h2>
{{if $is_owner}}
@@ -8,3 +9,4 @@
{{$rooms}}
+</div>
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index 44e4eb54c..81a586e75 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,4 +1,4 @@
-<div id="files-mkdir-tools" class="section-content-tools-wrapper form-group">
+<div id="files-mkdir-tools" class="section-content-tools-wrapper">
<label for="files-mkdir">{{$folder_header}}</label>
<form method="post" action="">
<input type="hidden" name="sabreAction" value="mkcol">
@@ -7,7 +7,7 @@
</form>
<div class="clear"></div>
</div>
-<div id="files-upload-tools" class="section-content-tools-wrapper form-group">
+<div id="files-upload-tools" class="section-content-tools-wrapper">
{{if $quota.limit || $quota.used}}<div class="{{if $quota.warning}}section-content-danger-wrapper{{else}}section-content-info-wrapper{{/if}}">{{if $quota.warning}}<strong>{{$quota.warning}} </strong>{{/if}}{{$quota.desc}}</div>{{/if}}
<label for="files-upload">{{$upload_header}}</label>
<form method="post" action="" enctype="multipart/form-data">
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
index 4ace457ed..970d13300 100644
--- a/view/tpl/locmanage.tpl
+++ b/view/tpl/locmanage.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h2>{{$header}}</h2>
<script>
@@ -23,4 +24,4 @@ function drophub(id) {
{{/if}}
{{/foreach}}
</table>
-
+</div>
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 48a3c7f26..fbed32606 100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$title}}</h1>
<form enctype="multipart/form-data" action="profile_photo" method="post">
@@ -27,3 +28,4 @@
<div id="profile-photo-link-select-wrapper">
{{$select}}
</div>
+</div>