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 29d341fcf..87b99d758 100644
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/admin.css
@@ -25,11 +25,11 @@
/* 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');
+ src: url('../../fonts/ColabReg-webfont.eot');
+ src: url('../../fonts/ColabReg-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../../fonts/ColabReg-webfont.woff') format('woff'),
+ url('../../fonts/ColabReg-webfont.ttf') format('truetype'),
+ url('../../fonts/ColabReg-webfont.svg#colaborate-regularregular') format('svg');
font-weight: normal;
font-style: normal;
@@ -37,11 +37,11 @@
@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');
+ src: url('../../fonts/ColabMed-webfont.eot');
+ src: url('../../fonts/ColabMed-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../../fonts/ColabMed-webfont.woff') format('woff'),
+ url('../../fonts/ColabMed-webfont.ttf') format('truetype'),
+ url('../../fonts/ColabMed-webfont.svg#colaborate-mediumregular') format('svg');
font-weight: normal;
font-style: normal;
@@ -49,11 +49,59 @@
@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');
+ src: url('../../fonts/ColabBol-webfont.eot');
+ src: url('../../fonts/ColabBol-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../../fonts/ColabBol-webfont.woff') format('woff'),
+ url('../../fonts/ColabBol-webfont.ttf') format('truetype'),
+ url('../../fonts/ColabBol-webfont.svg#colaborate-boldregular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+@font-face {
+ font-family: 'DejaVuSansMono';
+ src: url('../../fonts/DejaVuSansMono-webfont.eot');
+ src: url('../../fonts/DejaVuSansMono-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../../fonts/DejaVuSansMono-webfont.woff') format('woff'),
+ url('../../fonts/DejaVuSansMono-webfont.ttf') format('truetype'),
+ url('../../fonts/DejaVuSansMono-webfont.svg#dejavu_sans_monobook') format('svg');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+@font-face {
+ font-family: 'DejaVuSansMono-Bold';
+ src: url('../../fonts/DejaVuSansMono-Bold-webfont.eot');
+ src: url('../../fonts/DejaVuSansMono-Bold-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../../fonts/DejaVuSansMono-Bold-webfont.woff') format('woff'),
+ url('../../fonts/DejaVuSansMono-Bold-webfont.ttf') format('truetype'),
+ url('../../fonts/DejaVuSansMono-Bold-webfont.svg#dejavu_sans_monobold') format('svg');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+@font-face {
+ font-family: 'dejavu_sans_monobold_oblique';
+ src: url('DejaVuSansMono-BoldOblique-webfont.eot');
+ src: url('DejaVuSansMono-BoldOblique-webfont.eot?#iefix') format('embedded-opentype'),
+ url('DejaVuSansMono-BoldOblique-webfont.woff') format('woff'),
+ url('DejaVuSansMono-BoldOblique-webfont.ttf') format('truetype'),
+ url('DejaVuSansMono-BoldOblique-webfont.svg#dejavu_sans_monobold_oblique') format('svg');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+@font-face {
+ font-family: 'dejavu_sans_monooblique';
+ src: url('DejaVuSansMono-Oblique-webfont.eot');
+ src: url('DejaVuSansMono-Oblique-webfont.eot?#iefix') format('embedded-opentype'),
+ url('DejaVuSansMono-Oblique-webfont.woff') format('woff'),
+ url('DejaVuSansMono-Oblique-webfont.ttf') format('truetype'),
+ url('DejaVuSansMono-Oblique-webfont.svg#dejavu_sans_monooblique') format('svg');
font-weight: normal;
font-style: normal;
@@ -61,8 +109,7 @@
/* Schriften Ende */
/* Colors */
-h1, h2, h3
-{
+h1, h2, h3 {
margin: 0;
color: #4a4a4a;
}
@@ -73,7 +120,7 @@ h1, h2, h3
padding: 0em;
}
-html, body{
+html, body {
margin: 0;
border: 0;
padding: 0;
@@ -83,7 +130,7 @@ html, body{
color: #4a4a4a;
background-color: #e6e4f2;
background-image: none;
- font-family: 'colaborate-regularregular', Verdana, Helvetica, Arial, sans-serif;
+ font-family: 'DejaVuSansMono', Verdana, Helvetica, Arial, sans-serif;
font-size: 1em;
line-height: 1em;
}
@@ -94,7 +141,7 @@ h1 {
}
h2 {
- font-family: 'colaborate-regularregular',Verdana,Helvetica,Arial,sans-serif;
+ font-family: 'DejaVuSansMono',Verdana,Helvetica,Arial,sans-serif;
color: #4a4a4a;
font-weight: bold;
line-height: 1.5em;
@@ -133,6 +180,7 @@ table.htmlarea td.toolbarElement {
width: 100%;
min-height: 100%;
overflow-x: auto;
+ overflow-y: hidden;
position:absolute;
}
@@ -246,12 +294,12 @@ div#tabs {
div#bebopTabbedPane a {
color: #ffffff !important;
- font-family: 'colaborate-boldregular';
- font-size: 12pt;
+ font-family: 'colaborate-regularregular', Verdana, Helvetica, Arial, sans-serif;
+ font-size: 1.2em;
}
span.bebopTab {
- margin: 0 -0.7em 0 0;
+ margin: 0 -1.5em 0 0;
border-top-left-radius: 0.5em;
border-top-right-radius: 0.5em;
padding: 0.4em;
@@ -271,8 +319,9 @@ span.bebopTab:hover {
span.bebopTab.current {
color: #ffffff;
background-color: #4a4747;
- font-family: 'colaborate-boldregular';
- font-size: 12pt;
+ margin: 0 -1.25em 0 0;
+ font-family: 'colaborate-mediumregular', Verdana, Helvetica, Arial, sans-serif;
+ font-size: 1.2em;
}
div#bebopTabbedPane span:before {
@@ -452,7 +501,7 @@ div#right div.columnHead {
width: 100%;
height: 30px;
color: #ffffff;
- font-size: 0.75em;
+ font-size: 0.7em;
}
div#left div.columnContent {
@@ -526,7 +575,8 @@ div#right div.columnHead .contenttitle h1 {
border: none;
font:inherit;
color: inherit;
- text-transform: none;;
+ text-transform: none;
+ font-size: 1.1em;
}
/*
@@ -556,6 +606,7 @@ span#contenttype {
float: left;
line-height: 30px;
padding: 0 1em;
+ font-size: 1.1em;
}
span#workflowwidget {
@@ -1107,7 +1158,7 @@ h3.bebopSegmentHeader{
}
h3 {
- font-family: 'colaborate-regularregular',Verdana, Helvetica, Arial, sans-serif;
+ font-family: 'DejaVuSansMono',Verdana, Helvetica, Arial, sans-serif;
margin-top: 15px;
margin-bottom: 0.5em;
padding: 0em;
@@ -1379,7 +1430,7 @@ div#cmsFooter{
height: 30px;
color: #a4a4a4;
background-color: #29272a;
- font-size: 0.8em;
+ font-size: 0.72em;
}
div#cmsFooter .systemInformation {
@@ -1499,8 +1550,8 @@ input#draft_search:active {
min-height: inherit;
color: #4a4a4a;
background-color: inherit;
- line-height: 1.5em;
- font-family: 'colaborate-regularregular',Verdana, Helvetica, Arial, sans-serif;
+ line-height: 1.75em;
+ font-family: 'DejaVuSansMono',Verdana, Helvetica, Arial, sans-serif;
}
/*momentan für die Inhalt von Content*/
@@ -1626,7 +1677,7 @@ table span.hint{
.hint {
padding-left: 2px;
font-size: 1.1em;
- font-family: 'colaborate-boldregular', Verdana, Helvetica, Arial, sans-serif;
+ font-family: 'DejaVuSansMono-Bold', Verdana, Helvetica, Arial, sans-serif;
font-weight: bold;
}
@@ -1641,7 +1692,7 @@ table span.hint{
width: 30%;
font-size: 0.65em;
z-index: 65535;
- font-family: 'colaborate-regularregular', Verdana, Helvetica, Arial, sans-serif;
+ font-family: 'DejaVuSansMono', 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);
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 94c468f6d..6cbe5eab8 100644
--- a/ccm-sci-bundle/web/themes/mandalay/css/screen/public.css
+++ b/ccm-sci-bundle/web/themes/mandalay/css/screen/public.css
@@ -414,7 +414,7 @@ body,
#footer .logo img,
#footer .menu img
{
- filter: url('../../../images/filters.svg#grayscale'); /* Firefox 3.5+ */
+ filter: url('../../images/filters.svg#grayscale'); /* Firefox 3.5+ */
filter: gray; /* IE6-9 */
-webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */
}
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.eot b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.eot
new file mode 100644
index 000000000..36cc1723e
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.eot differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.svg b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.svg
new file mode 100644
index 000000000..aad89d29e
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.svg
@@ -0,0 +1,2982 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.ttf b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.ttf
new file mode 100644
index 000000000..b70f02dfd
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.ttf differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.woff b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.woff
new file mode 100644
index 000000000..fb9266269
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Bold-webfont.woff differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.eot b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.eot
new file mode 100644
index 000000000..e6afcce5e
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.eot differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.svg b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.svg
new file mode 100644
index 000000000..bc742a59f
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.svg
@@ -0,0 +1,2377 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.ttf b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.ttf
new file mode 100644
index 000000000..1e33effd4
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.ttf differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.woff b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.woff
new file mode 100644
index 000000000..8a67563bf
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-BoldOblique-webfont.woff differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.eot b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.eot
new file mode 100644
index 000000000..f70aaf515
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.eot differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.svg b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.svg
new file mode 100644
index 000000000..6dfb12528
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.svg
@@ -0,0 +1,2504 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.ttf b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.ttf
new file mode 100644
index 000000000..44a47e764
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.ttf differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.woff b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.woff
new file mode 100644
index 000000000..96247734c
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-Oblique-webfont.woff differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.eot b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.eot
new file mode 100644
index 000000000..34443480f
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.eot differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.svg b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.svg
new file mode 100644
index 000000000..7a0db7bfc
--- /dev/null
+++ b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.svg
@@ -0,0 +1,3171 @@
+
+
+
\ No newline at end of file
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.ttf b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.ttf
new file mode 100644
index 000000000..aca46cbd6
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.ttf differ
diff --git a/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.woff b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.woff
new file mode 100644
index 000000000..011204356
Binary files /dev/null and b/ccm-sci-bundle/web/themes/mandalay/fonts/DejaVuSansMono-webfont.woff differ