Merge from booking branch

This commit is contained in:
Paul Schneider 2015-11-17 22:22:59 +01:00
commit 9a2652739b
266 changed files with 12833 additions and 2337 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 312 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 394 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 368 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 332 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 327 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 392 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

After

Width:  |  Height:  |  Size: 312 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 394 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 368 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 332 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 327 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 392 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Before After
Before After

View file

@ -1,14 +1,12 @@
body {
background-color: black;
color: #D0FFD0;
font-family: 'Arial', cursive;
padding: 0;
margin: 0;
}
.tagname { color: #D0FFD0; }
.tagname+.tagname:before { content: ', '; }
.tagname:hover { background-color: red; cursor:pointer; }
.tagname:hover { cursor:pointer; }
/* Start by setting display:none to make this hidden.
Then we position it in relation to the viewport window
@ -36,6 +34,7 @@ body {
left: 0;
right: 0;
width: 100%;
max-height: 100%;
overflow-y: auto;
overflow-x: hidden;
}
@ -49,67 +48,21 @@ body.loading .modal {
}
.iconsmall { max-height: 1.3em; max-width: 1.3em; }
input, textarea, checkbox {
color: #FFFFA0;
background-color: black;
}
.photo { width: 100%; }
.blogbanner { float: left; top:0; }
.subtitle { font-size:small; font-style: italic; }
header {
transition: margin 2s, padding 2s;
padding: 0;
margin: 0;
padding-top: 2em;
padding-bottom:2em;
display: block;
background: url("/App_Themes/images/star-939235_1280.jpg") -3em -3em no-repeat fixed;
}
header h1, header a {
transition:padding 2s;
background-color: rgba(0,0,0,.5);
margin:0; padding:1em;
}
nav {
transition: margin 2s, padding 2s;
margin: 2em;
padding: 2em;
display: block;
border-radius:1em;
background: url("/App_Themes/images/helix-nebula-1400x1400.s.jpg") 50% 10% repeat fixed ;
justify-content: space-around;
}
nav li { display: inline-block; }
main {
transition: margin 2s, padding 2s;
margin: 2em;
padding: 2em;
display: block;
border-radius:1em;
background: url("/App_Themes/images/p8-av4.png") 50% 20em no-repeat fixed ;
}
footer {
transition: margin 2s, padding 2s;
background: url("/App_Themes/images/helix-nebula-1400x1400.s.jpg") 50% 90% repeat fixed ;
margin: 0;
margin-top: 2em;
padding: 2em;
display: block;
clear: both;
font-size: smaller;
justify-content: space-around;
}
footer a {
border-radius:1em;
padding:1em;
}
legend {
border-radius:5px;
padding:.5em;
background-color: rgba(0,0,32,.5);
}
#copyr { text-align: center; display: block; background-color: rgba(20,20,20,.8); }
footer p { display:inline-block; }
@ -126,179 +79,30 @@ fieldset {
border-radius:5px; border: solid 1px #000060;
}
main video, main img {
max-width:100%;
max-height:75%;
padding: 1em;
}
aside {
display: inline-block;
float: right;
max-width: 40em;
}
.postpreview {
display: inline-block;
max-width: 40em;
padding: 1em;
background-color: rgba(0,0,32,0.8);
border-radius:1em;
}
.postpreview video, .postpreview img {
max-width: 100%;
padding: 1em;
}
.post {
display:block;
padding: 1em;
background-color: rgba(0,0,32,0.8);
color: #eee;
border-radius:1em;
}
.hiddenpost { background-color: rgba(16,16,16,0.5); }
.fullwidth { width: 100%; }
textarea.fullwidth { min-height:10em; }
.thanks {
max-width: 10%;
text-align: center;
font-size:smaller;
display:inline;
bottom:0;
}
.panel {
display:inline-block;
}
.panel,.bshpanel, aside {
background-color: rgba(20,20,20,.8);
border-radius: 1em;
padding: 1em;
}
.spanel {
max-width: 18em;
display: inline-block;
padding: .3em;
}
.xspanel {
max-width:13em;
display: inline-block;
padding:.2em;
}
.xxspanel {
max-width:7em;
display: inline-block;
padding:.1em;
}
.hint {
display: inline;
font-style: italic;
font-size: smaller;
}
.hint::before {
content: "(";
}
.hint::after {
content: ")";
}
.usertitleref {
border-radius: 1em;
background-color:rgba(0,0,32,0.6);
font-family: 'Arial', cursive;
padding: 1em;
}
label {
font-size: medium;
}
.editable {
margin: .5em;
min-height:1em;
border-radius: 1em;
border: dashed rgb(020,20,256) 2px;
}
.notification {
font-size: large;
background-color: rgba(64,64,0,0.5);
border: solid green 1px;
padding: 1em;
border-radius:1em;
margin:1em;
padding:1em;
}
.dirty {
background-color: rgba(128,128,0,0.5);
}
.error, #error {
color: #f88;
font-size: large;
background-color: rgba(256,0,0,0.5);
}
.validation-summary-errors{
color: #f88;
background-color: rgba(256,0,0,0.5);
}
.hidden { display:none; }
ul.preview li:nth-child(-n+10) {
display:inline;
font-size:xx-small;
}
ul.preview li:nth-child(n) {
display:none;
}
.validation-summary-errors{
color: #f88;
}
a {
text-decoration: none;
}
.actionlink, .menuitem, a {
display:inline-block;
color: yellow;
border-radius:1em;
border: solid black 1px;
background-color: rgba(20,20,20,.8);
border-style: solid;
border-width:1px;
cursor: pointer;
font-family: 'Arial', cursive;
padding: 1em;
}
input, select, textarea {
color: white;
background-color:rgba(0,0,64,0.8);
border: solid 1px rgb(128,128,128);
border-radius:1em;
border-style: solid;
border-width:1px;
font-family: 'Arial', cursive;
}
a:hover {
background-color:rgba(30,0,124,0.9);
border: solid green 1px;
}
a:active {
background-color:rgba(124,0,32,0.9);
}
input:hover, textarea:hover {
color: white;
background-color:rgba(64,64,64,0.8);
}
.code {
font-family: "monospace";
background-color: rgba(0,0,256,0.1);
border-radius:25px;
white-space: pre-wrap;
}
#avatar {
float: left;
margin:1em;
@ -320,18 +124,31 @@ a:active {
padding:5px; margin:5px;
background-color: rgba(0,0,40,.8);
}
.input-validation-error { border: solid 1px red; }
.field-validation-error { color: red; }
.skillname {
padding:.5em;
margin:.25em;
max-width: 24em;
text-align: center;
display: inline-block;
background-color: rgba(16,16,64,0.8);
border-radius:1em;
border: solid 1px #aaf;
}
.input-validation-error { border: solid 1px red; background-color: rgba(180,256,256,.5); }
.field-validation-error { color: red; background-color: rgba(180,256,256,.5); }
.c2 { font-size: small; font-style: italic; }
.c3 { font-size: x-small; font-style: italic; }
.rate { width:5em; cursor: pointer; text-align:center; }
h2 select { font-size: large; }
@media print {
body {background-color:white;color:black;}
.control, .actionlink, .menuitem, nav { display:none;}
}
.bshpanel { display:block; }
.bshpanel { display: inline-block; }
.bsh { display: none; }
.c3 { display:initial; }
.c3-alt { display:none; }
@ -373,6 +190,8 @@ header h1, header a , .actionlink, .menuitem, a { padding:.5em;}
border-radius:.5em;
margin:.5em;
padding:.5em;
max-height: 100%;
overflow-y: auto;
}
.menuitem {
display: block;
@ -423,3 +242,4 @@ header h1, header a { padding:.2em;}
.c2-alt { display:initial; }
}