Skip to content
Snippets Groups Projects
Commit 1dde2ac5 authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 9.3.4 to OpenOLAT default branch with 09f4541279407a7aef6300b0f7c3a5a6b7c079b3

parents ff887c7c 16b6521a
No related branches found
No related tags found
No related merge requests found
...@@ -68,3 +68,4 @@ c153549f29242341b62b8a326638daea237093e3 OpenOLAT 9.0.6 ...@@ -68,3 +68,4 @@ c153549f29242341b62b8a326638daea237093e3 OpenOLAT 9.0.6
28817215e627c3d7d9d0e805047a828a95fb4c13 OpenOLAT 9.3.1 28817215e627c3d7d9d0e805047a828a95fb4c13 OpenOLAT 9.3.1
cee7299c2b62edf89f6164ab81f3b785a234f95b OpenOLAT 9.3.2 cee7299c2b62edf89f6164ab81f3b785a234f95b OpenOLAT 9.3.2
4b1f3cb4957afcae660aa0823fa96aedf55a9382 OpenOLAT 9.3.3 4b1f3cb4957afcae660aa0823fa96aedf55a9382 OpenOLAT 9.3.3
4e992c6a31e099192c90eb5f364950bd34cc7741 OpenOLAT 9.3.4
...@@ -860,7 +860,7 @@ ldap.attrib.sync.once.olatkey3= ...@@ -860,7 +860,7 @@ ldap.attrib.sync.once.olatkey3=
# Build properties # Build properties
##### #####
application.name=OpenOLAT application.name=OpenOLAT
build.version=9.4.0a build.version=9.4.0b
build.identifier=openolat940-dev build.identifier=openolat940-dev
build.repo.revision=local-devel build.repo.revision=local-devel
......
...@@ -28,7 +28,7 @@ div.searchitem select, div.searchitem input { width: 250px; } ...@@ -28,7 +28,7 @@ div.searchitem select, div.searchitem input { width: 250px; }
.o_members_register_active { font-weight: bold; font-size: 120%; } .o_members_register_active { font-weight: bold; font-size: 120%; }
div.o_members_paging { width: 100%; padding-bottom: 1em; padding-top: 0.5em; text-align: center; } div.o_members_paging { width: 100%; padding-bottom: 1em; padding-top: 0.5em; text-align: center; }
div.o_members_paging div { padding-left: 1em; padding-right: 1em; display: inline; } div.o_members_paging div { padding-left: 1em; padding-right: 1em; display: inline; }
div.o_bcard { background-color: #eee; margin-top: 10px; @include o-border-radius(6px); } div.o_bcard { background-color: #eee; margin-top: 10px; @include o-border-radius(6px); }
div.o_bcard_header, div.o_members_header {padding: 6px; border-bottom:1px solid #fff; } div.o_bcard_header, div.o_members_header {padding: 6px; border-bottom:1px solid #fff; }
div.o_bcard_portrait { div.o_bcard_portrait {
...@@ -342,6 +342,7 @@ div.o_notifications_news_subscription { ...@@ -342,6 +342,7 @@ div.o_notifications_news_subscription {
h4 { font-size: 110%; } h4 { font-size: 110%; }
h4.o_returnbox_icon { background-image: url(../openolat/images/box_return.png) !important; } h4.o_returnbox_icon { background-image: url(../openolat/images/box_return.png) !important; }
h4.o_dropbox_icon { background-image: url(../openolat/images/box_drop.png) !important; } h4.o_dropbox_icon { background-image: url(../openolat/images/box_drop.png) !important; }
h4.o_solution_icon { background-image: url(../openolat/images/box_solution.png) !important; }
} }
div.o_notifications_news_context { color: #7D7D7D; font-size: 90%; } div.o_notifications_news_context { color: #7D7D7D; font-size: 90%; }
div.o_notifications_news_content { div.o_notifications_news_content {
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment