diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index 97af9d33df..4b2528b361 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -708,7 +708,6 @@ a.personal_agenda:hover, a.personal_agenda:hover {
.social-home-anonymous-online {
width: 200px;
}
-
.menulist {
margin: 0px;
list-style: none;
@@ -717,38 +716,15 @@ a.personal_agenda:hover, a.personal_agenda:hover {
list-style-position:outside;
list-style-type:none;
}
-
.menulist li {
/* float:left; */
/* margin-left:10px; */
margin-bottom:10px;
display:list-item;
}
-
.menulist li {
margin-top: 10px;
}
-
-.group_social_item {
- float:left;
- width:95%;
-}
-
-.group_social_sub_item {
- float:left;
- /* width:600px; */
- background-color: #E9F4FA;
- background-repeat: repeat-x;
-
- margin: 8px;
- padding:5px;
- width:100%;
-}
-
-.group_social_sub_item_highlight {
- background-color: #FFFFDD;
-}
-
#profile .control-group .controls .files-production{
padding: 5px 25px;
-webkit-border-radius: 10px;
@@ -766,129 +742,17 @@ a.personal_agenda:hover, a.personal_agenda:hover {
padding-bottom: 3px;
}
-.message-group-content {
- float:right;
- width:90%;
- line-height: 100%;
-}
-
-.message-group-date {
- font-style:italic;
- text-align:left;
- margin-top:4px;
-}
-.message-reply-link {
- float:right;
-}
-
-.group_social_main_item {
- float:left;
- width:600px;
- background-color: #fff;
- background-repeat: repeat-x;
- margin: 8px;
- padding:5px;
-}
-
-.group_discussions_replies {
- background-color: #E9F4FA;
- background-repeat: repeat-x;
- border: 1px solid #D0E2EC;
- border-radius: 3px 3px 3px 3px;
- color: #999999;
- float: left;
- font-size: 0.8em;
- margin-right: 10px;
- overflow: hidden;
- padding: 13px;
- text-align: center;
- width: 47px;
- margin-bottom: 65px;
-}
-
-.group_discussions_replies span {
- display: block;
- font-size: 2em;
-}
-
-.group_discussions_info {
- width:400px;
- height: 80px;
- overflow: hidden;
- width: 400px;
-}
-
-.group_social_grid {
- float:left;
- width:100%;
-}
-
-.message-attach {
- float:left;
-}
#sn-extra-information .list-group-item{
padding: 5px 10px;
border: none;
}
-
/** BUTTONS **/
-
.left {
float:left !important;
}
-
.right {
text-align: right;
}
-
-/* Nice buttons v2 */
-
-button.next.disabled {
- cursor: default;
- opacity: 0.65;
-}
-
-.round {
- -webkit-border-radius: 1em;
- -moz-border-radius: 1em;
- border-radius: 1em;
-}
-
-.bigger {
- font-size: 16px;
- font-weight: bold;
- padding: .8em 2em .62em;
-}
-
-.big {
- font-size: 14px;
- font-weight: bold;
- padding: .8em 2em .62em;
-}
-.medium {
- font-size: 12px;
- padding: .4em 1.5em .42em;
-}
-.small {
- font-size: 11px;
- padding: .2em 1em .275em;
-}
-
-.no_link {
- cursor:default;
-
-}
-
-.no_link:hover {
- cursor:default;
-}
-.no_link:active {
- cursor:default;
-
-}
-.content-chat{
- height: 200px;
-}
/* Note */
.note {
margin: 6px;
@@ -1040,10 +904,6 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
#inbox-menu ul li {
padding:2px 0px;
}
-
-#message-reply-link {
- float:right;
-}
.message-item {
-moz-background-clip:border;
-moz-background-inline-policy:continuous;
@@ -1057,43 +917,26 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
padding:10px;
}
.message-topic {
- -moz-background-clip:border;
- -moz-background-inline-policy:continuous;
- -moz-background-origin:padding;
- -moz-border-radius-bottomleft:8px;
- -moz-border-radius-bottomright:8px;
- -moz-border-radius-topleft:8px;
- -moz-border-radius-topright:8px;
- background:#E6EEFB none repeat scroll 0 0;
- margin:0 0 5px;
- padding:10px;
-
-}
-.message-group-title-topic {
- font-size:180%;
- margin:5px 0px 5px 0px;
-}
-.message-group-title {
- font-size:120%;
-}
-.message-group-author {
- margin:0px 5px 5px 0px;
- float:left;
+ padding: 15px;
+ border-radius: 5px;
+ display: inline-block;
+ border: 1px solid #DDD;
+ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
}
-
-.message-group-content {
- margin: 5px 0px 8px 0px;
+.message-topic .avatar-author{
+ float: right;
}
-.message-group-date {
- color:#999;
- width:100%;
- font-size:98%;
+.thread-body{
+ padding-bottom: 20px;
+ padding-top: 20px;
}
-.view-message-content {
- line-height:150%;
- font-size:110%;
+.message-post{
+ border: 1px solid #DDD;
+ margin-bottom: 20px;
+ border-radius: 5px;
+ padding: 15px;
+ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
}
-
.message_view_table {
cellspacing:0;
cellpadding:0;
@@ -1114,15 +957,7 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
margin-top:23px;
margin-left:20px;
}
-
/* styles from the my.profile.php file */
-.message-content {
- /* float:right;
- background:#FFF;
- padding: 10px 0 0 5px;
- width:125px;
- position:relative;*/
-}
.message-content .message-delete {
position: absolute;
top: 10px;
@@ -1241,8 +1076,6 @@ div.attendance-calendar-add div.row div.formw,div.attendance-calendar-edit div.r
outline-style:none;
background:#ffffff;
}
-.message-content-body-right:hover {
-}
a.unread {
font-weight:bold;
@@ -1483,10 +1316,7 @@ div.admin_section h4 {
.toolbar-groups{
margin-bottom: 30px;
}
-#group_edit .form-group label span{
- display: block;
- font-size: 12px;
-}
+
.group_invitation_grid_container { width:100%;}
.group_invitation_grid_item {
border:1px dotted #CCCCCC;
@@ -2175,18 +2005,11 @@ div.admin_section h4 {
border-bottom: 1px solid #CCCCCC;
margin-bottom: 20px;
}
-
#div_content_table {
border-bottom:1px solid #EAEAEA;
margin-bottom:20px;
padding-bottom:10px;
}
-
-.group_description {
- word-wrap: break-word;
- font-size:11px;
-}
-
/* Forms */
div.row div.form_header {
white-space: nowrap;
@@ -3961,7 +3784,12 @@ i.size-32.icon-new-work{
}
.sm-groups .social-profile .img-responsive{
display: inline-block;
- width: 100px;
+}
+.sm-groups-content .groups-messages{
+ padding-top: 10px;
+ padding-bottom: 20px;
+ padding-left: 20px;
+ padding-right: 20px;
}
.social-post .mediaPost{
padding-top:10px;
@@ -4066,7 +3894,7 @@ i.size-32.icon-new-work{
vertical-align: bottom;
margin-right: 5px;
}
-.social-network-menu .nav li a{
+.social-network-menu .nav li a, #groups-acordeon .nav li a{
padding: 5px;
font-size: 12px;
}
@@ -5435,15 +5263,22 @@ div#chat-remote-video video {
#toolbar-agenda .show-tick{
width: 420px;
}
-.tab-wrapper .tab-content{
- padding: 25px 0px 25px 0px;
-}
.description-upload{
margin-bottom: 10px;
}
.files-table{
padding-top: 20px;
}
+.user-list{
+ padding-top: 20px;
+ padding-bottom: 20px;
+}
+.items-user{
+ text-align: center;
+ padding: 10px;
+ margin-bottom: 10px;
+ min-height: 170px;
+}
#whoisonline .items-user{
text-align: center;
/*border:1px solid #dddddd; */
@@ -5991,9 +5826,6 @@ a.sessionView {
padding: 5px;
min-height: 300px;
}
- .col-xs-6{
- width: 100%;
- }
.gallery .canvas-two{
width: 100%;
}
diff --git a/main/img/icons/128/group_leave.png b/main/img/icons/128/group_leave.png
new file mode 100644
index 0000000000..d9097eced8
Binary files /dev/null and b/main/img/icons/128/group_leave.png differ
diff --git a/main/img/icons/128/group_na.png b/main/img/icons/128/group_na.png
new file mode 100644
index 0000000000..ecc4be8e45
Binary files /dev/null and b/main/img/icons/128/group_na.png differ
diff --git a/main/img/icons/128/invitation_friend.png b/main/img/icons/128/invitation_friend.png
new file mode 100644
index 0000000000..2226004671
Binary files /dev/null and b/main/img/icons/128/invitation_friend.png differ
diff --git a/main/img/icons/128/waiting_list.png b/main/img/icons/128/waiting_list.png
new file mode 100644
index 0000000000..4dd4f311a8
Binary files /dev/null and b/main/img/icons/128/waiting_list.png differ
diff --git a/main/img/icons/22/group_edit.png b/main/img/icons/22/group_edit.png
new file mode 100644
index 0000000000..cf11ccf306
Binary files /dev/null and b/main/img/icons/22/group_edit.png differ
diff --git a/main/img/icons/22/group_leave.png b/main/img/icons/22/group_leave.png
new file mode 100644
index 0000000000..1a465334be
Binary files /dev/null and b/main/img/icons/22/group_leave.png differ
diff --git a/main/img/icons/22/invitation_friend.png b/main/img/icons/22/invitation_friend.png
new file mode 100644
index 0000000000..ab896709fd
Binary files /dev/null and b/main/img/icons/22/invitation_friend.png differ
diff --git a/main/img/icons/22/waiting_list.png b/main/img/icons/22/waiting_list.png
new file mode 100644
index 0000000000..057be74284
Binary files /dev/null and b/main/img/icons/22/waiting_list.png differ
diff --git a/main/img/icons/32/group_edit.png b/main/img/icons/32/group_edit.png
new file mode 100644
index 0000000000..721c2b3b61
Binary files /dev/null and b/main/img/icons/32/group_edit.png differ
diff --git a/main/img/icons/32/group_leave.png b/main/img/icons/32/group_leave.png
new file mode 100644
index 0000000000..efe98ead0f
Binary files /dev/null and b/main/img/icons/32/group_leave.png differ
diff --git a/main/img/icons/32/invitation_friend.png b/main/img/icons/32/invitation_friend.png
new file mode 100644
index 0000000000..1f0e393ba8
Binary files /dev/null and b/main/img/icons/32/invitation_friend.png differ
diff --git a/main/img/icons/32/waiting_list.png b/main/img/icons/32/waiting_list.png
new file mode 100644
index 0000000000..47aecad0ea
Binary files /dev/null and b/main/img/icons/32/waiting_list.png differ
diff --git a/main/img/icons/48/group_edit.png b/main/img/icons/48/group_edit.png
new file mode 100644
index 0000000000..58d01b4d55
Binary files /dev/null and b/main/img/icons/48/group_edit.png differ
diff --git a/main/img/icons/48/group_leave.png b/main/img/icons/48/group_leave.png
new file mode 100644
index 0000000000..9e1c28fe31
Binary files /dev/null and b/main/img/icons/48/group_leave.png differ
diff --git a/main/img/icons/48/invitation_friend.png b/main/img/icons/48/invitation_friend.png
new file mode 100644
index 0000000000..5a67d080bd
Binary files /dev/null and b/main/img/icons/48/invitation_friend.png differ
diff --git a/main/img/icons/48/waiting_list.png b/main/img/icons/48/waiting_list.png
new file mode 100644
index 0000000000..645953e687
Binary files /dev/null and b/main/img/icons/48/waiting_list.png differ
diff --git a/main/img/icons/64/group_edit.png b/main/img/icons/64/group_edit.png
new file mode 100644
index 0000000000..c3cfb9017b
Binary files /dev/null and b/main/img/icons/64/group_edit.png differ
diff --git a/main/img/icons/64/group_leave.png b/main/img/icons/64/group_leave.png
new file mode 100644
index 0000000000..020db3880f
Binary files /dev/null and b/main/img/icons/64/group_leave.png differ
diff --git a/main/img/icons/64/group_na.png b/main/img/icons/64/group_na.png
index 06188ad466..009318d1fa 100755
Binary files a/main/img/icons/64/group_na.png and b/main/img/icons/64/group_na.png differ
diff --git a/main/img/icons/64/invitation_friend.png b/main/img/icons/64/invitation_friend.png
new file mode 100644
index 0000000000..8c3564c283
Binary files /dev/null and b/main/img/icons/64/invitation_friend.png differ
diff --git a/main/img/icons/64/waiting_list.png b/main/img/icons/64/waiting_list.png
new file mode 100644
index 0000000000..d4429e4a0b
Binary files /dev/null and b/main/img/icons/64/waiting_list.png differ
diff --git a/main/img/icons/svg/group_na.svg b/main/img/icons/svg/group_na.svg
index 8a8d0b359c..5254917217 100644
--- a/main/img/icons/svg/group_na.svg
+++ b/main/img/icons/svg/group_na.svg
@@ -13,9 +13,9 @@
version="1.0"
width="128"
height="128"
-viewBox="0 0 128 128"
+ viewBox="0 0 128 128"
id="svg43586"
- inkscape:version="0.91 r"
+ inkscape:version="0.91 r13725"
sodipodi:docname="group_na.svg">