Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
Rudi Grinberg
commit
44f3020709
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
|
|
@ -1,149 +1,154 @@
|
||||||
/*
|
/*
|
||||||
* jQuery contextMenu - Plugin for simple contextMenu handling
|
* jQuery contextMenu - Plugin for simple contextMenu handling
|
||||||
*
|
*
|
||||||
* Version: 1.5.2
|
* Version: 1.5.2
|
||||||
*
|
*
|
||||||
* Authors: Rodney Rehm, Addy Osmani (patches for FF)
|
* Authors: Rodney Rehm, Addy Osmani (patches for FF)
|
||||||
* Web: http://medialize.github.com/jQuery-contextMenu/
|
* Web: http://medialize.github.com/jQuery-contextMenu/
|
||||||
*
|
*
|
||||||
* Licensed under
|
* Licensed under
|
||||||
* MIT License http://www.opensource.org/licenses/mit-license
|
* MIT License http://www.opensource.org/licenses/mit-license
|
||||||
* GPL v3 http://opensource.org/licenses/GPL-3.0
|
* GPL v3 http://opensource.org/licenses/GPL-3.0
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.context-menu-list {
|
.context-menu-list {
|
||||||
margin:0;
|
margin:0;
|
||||||
padding:0;
|
padding:0;
|
||||||
|
|
||||||
min-width: 120px;
|
min-width: 120px;
|
||||||
max-width: 250px;
|
max-width: 250px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
|
|
||||||
border: 1px solid #333333;
|
border: 1px solid #333333;
|
||||||
background: #f0f0f0;
|
background: #f0f0f0;
|
||||||
|
|
||||||
-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
||||||
-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
||||||
-ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
-ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
||||||
-o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
-o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
||||||
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5);
|
||||||
|
|
||||||
font-family: Arial, Helvetica, sans-serif;
|
font-family: Arial, Helvetica, sans-serif;
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.context-menu-item {
|
.context-menu-item {
|
||||||
padding: 2px 5px;
|
padding: 2px 5px;
|
||||||
background-color: #f0f0f0;
|
background-color: #f0f0f0;
|
||||||
position: relative;
|
position: relative;
|
||||||
min-height: 18px;
|
min-height: 18px;
|
||||||
-moz-user-select: -moz-none;
|
-moz-user-select: -moz-none;
|
||||||
}
|
display: block;
|
||||||
|
width: 100%;
|
||||||
.context-menu-item.icon {
|
-moz-box-sizing: border-box;
|
||||||
padding: 2px 2px 2px 28px;
|
-webkit-box-sizing: border-box;
|
||||||
}
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
.context-menu-separator {
|
|
||||||
padding-bottom:0;
|
.context-menu-item.icon {
|
||||||
border-bottom: 1px solid #DDD;
|
padding: 2px 2px 2px 28px;
|
||||||
min-height: 2px;
|
}
|
||||||
}
|
|
||||||
|
.context-menu-separator {
|
||||||
.context-menu-item > label {
|
padding-bottom:0;
|
||||||
-moz-user-select: text;
|
border-bottom: 1px solid #DDD;
|
||||||
}
|
min-height: 2px;
|
||||||
|
}
|
||||||
.context-menu-item.hover {
|
|
||||||
cursor: pointer;
|
.context-menu-item > label {
|
||||||
background-color: #ff5d1a;
|
-moz-user-select: text;
|
||||||
}
|
}
|
||||||
|
|
||||||
.context-menu-item.disabled {
|
.context-menu-item.hover {
|
||||||
color: #666;
|
cursor: pointer;
|
||||||
}
|
background-color: #ff5d1a;
|
||||||
|
}
|
||||||
.context-menu-input.hover,
|
|
||||||
.context-menu-item.disabled.hover {
|
.context-menu-item.disabled {
|
||||||
cursor: default;
|
color: #666;
|
||||||
background-color: #EEE;
|
}
|
||||||
}
|
|
||||||
|
.context-menu-input.hover,
|
||||||
.context-menu-submenu:after {
|
.context-menu-item.disabled.hover {
|
||||||
content: ">";
|
cursor: default;
|
||||||
color: #666;
|
background-color: #EEE;
|
||||||
position: absolute;
|
}
|
||||||
top: 0;
|
|
||||||
right: 3px;
|
.context-menu-submenu:after {
|
||||||
z-index: 1;
|
content: ">";
|
||||||
}
|
color: #666;
|
||||||
|
position: absolute;
|
||||||
/* icons
|
top: 0;
|
||||||
#protip:
|
right: 3px;
|
||||||
In case you want to use sprites for icons (which I would suggest you do) have a look at
|
z-index: 1;
|
||||||
http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement
|
}
|
||||||
.context-menu-item.icon:before {}
|
|
||||||
*/
|
/* icons
|
||||||
.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
|
#protip:
|
||||||
.context-menu-item.icon-edit { background-image: url(images/icon_edit_cm.png); }
|
In case you want to use sprites for icons (which I would suggest you do) have a look at
|
||||||
.context-menu-item.icon-cut { background-image: url(images/icon_cut_cm.png); }
|
http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement
|
||||||
.context-menu-item.icon-copy { background-image: url(images/icon_copy_cm.png); }
|
.context-menu-item.icon:before {}
|
||||||
.context-menu-item.icon-paste { background-image: url(images/icon_paste_cm.png); }
|
*/
|
||||||
.context-menu-item.icon-delete { background-image: url(images/icon_delete_cm.png); }
|
.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; }
|
||||||
.context-menu-item.icon-quit { background-image: url(images/icon_door_cm.png); }
|
.context-menu-item.icon-edit { background-image: url(images/icon_edit_cm.png); }
|
||||||
.context-menu-item.icon-soundcloud { background-image: url(images/icon_soundcloud_cm.png); }
|
.context-menu-item.icon-cut { background-image: url(images/icon_cut_cm.png); }
|
||||||
|
.context-menu-item.icon-copy { background-image: url(images/icon_copy_cm.png); }
|
||||||
.context-menu-item.icon-download { background-image: url(images/icon_download_cm.png); }
|
.context-menu-item.icon-paste { background-image: url(images/icon_paste_cm.png); }
|
||||||
.context-menu-item.icon-overview { background-image: url(images/icon_overview_cm.png); }
|
.context-menu-item.icon-delete { background-image: url(images/icon_delete_cm.png); }
|
||||||
.context-menu-item.icon-play { background-image: url(images/icon_play_cm.png); }
|
.context-menu-item.icon-quit { background-image: url(images/icon_door_cm.png); }
|
||||||
.context-menu-item.icon-select-cursor { background-image: url(images/icon_select-cursor_cm.png); }
|
.context-menu-item.icon-soundcloud { background-image: url(images/icon_soundcloud_cm.png); }
|
||||||
.context-menu-item.icon-add-playlist { background-image: url(images/icon_add_playlist_cm.png); }
|
|
||||||
.context-menu-item.icon-add-remove-content { background-image: url(images/icon_add_content_cm.png); }
|
.context-menu-item.icon-download { background-image: url(images/icon_download_cm.png); }
|
||||||
.context-menu-item.icon-remove-all-content { background-image: url(images/icon_remove_all_content_cm.png); }
|
.context-menu-item.icon-overview { background-image: url(images/icon_overview_cm.png); }
|
||||||
|
.context-menu-item.icon-play { background-image: url(images/icon_play_cm.png); }
|
||||||
/* vertically align inside labels */
|
.context-menu-item.icon-select-cursor { background-image: url(images/icon_select-cursor_cm.png); }
|
||||||
.context-menu-input > label > * { vertical-align: top; }
|
.context-menu-item.icon-add-playlist { background-image: url(images/icon_add_playlist_cm.png); }
|
||||||
|
.context-menu-item.icon-add-remove-content { background-image: url(images/icon_add_content_cm.png); }
|
||||||
/* position checkboxes and radios as icons */
|
.context-menu-item.icon-remove-all-content { background-image: url(images/icon_remove_all_content_cm.png); }
|
||||||
.context-menu-input > label > input[type="checkbox"],
|
|
||||||
.context-menu-input > label > input[type="radio"] {
|
/* vertically align inside labels */
|
||||||
margin-left: -17px;
|
.context-menu-input > label > * { vertical-align: top; }
|
||||||
}
|
|
||||||
.context-menu-input > label > span {
|
/* position checkboxes and radios as icons */
|
||||||
margin-left: 5px;
|
.context-menu-input > label > input[type="checkbox"],
|
||||||
}
|
.context-menu-input > label > input[type="radio"] {
|
||||||
|
margin-left: -17px;
|
||||||
.context-menu-input > label,
|
}
|
||||||
.context-menu-input > label > input[type="text"],
|
.context-menu-input > label > span {
|
||||||
.context-menu-input > label > textarea,
|
margin-left: 5px;
|
||||||
.context-menu-input > label > select {
|
}
|
||||||
display: block;
|
|
||||||
width: 100%;
|
.context-menu-input > label,
|
||||||
|
.context-menu-input > label > input[type="text"],
|
||||||
-webkit-box-sizing: border-box;
|
.context-menu-input > label > textarea,
|
||||||
-moz-box-sizing: border-box;
|
.context-menu-input > label > select {
|
||||||
-ms-box-sizing: border-box;
|
display: block;
|
||||||
-o-box-sizing: border-box;
|
width: 100%;
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
-webkit-box-sizing: border-box;
|
||||||
|
-moz-box-sizing: border-box;
|
||||||
.context-menu-input > label > textarea {
|
-ms-box-sizing: border-box;
|
||||||
height: 100px;
|
-o-box-sizing: border-box;
|
||||||
}
|
box-sizing: border-box;
|
||||||
.context-menu-item > .context-menu-list {
|
}
|
||||||
display: none;
|
|
||||||
/* re-positioned by js */
|
.context-menu-input > label > textarea {
|
||||||
right: -5px;
|
height: 100px;
|
||||||
top: 5px;
|
}
|
||||||
}
|
.context-menu-item > .context-menu-list {
|
||||||
|
display: none;
|
||||||
.context-menu-item.hover > .context-menu-list {
|
/* re-positioned by js */
|
||||||
display: block;
|
right: -5px;
|
||||||
}
|
top: 5px;
|
||||||
|
}
|
||||||
.context-menu-accesskey {
|
|
||||||
text-decoration: underline;
|
.context-menu-item.hover > .context-menu-list {
|
||||||
}
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.context-menu-accesskey {
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,14 @@
|
||||||
.spl_fade_out {
|
.spl_fade_out {
|
||||||
clear: left;
|
clear: left;
|
||||||
}
|
}
|
||||||
|
#spl_sortable > li {
|
||||||
|
width: 100%;
|
||||||
|
margin-bottom:-1px;
|
||||||
|
position:relative;
|
||||||
|
-moz-box-sizing: border-box;
|
||||||
|
-webkit-box-sizing: border-box;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
/*#side_playlist button {
|
/*#side_playlist button {
|
||||||
float: left;
|
float: left;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
|
@ -48,12 +55,6 @@
|
||||||
margin-bottom:0;
|
margin-bottom:0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*#side_playlist li {
|
|
||||||
width: 99.5%;
|
|
||||||
margin-bottom:-1px;
|
|
||||||
position:relative;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
#side_playlist li div.list-item-container, #side_playlist li div.list-item-container.ui-state-active {
|
#side_playlist li div.list-item-container, #side_playlist li div.list-item-container.ui-state-active {
|
||||||
height:56px;
|
height:56px;
|
||||||
border: none;
|
border: none;
|
||||||
|
|
|
||||||
|
|
@ -1373,7 +1373,11 @@ h2#scheduled_playlist_name span {
|
||||||
}
|
}
|
||||||
|
|
||||||
.simple-formblock .liquidsoap_status{
|
.simple-formblock .liquidsoap_status{
|
||||||
width: 95%;
|
width: 100%;
|
||||||
|
-moz-box-sizing: border-box;
|
||||||
|
-webkit-box-sizing: border-box;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding: 4px 0 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.simple-formblock dd.block-display {
|
.simple-formblock dd.block-display {
|
||||||
|
|
@ -1936,8 +1940,8 @@ span.errors.sp-errors{
|
||||||
margin-top: 0px !important;
|
margin-top: 0px !important;
|
||||||
}
|
}
|
||||||
.small-icon.now-playing {
|
.small-icon.now-playing {
|
||||||
background:url(images/icon_nowplaying_n.png) no-repeat 0 0;
|
background:url(images/icon_play_cal.png) no-repeat 0 0;
|
||||||
height:8px;
|
height:10px;
|
||||||
}
|
}
|
||||||
.small-icon.progress {
|
.small-icon.progress {
|
||||||
background:url(images/upload-icon.gif) no-repeat;
|
background:url(images/upload-icon.gif) no-repeat;
|
||||||
|
|
@ -1956,9 +1960,7 @@ span.errors.sp-errors{
|
||||||
margin-left:1px;
|
margin-left:1px;
|
||||||
}
|
}
|
||||||
.small-icon.show-empty {
|
.small-icon.show-empty {
|
||||||
background:url(redmond/images/ui-icons_ff5d1a_256x240.png) no-repeat 0 -144px;
|
background:url(images/icon_alert_cal_alt.png) no-repeat 0 0;
|
||||||
width: 16px;
|
|
||||||
margin-top: 0px !important;
|
|
||||||
}
|
}
|
||||||
.medium-icon {
|
.medium-icon {
|
||||||
display:block;
|
display:block;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue