Last changes from sidoine for the content-center

git-svn-id: https://svn.libreccm.org/ccm/trunk@2815 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-08-17 07:23:49 +00:00
parent 3836b0bb83
commit 0534926c6c
18 changed files with 11119 additions and 34 deletions

View File

@ -25,11 +25,11 @@
/* Schriften */ /* Schriften */
@font-face { @font-face {
font-family: 'colaborate-regularregular'; font-family: 'colaborate-regularregular';
src: url('ColabReg-webfont.eot'); src: url('../../fonts/ColabReg-webfont.eot');
src: url('ColabReg-webfont.eot?#iefix') format('embedded-opentype'), src: url('../../fonts/ColabReg-webfont.eot?#iefix') format('embedded-opentype'),
url('ColabReg-webfont.woff') format('woff'), url('../../fonts/ColabReg-webfont.woff') format('woff'),
url('ColabReg-webfont.ttf') format('truetype'), url('../../fonts/ColabReg-webfont.ttf') format('truetype'),
url('ColabReg-webfont.svg#colaborate-regularregular') format('svg'); url('../../fonts/ColabReg-webfont.svg#colaborate-regularregular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
@ -37,11 +37,11 @@
@font-face { @font-face {
font-family: 'colaborate-mediumregular'; font-family: 'colaborate-mediumregular';
src: url('ColabMed-webfont.eot'); src: url('../../fonts/ColabMed-webfont.eot');
src: url('ColabMed-webfont.eot?#iefix') format('embedded-opentype'), src: url('../../fonts/ColabMed-webfont.eot?#iefix') format('embedded-opentype'),
url('ColabMed-webfont.woff') format('woff'), url('../../fonts/ColabMed-webfont.woff') format('woff'),
url('ColabMed-webfont.ttf') format('truetype'), url('../../fonts/ColabMed-webfont.ttf') format('truetype'),
url('ColabMed-webfont.svg#colaborate-mediumregular') format('svg'); url('../../fonts/ColabMed-webfont.svg#colaborate-mediumregular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
@ -49,11 +49,59 @@
@font-face { @font-face {
font-family: 'colaborate-boldregular'; font-family: 'colaborate-boldregular';
src: url('ColabBol-webfont.eot'); src: url('../../fonts/ColabBol-webfont.eot');
src: url('ColabBol-webfont.eot?#iefix') format('embedded-opentype'), src: url('../../fonts/ColabBol-webfont.eot?#iefix') format('embedded-opentype'),
url('ColabBol-webfont.woff') format('woff'), url('../../fonts/ColabBol-webfont.woff') format('woff'),
url('ColabBol-webfont.ttf') format('truetype'), url('../../fonts/ColabBol-webfont.ttf') format('truetype'),
url('ColabBol-webfont.svg#colaborate-boldregular') format('svg'); 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-weight: normal;
font-style: normal; font-style: normal;
@ -61,8 +109,7 @@
/* Schriften Ende */ /* Schriften Ende */
/* Colors */ /* Colors */
h1, h2, h3 h1, h2, h3 {
{
margin: 0; margin: 0;
color: #4a4a4a; color: #4a4a4a;
} }
@ -83,7 +130,7 @@ html, body{
color: #4a4a4a; color: #4a4a4a;
background-color: #e6e4f2; background-color: #e6e4f2;
background-image: none; background-image: none;
font-family: 'colaborate-regularregular', Verdana, Helvetica, Arial, sans-serif; font-family: 'DejaVuSansMono', Verdana, Helvetica, Arial, sans-serif;
font-size: 1em; font-size: 1em;
line-height: 1em; line-height: 1em;
} }
@ -94,7 +141,7 @@ h1 {
} }
h2 { h2 {
font-family: 'colaborate-regularregular',Verdana,Helvetica,Arial,sans-serif; font-family: 'DejaVuSansMono',Verdana,Helvetica,Arial,sans-serif;
color: #4a4a4a; color: #4a4a4a;
font-weight: bold; font-weight: bold;
line-height: 1.5em; line-height: 1.5em;
@ -133,6 +180,7 @@ table.htmlarea td.toolbarElement {
width: 100%; width: 100%;
min-height: 100%; min-height: 100%;
overflow-x: auto; overflow-x: auto;
overflow-y: hidden;
position:absolute; position:absolute;
} }
@ -246,12 +294,12 @@ div#tabs {
div#bebopTabbedPane a { div#bebopTabbedPane a {
color: #ffffff !important; color: #ffffff !important;
font-family: 'colaborate-boldregular'; font-family: 'colaborate-regularregular', Verdana, Helvetica, Arial, sans-serif;
font-size: 12pt; font-size: 1.2em;
} }
span.bebopTab { span.bebopTab {
margin: 0 -0.7em 0 0; margin: 0 -1.5em 0 0;
border-top-left-radius: 0.5em; border-top-left-radius: 0.5em;
border-top-right-radius: 0.5em; border-top-right-radius: 0.5em;
padding: 0.4em; padding: 0.4em;
@ -271,8 +319,9 @@ span.bebopTab:hover {
span.bebopTab.current { span.bebopTab.current {
color: #ffffff; color: #ffffff;
background-color: #4a4747; background-color: #4a4747;
font-family: 'colaborate-boldregular'; margin: 0 -1.25em 0 0;
font-size: 12pt; font-family: 'colaborate-mediumregular', Verdana, Helvetica, Arial, sans-serif;
font-size: 1.2em;
} }
div#bebopTabbedPane span:before { div#bebopTabbedPane span:before {
@ -452,7 +501,7 @@ div#right div.columnHead {
width: 100%; width: 100%;
height: 30px; height: 30px;
color: #ffffff; color: #ffffff;
font-size: 0.75em; font-size: 0.7em;
} }
div#left div.columnContent { div#left div.columnContent {
@ -526,7 +575,8 @@ div#right div.columnHead .contenttitle h1 {
border: none; border: none;
font:inherit; font:inherit;
color: inherit; color: inherit;
text-transform: none;; text-transform: none;
font-size: 1.1em;
} }
/* /*
@ -556,6 +606,7 @@ span#contenttype {
float: left; float: left;
line-height: 30px; line-height: 30px;
padding: 0 1em; padding: 0 1em;
font-size: 1.1em;
} }
span#workflowwidget { span#workflowwidget {
@ -1107,7 +1158,7 @@ h3.bebopSegmentHeader{
} }
h3 { h3 {
font-family: 'colaborate-regularregular',Verdana, Helvetica, Arial, sans-serif; font-family: 'DejaVuSansMono',Verdana, Helvetica, Arial, sans-serif;
margin-top: 15px; margin-top: 15px;
margin-bottom: 0.5em; margin-bottom: 0.5em;
padding: 0em; padding: 0em;
@ -1379,7 +1430,7 @@ div#cmsFooter{
height: 30px; height: 30px;
color: #a4a4a4; color: #a4a4a4;
background-color: #29272a; background-color: #29272a;
font-size: 0.8em; font-size: 0.72em;
} }
div#cmsFooter .systemInformation { div#cmsFooter .systemInformation {
@ -1499,8 +1550,8 @@ input#draft_search:active {
min-height: inherit; min-height: inherit;
color: #4a4a4a; color: #4a4a4a;
background-color: inherit; background-color: inherit;
line-height: 1.5em; line-height: 1.75em;
font-family: 'colaborate-regularregular',Verdana, Helvetica, Arial, sans-serif; font-family: 'DejaVuSansMono',Verdana, Helvetica, Arial, sans-serif;
} }
/*momentan für die Inhalt von Content*/ /*momentan für die Inhalt von Content*/
@ -1626,7 +1677,7 @@ table span.hint{
.hint { .hint {
padding-left: 2px; padding-left: 2px;
font-size: 1.1em; 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; font-weight: bold;
} }
@ -1641,7 +1692,7 @@ table span.hint{
width: 30%; width: 30%;
font-size: 0.65em; font-size: 0.65em;
z-index: 65535; 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: 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-gradient(linear,left top,left bottom,color-stop(0, #eeeeee),color-stop(1, #cccccc));
background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc); background-image: -webkit-linear-gradient(top, #eeeeee, #cccccc);

View File

@ -414,7 +414,7 @@ body,
#footer .logo img, #footer .logo img,
#footer .menu 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 */ filter: gray; /* IE6-9 */
-webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */ -webkit-filter: grayscale(1); /* Google Chrome & Safari 6+ */
} }

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 812 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 621 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 640 KiB

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 843 KiB