Merge pull request #4661 from owncloud/separate-app-styles
Move CSS for apps and browser-specific fixes out of main styles.css
This commit is contained in:
Jan-Christoph Borchardt
commit
0f5df181a3
|
|
@ -0,0 +1,236 @@
|
|||
/* ---- APP STYLING ---- */
|
||||
|
||||
#app {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
#app * {
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* Navigation: folder like structure */
|
||||
#app-navigation {
|
||||
width: 300px;
|
||||
height: 100%;
|
||||
float: left;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
background-color: #f8f8f8;
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
#app-navigation > ul {
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
}
|
||||
#app-navigation li {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.9);
|
||||
}
|
||||
#app-navigation .active,
|
||||
#app-navigation .active a,
|
||||
#app-navigation li:hover > a {
|
||||
background-color: #ddd;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.7);
|
||||
}
|
||||
|
||||
/* special rules for first-level entries and folders */
|
||||
#app-navigation > ul > li {
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
|
||||
#app-navigation .with-icon a {
|
||||
padding-left: 44px;
|
||||
background-size: 16px 16px;
|
||||
background-position: 14px center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
#app-navigation li > a {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 44px;
|
||||
padding: 12px;
|
||||
overflow: hidden;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
#app-navigation .collapse {
|
||||
display: none; /* hide collapse button intially */
|
||||
}
|
||||
#app-navigation .collapsible > .collapse {
|
||||
position: absolute;
|
||||
height: 44px;
|
||||
width: 44px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background: none; background-image: url('../img/actions/triangle-s.svg');
|
||||
background-size: 16px; background-repeat: no-repeat; background-position: center;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
outline: none !important;
|
||||
box-shadow: none;
|
||||
}
|
||||
#app-navigation .collapsible:hover > a {
|
||||
background-image: none;
|
||||
}
|
||||
#app-navigation .collapsible:hover > .collapse {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#app-navigation .collapsible .collapse {
|
||||
-moz-transform: rotate(-90deg);
|
||||
-webkit-transform: rotate(-90deg);
|
||||
-ms-transform:rotate(-90deg);
|
||||
-o-transform:rotate(-90deg);
|
||||
transform: rotate(-90deg);
|
||||
}
|
||||
#app-navigation .collapsible.open .collapse {
|
||||
-moz-transform: rotate(0);
|
||||
-webkit-transform: rotate(0);
|
||||
-ms-transform:rotate(0);
|
||||
-o-transform:rotate(0);
|
||||
transform: rotate(0);
|
||||
}
|
||||
|
||||
/* Second level nesting for lists */
|
||||
#app-navigation > ul ul {
|
||||
display: none;
|
||||
}
|
||||
#app-navigation > ul ul li > a {
|
||||
padding-left: 32px;
|
||||
}
|
||||
#app-navigation > .with-icon ul li > a {
|
||||
padding-left: 48px;
|
||||
background-position: 24px center;
|
||||
}
|
||||
|
||||
#app-navigation .open {
|
||||
background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
}
|
||||
|
||||
#app-navigation > ul .open:hover {
|
||||
-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
|
||||
}
|
||||
|
||||
#app-navigation > ul .open ul {
|
||||
display: block;
|
||||
}
|
||||
|
||||
|
||||
/* counter and actions */
|
||||
#app-navigation .utils {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
font-size: 12px;
|
||||
}
|
||||
#app-navigation .utils button,
|
||||
#app-navigation .utils .counter {
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
padding-top: 12px;
|
||||
}
|
||||
|
||||
|
||||
/* drag and drop */
|
||||
#app-navigation .drag-and-drop {
|
||||
-moz-transition: padding-bottom 500ms ease 0s;
|
||||
-o-transition: padding-bottom 500ms ease 0s;
|
||||
-webkit-transition: padding-bottom 500ms ease 0s;
|
||||
-ms-transition: padding-bottom 500ms ease 0s;
|
||||
transition: padding-bottom 500ms ease 0s;
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
|
||||
padding: 10px 0; margin: 0;
|
||||
}
|
||||
#app-navigation .error {
|
||||
color: #dd1144;
|
||||
}
|
||||
|
||||
#app-navigation .app-navigation-separator {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Part where the content will be loaded into */
|
||||
#app-content {
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
/* settings area */
|
||||
#app-settings {
|
||||
position: fixed;
|
||||
width: 299px;
|
||||
bottom: 0;
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
#app-settings-header {
|
||||
background-color: #eee;
|
||||
}
|
||||
#app-settings-content {
|
||||
display: none;
|
||||
padding: 10px;
|
||||
background-color: #eee;
|
||||
}
|
||||
#app-settings.open #app-settings-content {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.settings-button {
|
||||
display: block;
|
||||
height: 32px;
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
background-color: transparent; background-image: url('../img/actions/settings.svg');
|
||||
background-position: 10px center; background-repeat: no-repeat;
|
||||
box-shadow: none;
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.settings-button:hover {
|
||||
background-color: #ddd;
|
||||
}
|
||||
|
||||
/* icons */
|
||||
.folder-icon, .delete-icon, .edit-icon, .progress-icon {
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
}
|
||||
.folder-icon { background-image: url('../img/places/folder.svg'); }
|
||||
.delete-icon { background-image: url('../img/actions/delete.svg'); }
|
||||
.delete-icon:hover, .delete-icon:focus {
|
||||
background-image: url('../img/actions/delete-hover.svg');
|
||||
}
|
||||
.edit-icon { background-image: url('../img/actions/rename.svg'); }
|
||||
.progress-icon {
|
||||
background-image: url('../img/loading.gif');
|
||||
background-size: 16px;
|
||||
/* force show the loading icon, not only on hover */
|
||||
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
|
||||
filter:alpha(opacity=100);
|
||||
opacity: 1 !important;
|
||||
display: inline !important;
|
||||
}
|
||||
|
||||
/* buttons */
|
||||
button.loading {
|
||||
background-image: url('../img/loading.gif');
|
||||
background-position: right 10px center; background-repeat: no-repeat;
|
||||
background-size: 16px;
|
||||
padding-right: 30px;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
/* ---- BROWSER-SPECIFIC FIXES ---- */
|
||||
|
||||
/* remove dotted outlines in Firefox */
|
||||
::-moz-focus-inner {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
|
||||
.lte8 .delete-icon:hover, .delete-icon:focus {
|
||||
background-image: url('../img/actions/delete-hover.png');
|
||||
}
|
||||
|
||||
/* IE8 needs background to be set to same color to make transparency look good. */
|
||||
.lte9 #body-login form input[type="text"] {
|
||||
border: 1px solid lightgrey; /* use border to add 1px line between input fields */
|
||||
background-color: white; /* don't change background on hover */
|
||||
}
|
||||
.lte9 #body-login form input[type="password"] {
|
||||
/* leave out top border for 1px line between input fields*/
|
||||
border-left: 1px solid lightgrey;
|
||||
border-right: 1px solid lightgrey;
|
||||
border-bottom: 1px solid lightgrey;
|
||||
background-color: white; /* don't change background on hover */
|
||||
}
|
||||
.lte9 #body-login form label.infield {
|
||||
background-color: white; /* don't change background on hover */
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
|
||||
}
|
||||
|
||||
/* disable opacity of info text on gradient
|
||||
since we cannot set a good backround color to use the filter&background hack as with the input labels */
|
||||
.lte9 #body-login p.info {
|
||||
filter: initial;
|
||||
}
|
||||
|
||||
/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
|
||||
.ie #show, .ie #show+label {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
/* fix installation screen rendering issue for IE8+9 */
|
||||
.lte9 #body-login {
|
||||
height: auto !important;
|
||||
}
|
||||
|
||||
|
|
@ -727,286 +727,3 @@ div.crumb:active {
|
|||
opacity:.7;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* ---- APP STYLING ---- */
|
||||
#app {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
}
|
||||
#app * {
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
}
|
||||
|
||||
/* Navigation: folder like structure */
|
||||
#app-navigation {
|
||||
width: 300px;
|
||||
height: 100%;
|
||||
float: left;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
background-color: #f8f8f8;
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
#app-navigation > ul {
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
}
|
||||
#app-navigation li {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.9);
|
||||
}
|
||||
#app-navigation .active,
|
||||
#app-navigation .active a,
|
||||
#app-navigation li:hover > a {
|
||||
background-color: #ddd;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.7);
|
||||
}
|
||||
|
||||
/* special rules for first-level entries and folders */
|
||||
#app-navigation > ul > li {
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
|
||||
#app-navigation .with-icon a {
|
||||
padding-left: 44px;
|
||||
background-size: 16px 16px;
|
||||
background-position: 14px center;
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
|
||||
#app-navigation li > a {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 44px;
|
||||
padding: 12px;
|
||||
overflow: hidden;
|
||||
-moz-box-sizing: border-box; box-sizing: border-box;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
#app-navigation .collapse {
|
||||
display: none; /* hide collapse button intially */
|
||||
}
|
||||
#app-navigation .collapsible > .collapse {
|
||||
position: absolute;
|
||||
height: 44px;
|
||||
width: 44px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background: none; background-image: url('../img/actions/triangle-s.svg');
|
||||
background-size: 16px; background-repeat: no-repeat; background-position: center;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
outline: none !important;
|
||||
box-shadow: none;
|
||||
}
|
||||
#app-navigation .collapsible:hover > a {
|
||||
background-image: none;
|
||||
}
|
||||
#app-navigation .collapsible:hover > .collapse {
|
||||
display: block;
|
||||
}
|
||||
|
||||
#app-navigation .collapsible .collapse {
|
||||
-moz-transform: rotate(-90deg);
|
||||
-webkit-transform: rotate(-90deg);
|
||||
-ms-transform:rotate(-90deg);
|
||||
-o-transform:rotate(-90deg);
|
||||
transform: rotate(-90deg);
|
||||
}
|
||||
#app-navigation .collapsible.open .collapse {
|
||||
-moz-transform: rotate(0);
|
||||
-webkit-transform: rotate(0);
|
||||
-ms-transform:rotate(0);
|
||||
-o-transform:rotate(0);
|
||||
transform: rotate(0);
|
||||
}
|
||||
|
||||
/* Second level nesting for lists */
|
||||
#app-navigation > ul ul {
|
||||
display: none;
|
||||
}
|
||||
#app-navigation > ul ul li > a {
|
||||
padding-left: 32px;
|
||||
}
|
||||
#app-navigation > .with-icon ul li > a {
|
||||
padding-left: 48px;
|
||||
background-position: 24px center;
|
||||
}
|
||||
|
||||
#app-navigation .open {
|
||||
background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -o-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -moz-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
|
||||
}
|
||||
|
||||
#app-navigation > ul .open:hover {
|
||||
-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
|
||||
}
|
||||
|
||||
#app-navigation > ul .open ul {
|
||||
display: block;
|
||||
}
|
||||
|
||||
|
||||
/* counter and actions */
|
||||
#app-navigation .utils {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
font-size: 12px;
|
||||
}
|
||||
#app-navigation .utils button,
|
||||
#app-navigation .utils .counter {
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
padding-top: 12px;
|
||||
}
|
||||
|
||||
|
||||
/* drag and drop */
|
||||
#app-navigation .drag-and-drop {
|
||||
-moz-transition: padding-bottom 500ms ease 0s;
|
||||
-o-transition: padding-bottom 500ms ease 0s;
|
||||
-webkit-transition: padding-bottom 500ms ease 0s;
|
||||
-ms-transition: padding-bottom 500ms ease 0s;
|
||||
transition: padding-bottom 500ms ease 0s;
|
||||
padding-bottom: 40px;
|
||||
}
|
||||
#app-navigation .personalblock > legend { /* TODO @Raydiation: still needed? */
|
||||
padding: 10px 0; margin: 0;
|
||||
}
|
||||
#app-navigation .error {
|
||||
color: #dd1144;
|
||||
}
|
||||
|
||||
#app-navigation .app-navigation-separator {
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Part where the content will be loaded into */
|
||||
#app-content {
|
||||
height: 100%;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
/* settings area */
|
||||
#app-settings {
|
||||
position: fixed;
|
||||
width: 299px;
|
||||
bottom: 0;
|
||||
border-top: 1px solid #ccc;
|
||||
}
|
||||
#app-settings-header {
|
||||
background-color: #eee;
|
||||
}
|
||||
#app-settings-content {
|
||||
display: none;
|
||||
padding: 10px;
|
||||
background-color: #eee;
|
||||
}
|
||||
#app-settings.open #app-settings-content {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.settings-button {
|
||||
display: block;
|
||||
height: 32px;
|
||||
width: 100%;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
background-color: transparent; background-image: url('../img/actions/settings.svg');
|
||||
background-position: 10px center; background-repeat: no-repeat;
|
||||
box-shadow: none;
|
||||
border: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
.settings-button:hover {
|
||||
background-color: #ddd;
|
||||
}
|
||||
|
||||
/* icons */
|
||||
.folder-icon, .delete-icon, .edit-icon, .progress-icon {
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
}
|
||||
.folder-icon { background-image: url('../img/places/folder.svg'); }
|
||||
.delete-icon { background-image: url('../img/actions/delete.svg'); }
|
||||
.delete-icon:hover, .delete-icon:focus {
|
||||
background-image: url('../img/actions/delete-hover.svg');
|
||||
}
|
||||
.edit-icon { background-image: url('../img/actions/rename.svg'); }
|
||||
.progress-icon {
|
||||
background-image: url('../img/loading.gif');
|
||||
background-size: 16px;
|
||||
/* force show the loading icon, not only on hover */
|
||||
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
|
||||
filter:alpha(opacity=100);
|
||||
opacity: 1 !important;
|
||||
display: inline !important;
|
||||
}
|
||||
|
||||
/* buttons */
|
||||
button.loading {
|
||||
background-image: url('../img/loading.gif');
|
||||
background-position: right 10px center; background-repeat: no-repeat;
|
||||
background-size: 16px;
|
||||
padding-right: 30px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* ---- BROWSER-SPECIFIC FIXES ---- */
|
||||
|
||||
/* remove dotted outlines in Firefox */
|
||||
::-moz-focus-inner {
|
||||
border: 0;
|
||||
}
|
||||
.lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
|
||||
.lte8 .delete-icon:hover, .delete-icon:focus {
|
||||
background-image: url('../img/actions/delete-hover.png');
|
||||
}
|
||||
|
||||
/* IE8 needs background to be set to same color to make transparency look good. */
|
||||
.lte9 #body-login form input[type="text"] {
|
||||
border: 1px solid lightgrey; /* use border to add 1px line between input fields */
|
||||
background-color: white; /* don't change background on hover */
|
||||
}
|
||||
.lte9 #body-login form input[type="password"] {
|
||||
/* leave out top border for 1px line between input fields*/
|
||||
border-left: 1px solid lightgrey;
|
||||
border-right: 1px solid lightgrey;
|
||||
border-bottom: 1px solid lightgrey;
|
||||
background-color: white; /* don't change background on hover */
|
||||
}
|
||||
.lte9 #body-login form label.infield {
|
||||
background-color: white; /* don't change background on hover */
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
|
||||
}
|
||||
/* disable opacity of info text on gradient
|
||||
sice we cannot set a good backround color to use the filter&background hack as with the input labels */
|
||||
.lte9 #body-login p.info {
|
||||
filter: initial;
|
||||
}
|
||||
/* deactivate show password toggle for IE. Does not work for 8 and 9+ have their own implementation. */
|
||||
.ie #show, .ie #show+label {
|
||||
display: none;
|
||||
visibility: hidden;
|
||||
}
|
||||
|
||||
/* fix installation screen rendering issue for IE8+9 */
|
||||
.lte9 #body-login {
|
||||
height: auto !important;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -264,13 +264,15 @@ class OC {
|
|||
//OC_Util::addScript( "multiselect" );
|
||||
OC_Util::addScript('search', 'result');
|
||||
OC_Util::addScript('router');
|
||||
OC_Util::addScript("oc-requesttoken");
|
||||
|
||||
OC_Util::addStyle("styles");
|
||||
OC_Util::addStyle("apps");
|
||||
OC_Util::addStyle("fixes");
|
||||
OC_Util::addStyle("multiselect");
|
||||
OC_Util::addStyle("jquery-ui-1.10.0.custom");
|
||||
OC_Util::addStyle("jquery-tipsy");
|
||||
OC_Util::addStyle("jquery.ocdialog");
|
||||
OC_Util::addScript("oc-requesttoken");
|
||||
}
|
||||
|
||||
public static function initSession() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue