diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css
index 96f63d6cc..29d341fcf 100644
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css
@@ -22,6 +22,44 @@
/* EN CSS for the contentcenter */
/********************************/
+/* Schriften */
+@font-face {
+ font-family: 'colaborate-regularregular';
+ src: url('ColabReg-webfont.eot');
+ src: url('ColabReg-webfont.eot?#iefix') format('embedded-opentype'),
+ url('ColabReg-webfont.woff') format('woff'),
+ url('ColabReg-webfont.ttf') format('truetype'),
+ url('ColabReg-webfont.svg#colaborate-regularregular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+@font-face {
+ font-family: 'colaborate-mediumregular';
+ src: url('ColabMed-webfont.eot');
+ src: url('ColabMed-webfont.eot?#iefix') format('embedded-opentype'),
+ url('ColabMed-webfont.woff') format('woff'),
+ url('ColabMed-webfont.ttf') format('truetype'),
+ url('ColabMed-webfont.svg#colaborate-mediumregular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+@font-face {
+ font-family: 'colaborate-boldregular';
+ src: url('ColabBol-webfont.eot');
+ src: url('ColabBol-webfont.eot?#iefix') format('embedded-opentype'),
+ url('ColabBol-webfont.woff') format('woff'),
+ url('ColabBol-webfont.ttf') format('truetype'),
+ url('ColabBol-webfont.svg#colaborate-boldregular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+
+}
+/* Schriften Ende */
+
/* Colors */
h1, h2, h3
{
@@ -45,7 +83,7 @@ html, body{
color: #4a4a4a;
background-color: #e6e4f2;
background-image: none;
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: 'colaborate-regularregular', Verdana, Helvetica, Arial, sans-serif;
font-size: 1em;
line-height: 1em;
}
@@ -56,7 +94,7 @@ h1 {
}
h2 {
- font-family: Verdana,Helvetica,Arial,sans-serif;
+ font-family: 'colaborate-regularregular',Verdana,Helvetica,Arial,sans-serif;
color: #4a4a4a;
font-weight: bold;
line-height: 1.5em;
@@ -208,6 +246,8 @@ div#tabs {
div#bebopTabbedPane a {
color: #ffffff !important;
+ font-family: 'colaborate-boldregular';
+ font-size: 12pt;
}
span.bebopTab {
@@ -216,7 +256,7 @@ span.bebopTab {
border-top-right-radius: 0.5em;
padding: 0.4em;
white-space: nowrap;
- background-color: #4a4a4a;
+ background-color: #0776A0;
transition: all 0.5s ease;
-o-transition: all 0.5s ease;
-ie-transition: all 0.5s ease;
@@ -229,9 +269,10 @@ span.bebopTab:hover {
}
span.bebopTab.current {
- color: #656054;
- background-color: #e6e4f2;
- font-weight:bold;
+ color: #ffffff;
+ background-color: #4a4747;
+ font-family: 'colaborate-boldregular';
+ font-size: 12pt;
}
div#bebopTabbedPane span:before {
@@ -434,7 +475,7 @@ div#right div.columnContent > div {
}
div#content ul, div#content ol {
- margin: 0em;
+ margin-left: 2.5em;
}
/*----Left----*/
@@ -554,7 +595,7 @@ table {
border-bottom: 1px solid #999999;
border-collapse: separate;
border: none !important;
- border-spacing: 5pt;
+ /*border-spacing: 5pt;*/
}
div.toolbar table.toolbarRow {
@@ -572,7 +613,7 @@ table * table ,form table {
}
table thead tr th {
- padding-left: 0.9em;
+ /*padding-left: 0.9em;*/
color: #999999;
text-align: left;
background-color: #eeeeee;
@@ -881,6 +922,10 @@ span.cmsGlobalNavigationWorkspace :before {
content:url('../../images/cms/home.png');
}
+span.cmsGlobalNavigationAdminCenter :before {
+ content:url('../../images/cms/admin.png');
+}
+
span.cmsGlobalNavigationSignOut :before, span.logout :before {
content:url('../../images/cms/lock.png');
}
@@ -1062,7 +1107,7 @@ h3.bebopSegmentHeader{
}
h3 {
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: 'colaborate-regularregular',Verdana, Helvetica, Arial, sans-serif;
margin-top: 15px;
margin-bottom: 0.5em;
padding: 0em;
@@ -1455,7 +1500,7 @@ input#draft_search:active {
color: #4a4a4a;
background-color: inherit;
line-height: 1.5em;
- font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-family: 'colaborate-regularregular',Verdana, Helvetica, Arial, sans-serif;
}
/*momentan für die Inhalt von Content*/
@@ -1572,8 +1617,17 @@ div.bebopGridPanel{
margin-top: 15px;
}
+div.actionLink span.hint,
+h3.bebopSegmentHeader span.hint,
+table span.hint{
+ display: none;
+}
+
.hint {
- font-size: 1.6em;
+ padding-left: 2px;
+ font-size: 1.1em;
+ font-family: 'colaborate-boldregular', Verdana, Helvetica, Arial, sans-serif;
+ font-weight: bold;
}
.hint:hover:after {
@@ -1585,8 +1639,9 @@ div.bebopGridPanel{
top: auto;
right: auto;
width: 30%;
- font-size: 0.63em;
+ font-size: 0.65em;
z-index: 65535;
+ font-family: 'colaborate-regularregular', Verdana, Helvetica, Arial, sans-serif;
background-image: linear-gradient(top, #eeeeee, #cccccc);
background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0, #eeeeee),color-stop(1, #cccccc));
background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);
@@ -1595,10 +1650,10 @@ div.bebopGridPanel{
background-image: -o-linear-gradient(top, #eeeeee, #cccccc);
}
-ul.bebopTree li a[type="control"] {
+/*ul.bebopTree li a[type="control"] {
padding: 5px;
line-height: 2em;
-}
+}*/
#cmsHeader, #cmsFooter {
min-width: 1200px;
diff --git a/ccm-sci-bundle/web/themes/mandalay/css/screen/public.css b/ccm-sci-bundle/web/themes/mandalay/css/screen/public.css
index 2569bfe8b..cbb3af7f3 100644
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/public.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/public.css
@@ -40,7 +40,7 @@
/* Farben */
-h1, h2, h3,
+h1, h2, h3, h4, h5, h6,
#header .siteTitle,
.relatedLinks .CIname,
ul.sitemap a
@@ -552,8 +552,9 @@ h3 {
h4 {
margin-top: 1em;
font-family: 'Caption', sans-serif;
- font-size: 16pt;
+ font-size: 14pt;
font-weight: normal;
+ font-style: oblique;
}
h5 {
@@ -561,14 +562,14 @@ h5 {
padding: 0.5em 0em;
font-family: 'Caption', sans-serif;
font-weight: bold;
- font-size: 14pt;
+ font-size: 12pt;
}
h6 {
margin: 0.25em 0em 0.7em 0em;
- padding: 0.5em 0.7em;
+ padding: 0.5em 0em;
font-family: 'Caption', sans-serif;
- font-size: 14pt;
+ font-size: 11pt;
}
/* Absätze */
@@ -797,7 +798,7 @@ div.endFloat {
}
#content li {
- padding: 0.1em 0;
+ padding: 1em 0;
}
#content {
@@ -859,6 +860,11 @@ div.image {
box-shadow: 0 0 5px 0 #4a4a4a;
}
+#eventList div.image{
+ width: 70px;
+ height: 70px;
+}
+
div.image a {
display: block;
font-size: 0;
@@ -1030,6 +1036,12 @@ div.image .imageGallery:after {
}
/* Related Links */
+.relatedLinks {
+ border: 1px solid #DDD;
+ padding: 0px 20px 0px 10px;
+ margin-top: 20px;
+ border-radius: 10px;
+}
.relatedLinks h2 {
padding-left: 0.25em;
font-size: 12pt;
@@ -1052,6 +1064,15 @@ div.image .imageGallery:after {
width: 49%;
height: 8em;
font-family: 'TextCond', sans-serif;
+ background-color: #DDD;
+ padding: 5px;
+ border-radius: 4px;
+}
+
+#content .relatedLinks ul li {
+ list-style-type: none;
+ margin-top: 15px;
+ padding-left: 2px;
}
.relatedLinks li:nth-child(odd) {
@@ -1135,9 +1156,10 @@ div.image .imageGallery:after {
#itemList a.CIname {
display: block;
- margin: 0 290px 0 0;
+ margin: 0px;
font-family: 'Caption', sans-serif;
font-size: 12pt;
+ padding-left: 115px;
}
#events a.CIname {
@@ -1149,7 +1171,7 @@ div.image .imageGallery:after {
#itemList .intro {
display: block;
- margin: -0.8em 290px 0 0;
+ /*margin: -0.8em 290px 0 0;*/
}
#events .intro {
@@ -1169,6 +1191,7 @@ div.image .imageGallery:after {
#newsList .dateline {
height: 1em;
+ float: right;
}
#itemList .image {
@@ -1189,37 +1212,36 @@ div.image .imageGallery:after {
#events img {
position: absolute;
- left:-35%;
- top:-12.5%;
+ width: 70px;
+ height: 70px;
}
#eventList .dateline {
margin-top: 1em;
height: 4.8em;
+ float: right;
}
#eventList .day,
#eventList .month,
#eventList .year {
display: block;
+ font-size: 12pt;
}
#eventList .day {
font-family: 'Special', sans-serif;
- font-size: 30pt;
}
#eventList .month {
margin-top: -0.5em;
font-family: 'Caption', sans-serif;
- font-size: 16pt;
font-weight: bold;
}
#eventList .year {
margin-top: -0.4em;
font-family: 'Text', sans-serif;
- font-size: 16pt;
}
#eventList .separator,
@@ -1263,12 +1285,11 @@ div.image .imageGallery:after {
/*-------CT NewsItem--------*/
#content #newsDate {
- float: right;
- margin-top: 0.5em;
+ position: absolute;
+ top: 0;
+ right: 0;
padding: 1em;
background-color: #efefef;
- font-size: 0.8em;
- text-align: right;
}
#content #newsDate + .image {
@@ -1795,6 +1816,10 @@ ul.publicationsAuthorsList li {
clear:both;
}
+div#greetingitem {
+ position: relative;
+}
+
div#greetingitem div.editLink {
display: none;
}
@@ -1846,4 +1871,67 @@ form.filterControls span.categoryFilter{
form.filterControls input.submit {
display: block;
+}
+
+/*Gestaltung der Forum-Seite*/
+.forumMode
+{
+ background-color: #0976A0;
+}
+
+
+.forumTabbedPane{
+ margin-top: 20px;
+}
+
+.forumMode {
+ padding: 5px;
+}
+div.forumTabbedPane a{
+ color: #ffffff;
+}
+div.forumTabbedPane span.selected {
+/* Dunkles Orange */
+ color: #ff7600;
+}
+
+div.bebopPanelRow table{
+ border-spacing: 5pt;
+}
+
+tr:nth-child(odd) {
+ background:#ffffff;
+}
+
+tr:nth-child(even){
+ background:#f1f1f1;
+}
+
+.optionGroup{
+ display: block;
+}
+
+input[type="text"], textarea{
+ display: block;
+ margin-bottom: 10px;
+}
+
+form{
+ width: 90%;
+}
+
+#workspace{
+ margin-left: 14%;
+}
+
+.location{
+ font-size: 8pt;
+}
+
+#events, .fileAttachments, .notes, .relatedLinks{
+ margin-top: 10px;
+ border-top: 1px dashed #0776A0;
+}
+.text ol{
+ margin-left: 20px;
}
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.eot b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.eot
new file mode 100644
index 000000000..34c1490af
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.eot differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.svg b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.svg
new file mode 100644
index 000000000..247cca437
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.svg
@@ -0,0 +1,925 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.ttf b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.ttf
new file mode 100644
index 000000000..dfabcd95f
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.ttf differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.woff b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.woff
new file mode 100644
index 000000000..5aa5f2a84
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabBol-webfont.woff differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.eot b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.eot
new file mode 100644
index 000000000..f33976f33
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.eot differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.svg b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.svg
new file mode 100644
index 000000000..36210bed5
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.svg
@@ -0,0 +1,925 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.ttf b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.ttf
new file mode 100644
index 000000000..31ae513fc
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.ttf differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.woff b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.woff
new file mode 100644
index 000000000..d701f8355
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabMed-webfont.woff differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.eot b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.eot
new file mode 100644
index 000000000..587447326
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.eot differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.svg b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.svg
new file mode 100644
index 000000000..06eee59b6
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.svg
@@ -0,0 +1,925 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.ttf b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.ttf
new file mode 100644
index 000000000..0dba6e55c
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.ttf differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.woff b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.woff
new file mode 100644
index 000000000..de5a60215
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/ColabReg-webfont.woff differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/images/cms/admin.png b/ccm-sci-bundle/web/themes/mandalay/images/cms/admin.png
index 78fa33dc7..0b549220f 100755
Binary files a/ccm-sci-bundle/web/themes/mandalay/images/cms/admin.png and b/ccm-sci-bundle/web/themes/mandalay/images/cms/admin.png differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml b/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
index 0aebff534..a6e338e37 100755
--- a/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
+++ b/ccm-sci-bundle/web/themes/mandalay/settings/NewsItem.xml
@@ -23,6 +23,8 @@
true
+ true
+ false
true
300
300