Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder

Browse source
This commit is contained in:
Albert Santoni 2015-08-27 19:04:18 -04:00
commit 099fc0107e
17 changed files with 496 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

128
airtime_mvc/public/css/addmedia.css
View file

@ -1,21 +1,48 @@
@CHARSET "UTF-8";
#recent_uploads > .dataTables_scrolling
{
top: 41px;
bottom: 8px;
}
#recent_uploads_wrapper
{
position: relative;
min-height: 500px;
/*min-height: 500px;*/
}
#recent_uploads_table
{
width: 100%;
table-layout: fixed;
border: 0;
/*table-layout: fixed;*/
}
#recent_uploads_table_wrapper
{
position: absolute;
left: 8px;
right: 8px;
bottom: 0;
top: 0;
border: 1px solid #5b5b5b;
}
#recent_uploads_table_wrapper > .fg-toolbar
{
position: absolute;
left: 0;
right: 0;
bottom: 0;
border: none;
}
#recent_uploads_table_wrapper > .fg-toolbar:after
{
content: none;
}
table#recent_uploads_table td
@ -26,7 +53,7 @@ table#recent_uploads_table td
#recent_uploads_filter
{
float: right;
margin-top: 10px;
margin-top: 5px;
margin-right: 3px;
}
#recent_uploads_table_length
@ -260,16 +287,29 @@ table#recent_uploads_table td
}
}
#upload_wrapper {
height: 100%;
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
-webkit-flex-flow: column;
flex-flow: column;
}
.dropzone, .dropzone * {
box-sizing: border-box
}
.dropzone {
min-height: 30%;
flex: 1 100%;
/*min-height: 30%;*/
border: 2px solid rgba(0, 0, 0, 0.3);
background: #333;
padding: 20px 20px;
max-height: 75%;
/*max-height: 75%;*/
overflow-y: auto;
}
@ -286,7 +326,8 @@ table#recent_uploads_table td
}
.dropzone.dz-started .dz-message {
display: none
margin-bottom: 16px;
/*display: none*/
}
.dropzone.dz-drag-hover {
@ -318,23 +359,25 @@ table#recent_uploads_table td
.dropzone .dz-preview {
position: relative;
display: inline-block;
/* display: inline-block; */
vertical-align: top;
margin: 16px;
margin-bottom: 16px;
width: 100%;
}
.dropzone .dz-preview:hover {
z-index: 1000
z-index: 1000;
}
.dropzone .dz-preview:hover .dz-details {
opacity: 1
opacity: 1;
}
.dropzone .dz-preview.dz-file-preview .dz-image {
border-radius: 3px;
background: #444;
/*background: linear-gradient(to bottom, #eee, #ddd)*/
/* background: linear-gradient(to bottom, #eee, #ddd); */
width: 100%;
}
.dropzone .dz-preview.dz-file-preview .dz-details {
@ -354,11 +397,14 @@ table#recent_uploads_table td
}
.dropzone .dz-preview .dz-remove {
font-size: 14px;
/*font-size: 14px;*/
text-align: center;
display: block;
cursor: pointer;
border: none
border: none;
color: #efefef;
float: right;
}
.dropzone .dz-preview .dz-remove:hover {
@ -378,7 +424,7 @@ table#recent_uploads_table td
font-size: 13px;
min-width: 100%;
max-width: 100%;
padding: 1em 1em;
padding: 1em 1em 0;
text-align: left;
color: rgba(0, 0, 0, 0.9);
/*line-height: 150%*/
@ -395,8 +441,8 @@ table#recent_uploads_table td
}
.dropzone .dz-preview .dz-details .dz-filename:hover span {
border: 1px solid rgba(200, 200, 200, 0.8);
background-color: rgba(255, 255, 255, 0.8)
/*border: 1px solid rgba(200, 200, 200, 0.8);*/
/*background-color: rgba(255, 255, 255, 0.8)*/
}
.dropzone .dz-preview .dz-details .dz-filename:not(:hover) {
@ -405,11 +451,12 @@ table#recent_uploads_table td
}
.dropzone .dz-preview .dz-details .dz-filename:not(:hover) span {
border: 1px solid transparent
/*border: 1px solid transparent*/
}
.dropzone .dz-preview .dz-details .dz-filename span, .dropzone .dz-preview .dz-details .dz-size span {
background-color: rgba(255, 255, 255, 0.4);
color: #efefef;
/*background-color: rgba(255, 255, 255, 0.4);*/
padding: 0 0.4em;
border-radius: 3px
}
@ -461,7 +508,7 @@ table#recent_uploads_table td
z-index: 500;
position: absolute;
display: block;
top: 50%;
top: 33px;
left: 50%;
margin-left: -27px;
margin-top: -27px
@ -469,8 +516,10 @@ table#recent_uploads_table td
.dropzone .dz-preview .dz-success-mark svg, .dropzone .dz-preview .dz-error-mark svg {
display: block;
width: 54px;
height: 54px
/*width: 54px;*/
/*height: 54px*/
width: 27px;
height: 27px
}
.dropzone .dz-preview.dz-processing .dz-progress {
@ -543,10 +592,9 @@ table#recent_uploads_table td
.dropzone .dz-preview .dz-error-message {
pointer-events: none;
z-index: 1000;
position: absolute;
display: block;
position: relative;
display: none;
opacity: 0;
/* opacity: 0; */
-webkit-transition: opacity 0.3s ease;
-moz-transition: opacity 0.3s ease;
-ms-transition: opacity 0.3s ease;
@ -554,23 +602,29 @@ table#recent_uploads_table td
transition: opacity 0.3s ease;
border-radius: 8px;
font-size: 13px;
top: 130px;
left: -10px;
width: 140px;
/* top: 130px; */
top: -27px;
/*left: -10px;*/
left: 33px;
/* width: 140px; */
background: #be2626;
background: linear-gradient(to bottom, #be2626, #a92222);
padding: 0.5em 1.2em;
color: white
color: white;
}
.dropzone .dz-preview .dz-error-message:after {
content: '';
position: absolute;
top: -6px;
left: 64px;
width: 0;
height: 0;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid #be2626
content: none;
/*content: '';*/
/*position: absolute;*/
/*/!*top: -6px;*!/*/
/*top: 10px;*/
/*/!*left: 64px;*!/*/
/*left: -8px;*/
/*width: 0;*/
/*height: 0;*/
/*border-left: 6px solid transparent;*/
/*border-right: 6px solid transparent;*/
/*border-bottom: 6px solid #be2626;*/
/*transform: rotate(-90deg);*/
}

3
airtime_mvc/public/css/dashboard.css
View file

@ -165,6 +165,7 @@ thead th.ui-state-default:focus {
left: -420px;
padding: 5px;
margin-top: -2px;
z-index: 1005;
}
#advanced_search label, #advanced_search span {
@ -190,7 +191,7 @@ thead th.ui-state-default:focus {
#advanced-options {
float: right;
z-index: 1;
z-index: 1004;
}
#advanced-options > button {

44
airtime_mvc/public/css/styles.css
View file

@ -2120,7 +2120,7 @@ span.errors.sp-errors{
overflow:auto;
}
.text-content {
padding:20px 10px 40px 58px;
padding: 10px 22px;
/*background: url(images/sf_arror.png) no-repeat 60% 0; */
min-height: 300px;
}
@ -2128,6 +2128,9 @@ span.errors.sp-errors{
font-size:2.4em;
color:#efefef;
}
.text-content h4 {
margin-bottom: 3px;
}
.text-content p {
font-size:1.6em;
line-height:140%;
@ -2149,7 +2152,7 @@ span.errors.sp-errors{
}
.text-content ol li {
margin:0 0 6px 0;
margin:15px 0 6px 0;
font-size:1.7em;
display:list-item;
color:#efefef;
@ -3529,6 +3532,10 @@ button.btn-icon-text > i.icon-white {
flex-flow: row wrap;
}
.ui-dialog-content input {
z-index: 1003;
}
.ui-dialog-content .media_type_selector {
padding-left: 0;
flex: 1 auto;
@ -3646,7 +3653,7 @@ button.btn-icon-text > i.icon-white {
#upload_form {
/* width: 100%;
min-width: 555px;*/
margin-bottom: 10px;
/*margin-bottom: 10px;*/
margin-right: 10px;
height: 100%;
position:relative;
@ -3745,6 +3752,19 @@ hr {
margin-right:4px
}
#uploads_disk_usage {
position: relative;
margin-top: 8px;
border-radius: 1px;
font-size: 14px;
text-align: center;
padding: 5px;
background-color: #242424;
border: 1px solid #5b5b5b;
color: #ccc;
flex: 0 0 auto;
}
#disk_usage {
border-radius: 1px;
/*position: fixed;
@ -3760,22 +3780,26 @@ hr {
}
.disk_usage_progress_bar {
width:118px;
height:13px;
background:#444444;
position: absolute;
left: 4px;
right: 4px;
/* width: 118px; */
height: 13px;
background: #444444;
background: -moz-linear-gradient(top, #464646 0, #3e3e3e 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3e3e3e), color-stop(100%, #464646));
margin: 0 auto;
/* margin: 0 auto; */
z-index: 1;
position:absolute;
}
.disk_usage_percent_in_use {
position: absolute;
left: 0;
right: 0;
color: #fff;
font-size: 10px;
z-index: 3;
position:absolute;
width: 120px;
/* width: 120px; */
line-height: 13px;
}