]> source.dussan.org Git - nextcloud-server.git/commitdiff
Removed jquery scss
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Tue, 10 Jan 2017 09:39:52 +0000 (10:39 +0100)
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Tue, 10 Jan 2017 10:06:03 +0000 (11:06 +0100)
- Switched to setup.css
- Disable scss when displaying the update page
- Improved setup css
- Fixed loading failure of other styles on setup & update page
- Improved scss compiler with an ignore scss compilation option

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
core/Controller/SetupController.php
core/css/installation.css [deleted file]
core/css/jquery-ui-fixes.css [new file with mode: 0644]
core/css/jquery-ui-fixes.scss [deleted file]
core/css/setup.css [new file with mode: 0644]
core/css/styles.scss
lib/private/Template/CSSResourceLocator.php
lib/private/TemplateLayout.php

index bb7c8c4969d821b91086e4dbdd5c37694ea5ac4f..930ec82dbb80cc4cbf19fe018c15598a13da4adb 100644 (file)
@@ -92,6 +92,7 @@ class SetupController {
 
                \OC_Util::addVendorScript('strengthify/jquery.strengthify');
                \OC_Util::addVendorStyle('strengthify/strengthify');
+               \OC_Util::addStyle('setup');
                \OC_Util::addScript('setup');
                \OC_Template::printGuestPage('', 'installation', $parameters);
        }
diff --git a/core/css/installation.css b/core/css/installation.css
deleted file mode 100644 (file)
index 69c98f1..0000000
+++ /dev/null
@@ -1,802 +0,0 @@
-/*
-* Installation css file.
-* This file is used on the install page only when the database
-* isn't set, preventing scss files to be stored using the AppdataController.
-* It should contain every style needed to correctly display the installation template.
-*
-*/
-
-/* Reset */
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {
-       margin: 0;
-       padding: 0;
-       border: 0;
-       outline: 0;
-       font-weight: inherit;
-       font-size: 100%;
-       font-family: inherit;
-       vertical-align: baseline;
-       cursor: default;
-}
-
-html, body {
-       height: 100%;
-}
-
-article, aside, dialog, figure, footer, header, hgroup, nav, section {
-       display: block;
-}
-
-body {
-       line-height: 1.5;
-}
-
-table {
-       border-collapse: separate;
-       border-spacing: 0;
-       white-space: nowrap;
-}
-
-caption, th, td {
-       text-align: left;
-       font-weight: normal;
-}
-
-table, td, th {
-       vertical-align: middle;
-}
-
-a {
-       border: 0;
-       color: #000;
-       text-decoration: none;
-       cursor: pointer;
-}
-a * {
-       cursor: pointer;
-}
-
-input {
-       cursor: pointer;
-}
-input * {
-       cursor: pointer;
-}
-
-select, .button span, label {
-       cursor: pointer;
-}
-
-ul {
-       list-style: none;
-}
-
-body {
-       background-color: #ffffff;
-       font-weight: 400;
-       font-size: .8em;
-       line-height: 1.6em;
-       font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-       color: #000;
-       height: auto;
-}
-
-/* Global */
-#body-login {
-       text-align: center;
-       background-color: #0082c9;
-       background-image: url("../img/background.jpg?v=1");
-       background-position: 50% 50%;
-       background-repeat: no-repeat;
-       background-size: cover;
-       background-attachment: fixed;
-       /* fix background gradient */
-       height: 100%;
-       /* fix sticky footer */
-}
-
-
-/* heading styles */
-h2 {
-       font-size: 20px;
-       font-weight: 300;
-       margin-bottom: 12px;
-       line-height: 140%;
-}
-h3 {
-       font-size: 15px;
-       font-weight: 300;
-       margin: 12px 0;
-}
-
-
-/* do not use italic typeface style, instead lighter color */
-em {
-       font-style: normal;
-       -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-       opacity: .5;
-}
-
-#header {
-       padding-top: 100px;
-}
-
-p.info, form fieldset legend, #datadirContent label {
-       text-align: center;
-       color: #fff;
-}
-
-form fieldset .warning-info, form input[type='checkbox'] + label {
-       text-align: center;
-       color: #fff;
-}
-form .warning input[type='checkbox']:hover + label, form .warning input[type='checkbox']:focus + label, form .warning input[type='checkbox'] + label {
-       color: #fff !important;
-}
-
-.infogroup {
-       margin-bottom: 15px;
-}
-
-p#message img {
-       vertical-align: middle;
-       padding: 5px;
-}
-
-div.buttons {
-       text-align: center;
-}
-
-p.info {
-       width: 22em;
-       margin: 0 auto;
-       padding-top: 20px;
-       -webkit-user-select: none;
-       -moz-user-select: none;
-       -ms-user-select: none;
-       user-select: none;
-}
-p.info a {
-       font-weight: 600;
-       padding: 13px;
-       margin: -13px;
-       color: #fff;
-}
-
-#body-login .warning, #body-login .update, #body-login .error {
-       display: block;
-       padding: 10px;
-       background-color: rgba(0, 0, 0, 0.3);
-       color: #fff;
-       text-align: left;
-       border-radius: 3px;
-       cursor: default;
-}
-
-#body-login .warning {
-       margin: 0 7px 5px 4px;
-}
-
-form {
-       position: relative;
-       width: 280px;
-       margin: 16px auto;
-       padding: 0;
-}
-form fieldset {
-       margin-bottom: 20px;
-       text-align: left;
-       -webkit-user-select: none;
-       -moz-user-select: none;
-       -ms-user-select: none;
-       user-select: none;
-}
-form #sqliteInformation {
-       margin-top: -20px;
-       margin-bottom: 20px;
-}
-form #adminaccount {
-       margin-bottom: 15px;
-}
-form fieldset legend {
-       width: 100%;
-}
-form fieldset.warning legend, form fieldset.update legend {
-       top: 18px;
-       position: relative;
-}
-form fieldset.warning legend + p, form fieldset.update legend + p {
-       margin-top: 12px;
-}
-form input[type='checkbox'] + label {
-       position: relative;
-       margin: 0;
-       padding: 14px;
-       vertical-align: middle;
-       -webkit-user-select: none;
-       -moz-user-select: none;
-       -ms-user-select: none;
-       user-select: none;
-}
-form .errors {
-       background: #fed7d7;
-       border: 1px solid #f00;
-       list-style-indent: inside;
-       margin: 0 0 2em;
-       padding: 1em;
-}
-form .success {
-       background: #d7fed7;
-       border: 1px solid #0f0;
-       width: 35%;
-       margin: 30px auto;
-       padding: 1em;
-       text-align: center;
-}
-form #showAdvanced > img {
-       padding: 4px;
-       box-sizing: border-box;
-}
-form p.info a, form #showAdvanced {
-       color: #fff;
-}
-form #remember_login:hover + label, form #remember_login:focus + label {
-       opacity: .6;
-}
-form #forgot-password:hover, form #forgot-password:focus {
-       opacity: .6;
-}
-form p.info a:hover, form p.info a:focus {
-       opacity: .6;
-}
-form footer .info {
-       white-space: nowrap;
-}
-
-#datadirContent label {
-       display: block;
-       width: 100%;
-       margin: 0;
-}
-
-form #datadirField legend {
-       margin-bottom: 15px;
-}
-
-#showAdvanced {
-       padding: 13px;
-       /* increase clickable area of Advanced dropdown */
-}
-#showAdvanced img {
-       vertical-align: bottom;
-       /* adjust position of Advanced dropdown arrow */
-       margin-left: -4px;
-}
-
-.icon-info-white {
-       padding: 10px;
-}
-
-.float-spinner {
-       height: 32px;
-       display: none;
-}
-
-.strengthify-wrapper {
-       display: inline-block;
-       position: relative;
-       left: 15px;
-       top: -23px;
-       width: 250px;
-}
-
-.tipsy-inner {
-       font-weight: bold;
-       color: #ccc;
-}
-
-
-/* LOGO */
-#header .logo {
-       background-image: url(../img/logo-icon.svg?v=1);
-       background-repeat: no-repeat;
-       background-size: 175px;
-       background-position: center;
-       width: 252px;
-       height: 120px;
-       margin: 0 auto;
-}
-
-/* Show password toggle */
-#show, #dbpassword {
-       position: absolute;
-       right: 1em;
-       top: .8em;
-       float: right;
-}
-
-#show, #dbpassword, #personal-show {
-       display: none;
-}
-
-#show + label, #dbpassword + label {
-       right: 21px;
-       top: 15px !important;
-       margin: -14px !important;
-       padding: 14px !important;
-}
-
-#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
-       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)';
-       opacity: .8;
-}
-
-#show + label, #dbpassword + label, #personal-show + label {
-       position: absolute !important;
-       height: 20px;
-       width: 24px;
-       background-image: url("../img/actions/toggle.svg?v=1");
-       background-repeat: no-repeat;
-       background-position: center;
-       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
-       opacity: .3;
-}
-
-#show + label:before, #dbpassword + label:before, #personal-show + label:before {
-       display: none;
-}
-
-#pass2, input[name='personal-password-clone'] {
-       padding: .6em 2.5em .4em .4em;
-       width: 8em;
-}
-
-#personal-show + label {
-       height: 14px;
-       margin-top: -25px;
-       left: 295px;
-       display: block;
-}
-
-#passwordbutton {
-       margin-left: .5em;
-}
-
-/* LOADER */
-#body-login .float-spinner {
-       margin-top: -32px;
-       padding-top: 32px;
-}
-
-[class^='icon-'], [class*=' icon-'] {
-       background-repeat: no-repeat;
-       background-position: center;
-       min-width: 16px;
-       min-height: 16px;
-}
-
-.loading, .loading-small, .icon-loading, .icon-loading-dark, .icon-loading-small, .icon-loading-small-dark {
-       position: relative;
-}
-
-.loading:after, .loading-small:after, .icon-loading:after, .icon-loading-dark:after, .icon-loading-small:after, .icon-loading-small-dark:after {
-       z-index: 2;
-       content: '';
-       height: 32px;
-       width: 32px;
-       margin: -17px 0 0 -17px;
-       position: absolute;
-       top: 50%;
-       left: 50%;
-       border-radius: 100%;
-       -webkit-animation: rotate .8s infinite linear;
-       animation: rotate .8s infinite linear;
-       -webkit-transform-origin: center;
-       -ms-transform-origin: center;
-       transform-origin: center;
-}
-
-.loading:after, .loading-small:after, .icon-loading:after, .icon-loading-dark:after, .icon-loading-small:after, .icon-loading-small-dark:after {
-       border: 2px solid rgba(150, 150, 150, 0.5);
-       border-top-color: #646464;
-}
-
-.icon-loading-dark:after, .icon-loading-small-dark:after {
-       border: 2px solid rgba(187, 187, 187, 0.5);
-       border-top-color: #bbb;
-}
-
-.icon-loading-small:after, .icon-loading-small-dark:after {
-       height: 16px;
-       width: 16px;
-       margin: -9px 0 0 -9px;
-}
-
-.icon-info-white {
-       background-image: url(../img/actions/info-white.svg?v=1);
-}
-
-@-webkit-keyframes rotate {
-       from {
-       -webkit-transform: rotate(0deg);
-       transform: rotate(0deg);
-       }
-       to {
-       -webkit-transform: rotate(360deg);
-       transform: rotate(360deg);
-       }
-}
-@keyframes rotate {
-       from {
-       -webkit-transform: rotate(0deg);
-       transform: rotate(0deg);
-       }
-       to {
-       -webkit-transform: rotate(360deg);
-       transform: rotate(360deg);
-       }
-}
-/*!
-       * Bootstrap v3.3.5 (http://getbootstrap.com)
-       * Copyright 2011-2015 Twitter, Inc.
-       * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
-       */
-.tooltip {
-       position: absolute;
-       z-index: 1070;
-       display: block;
-       font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-       font-style: normal;
-       font-weight: normal;
-       letter-spacing: normal;
-       line-break: auto;
-       line-height: 1.42857143;
-       text-align: left;
-       text-align: start;
-       text-decoration: none;
-       text-shadow: none;
-       text-transform: none;
-       white-space: normal;
-       word-break: normal;
-       word-spacing: normal;
-       word-wrap: normal;
-       font-size: 12px;
-       opacity: 0;
-       filter: alpha(opacity=0);
-}
-.tooltip.in {
-       opacity: 0.9;
-       filter: alpha(opacity=90);
-}
-.tooltip.top {
-       margin-top: -3px;
-       padding: 5px 0;
-}
-.tooltip.right {
-       margin-left: 3px;
-       padding: 0 5px;
-}
-.tooltip.bottom {
-       margin-top: 3px;
-       padding: 5px 0;
-}
-.tooltip.left {
-       margin-left: -3px;
-       padding: 0 5px;
-}
-
-.tooltip-inner {
-       max-width: 350px;
-       padding: 3px 8px;
-       color: #ffffff;
-       text-align: center;
-       background-color: #000000;
-       border-radius: 4px;
-}
-
-.tooltip-arrow {
-       position: absolute;
-       width: 0;
-       height: 0;
-       border-color: transparent;
-       border-style: solid;
-}
-
-.tooltip.top .tooltip-arrow {
-       bottom: 0;
-       left: 50%;
-       margin-left: -5px;
-       border-width: 5px 5px 0;
-       border-top-color: #000000;
-}
-.tooltip.top-left .tooltip-arrow {
-       bottom: 0;
-       right: 5px;
-       margin-bottom: -5px;
-       border-width: 5px 5px 0;
-       border-top-color: #000000;
-}
-.tooltip.top-right .tooltip-arrow {
-       bottom: 0;
-       left: 5px;
-       margin-bottom: -5px;
-       border-width: 5px 5px 0;
-       border-top-color: #000000;
-}
-.tooltip.right .tooltip-arrow {
-       top: 50%;
-       left: 0;
-       margin-top: -5px;
-       border-width: 5px 5px 5px 0;
-       border-right-color: #000000;
-}
-.tooltip.left .tooltip-arrow {
-       top: 50%;
-       right: 0;
-       margin-top: -5px;
-       border-width: 5px 0 5px 5px;
-       border-left-color: #000000;
-}
-.tooltip.bottom .tooltip-arrow {
-       top: 0;
-       left: 50%;
-       margin-left: -5px;
-       border-width: 0 5px 5px;
-       border-bottom-color: #000000;
-}
-.tooltip.bottom-left .tooltip-arrow {
-       top: 0;
-       right: 5px;
-       margin-top: -5px;
-       border-width: 0 5px 5px;
-       border-bottom-color: #000000;
-}
-.tooltip.bottom-right .tooltip-arrow {
-       top: 0;
-       left: 5px;
-       margin-top: -5px;
-       border-width: 0 5px 5px;
-       border-bottom-color: #000000;
-}
-
-/* SCROLLING */
-::-webkit-scrollbar {
-       width: 5px;
-}
-
-::-webkit-scrollbar-track-piece {
-       background-color: transparent;
-}
-
-::-webkit-scrollbar-thumb {
-       background: #ddd;
-       border-radius: 3px;
-}
-.error-wide {
-       width: 700px;
-       margin-left: -200px !important;
-}
-
-/* Config write issue */
-#body-login .v-align {
-       width: inherit;
-}
-#body-login .wrapper {
-       min-height: 100%;
-       margin: 0 auto -70px;
-       width: 300px;
-}
-.warning legend, .warning a, .error a {
-       color: #fff !important;
-       font-weight: 600 !important;
-}
-#body-login ul.error-wide {
-       margin-top: 35px;
-}
-
-/* Update info */
-#body-login .update {
-    width: inherit;
-    text-align: center;
-}
-#body-login .update h2 {
-    margin: 0 0 20px;
-}
-
-#body-login .update a {
-       color: #fff;
-       border-bottom: 1px solid #aaa;
-}
-
-/* INPUTS */
-input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="tel"], input[type="url"], input[type="time"], input[type="date"], textarea, select, button, .button, input[type="submit"], input[type="button"], #quota, .pager li a {
-    width: 130px;
-    margin: 3px 3px 3px 0;
-    padding: 7px 6px 5px;
-    font-size: 13px;
-    background-color: #fff;
-    color: #333;
-    border: 1px solid #ddd;
-    outline: none;
-    border-radius: 3px;
-}
-#body-login input {
-    font-size: 20px;
-    margin: 5px;
-    padding: 11px 10px 9px;
-}
-input[type="submit"], input[type="button"], button, .button {
-       width: auto;
-       min-width: 25px;
-       padding: 5px;
-       background-color: rgba(240, 240, 240, 0.9);
-       font-weight: 600;
-       color: #555;
-       border: 1px solid rgba(240, 240, 240, 0.9);
-       cursor: pointer;
-}
-
-input {
-       font-size: 20px;
-       margin: 5px;
-       padding: 11px 10px 9px;
-}
-input[type='text'], input[type='password'], input[type='email'] {
-       font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-       border: none;
-       font-weight: 300;
-       font-size: 20px;
-       margin: 5px;
-       padding: 11px 10px 9px;
-       -webkit-appearance: textfield;
-       -moz-appearance: textfield;
-       box-sizing: content-box;
-       background: #fff;
-       color: #555;
-       cursor: text;
-       font-family: inherit;
-       outline: none;
-       border-radius: 3px;
-       width: 249px;
-}
-input.login {
-       width: 269px;
-       background-position: right 16px center;
-}
-input[type='submit'] {
-       padding: 10px 20px;
-       /* larger log in and installation buttons */
-}
-
-/* Nicely grouping input field sets */
-.grouptop, .groupmiddle, .groupbottom {
-       position: relative;
-       -webkit-user-select: none;
-       -moz-user-select: none;
-       -ms-user-select: none;
-       user-select: none;
-}
-
-.grouptop input {
-       margin-bottom: 0 !important;
-       border-bottom: 0 !important;
-       border-bottom-left-radius: 0 !important;
-       border-bottom-right-radius: 0 !important;
-}
-
-.groupmiddle input {
-       margin-top: 0 !important;
-       margin-bottom: 0 !important;
-       border-top: 0 !important;
-       border-bottom: 0 !important;
-       border-radius: 0 !important;
-       box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
-}
-
-.groupbottom input {
-       margin-top: 0 !important;
-       border-top: 0 !important;
-       border-top-right-radius: 0 !important;
-       border-top-left-radius: 0 !important;
-       box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
-}
-
-.groupbottom input[type=submit] {
-       box-shadow: none !important;
-}
-
-label.infield {
-       display: none;
-}
-
-/* Primary action button, use sparingly */
-.primary {
-       border: 1px solid #0082c9;
-       background-color: #00a2e9;
-       color: #fff;
-}
-
-input[type='submit'].primary, input[type='button'].primary {
-       border: 1px solid #0082c9;
-       background-color: #00a2e9;
-       color: #fff;
-}
-
-button.primary, .button.primary {
-       border: 1px solid #0082c9;
-       background-color: #00a2e9;
-       color: #fff;
-}
-
-.primary:hover {
-       background-color: #0092d9;
-       color: #fff;
-}
-
-input[type='submit'].primary:hover, input[type='button'].primary:hover {
-       background-color: #0092d9;
-       color: #fff;
-}
-
-button.primary:hover, .button.primary:hover, .primary:focus {
-       background-color: #0092d9;
-       color: #fff;
-}
-
-input[type='submit'].primary:focus, input[type='button'].primary:focus {
-       background-color: #0092d9;
-       color: #fff;
-}
-
-button.primary:focus, .button.primary:focus {
-       background-color: #0092d9;
-       color: #fff;
-}
-
-.primary:active {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-input[type='submit'].primary:active, input[type='button'].primary:active {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-button.primary:active, .button.primary:active, .primary:disabled {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-input[type='submit'].primary:disabled, input[type='button'].primary:disabled {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-button.primary:disabled, .button.primary:disabled, .primary:disabled:hover {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-input[type='submit'].primary:disabled:hover, input[type='button'].primary:disabled:hover {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-button.primary:disabled:hover, .button.primary:disabled:hover, .primary:disabled:focus {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-input[type='submit'].primary:disabled:focus, input[type='button'].primary:disabled:focus {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-
-button.primary:disabled:focus, .button.primary:disabled:focus {
-       background-color: #00a2e9;
-       color: #bbb;
-}
-input, textarea, select, button {
-    font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-}
diff --git a/core/css/jquery-ui-fixes.css b/core/css/jquery-ui-fixes.css
new file mode 100644 (file)
index 0000000..e8cf2b7
--- /dev/null
@@ -0,0 +1,142 @@
+/* Component containers
+----------------------------------*/
+.ui-widget {
+       font-family: "Lucida Grande", Arial, Verdana, sans-serif;
+       font-size: 1em;
+}
+.ui-widget button {
+       font-family: "Lucida Grande", Arial, Verdana, sans-serif;
+}
+.ui-widget-content {
+       border: 1px solid #dddddd;
+       background: #eeeeee url('images/ui-bg_highlight-soft_100_eeeeee_1x100.png') 50% top repeat-x;
+       color: #333333;
+}
+.ui-widget-content a {
+       color: #333333;
+}
+.ui-widget-header {
+       border: 1px solid #0082c9;
+       background: #0082c9;
+       color: #ffffff;
+}
+.ui-widget-header a {
+       color: #ffffff;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+       border: 1px solid #ddd;
+       background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x;
+       font-weight: bold;
+       color: #555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+       color: #555;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+       border: 1px solid #ddd;
+       background: #ffffff url('images/ui-bg_flat_100_ffffff_40x100.png') 50% 50% repeat-x;
+       font-weight: bold;
+       color: #333;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited {
+       color: #333;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+       border: 1px solid #0082c9;
+       background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x;
+       font-weight: bold;
+       color: #0082c9;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+       color: #0082c9;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+       border: 1px solid #ddd;
+       background: #f8f8f8 url('images/ui-bg_highlight-hard_100_f8f8f8_1x100.png') 50% top repeat-x;
+       color: #555;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+       color: #555;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+       border: 1px solid #cd0a0a;
+       background: #b81900 url('images/ui-bg_diagonals-thick_18_b81900_40x40.png') 50% 50% repeat;
+       color: #ffffff;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+       color: #ffffff;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+       color: #ffffff;
+}
+
+/* Icons
+----------------------------------*/
+.ui-state-default .ui-icon {
+       background-image: url('images/ui-icons_1d2d44_256x240.png');
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+       background-image: url('images/ui-icons_1d2d44_256x240.png');
+}
+.ui-state-active .ui-icon {
+       background-image: url('images/ui-icons_1d2d44_256x240.png');
+}
+.ui-state-highlight .ui-icon {
+       background-image: url('images/ui-icons_ffffff_256x240.png');
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+       background-image: url('images/ui-icons_ffd27a_256x240.png');
+}
+
+/* Misc visuals
+----------------------------------*/
+/* Overlays */
+.ui-widget-overlay {
+       background: #666666 url('images/ui-bg_diagonals-thick_20_666666_40x40.png') 50% 50% repeat;
+       opacity: .5;
+}
+.ui-widget-shadow {
+       margin: -5px 0 0 -5px;
+       padding: 5px;
+       background: #000000 url('images/ui-bg_flat_10_000000_40x100.png') 50% 50% repeat-x;
+       opacity: .2;
+       border-radius: 5px;
+}
+
+.ui-menu .ui-menu-item a {
+       padding: 6px;
+}
diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
deleted file mode 100644 (file)
index 4cf4f4c..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Component containers
-----------------------------------*/
-
-.ui-widget {
-       font-family: 'Lucida Grande', Arial, Verdana, sans-serif;
-       font-size: 1em;
-       button {
-               font-family: 'Lucida Grande', Arial, Verdana, sans-serif;
-       }
-}
-
-.ui-widget-content {
-       border: 1px solid #dddddd;
-       background: #eeeeee url('images/ui-bg_highlight-soft_100_eeeeee_1x100.png') 50% top repeat-x;
-       color: #333333;
-       a {
-               color: #333333;
-       }
-}
-
-.ui-widget-header {
-       border: 1px solid #0082c9;
-       background: #0082c9;
-       color: #ffffff;
-       a {
-               color: #ffffff;
-       }
-}
-
-/* Interaction states
-----------------------------------*/
-
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
-       border: 1px solid #ddd;
-       background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x;
-       font-weight: bold;
-       color: #555;
-}
-
-.ui-state-default a {
-       color: #555;
-       &:link, &:visited {
-               color: #555;
-       }
-}
-
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
-       border: 1px solid #ddd;
-       background: #ffffff url('images/ui-bg_flat_100_ffffff_40x100.png') 50% 50% repeat-x;
-       font-weight: bold;
-       color: #333;
-}
-
-.ui-state-hover a {
-       color: #333;
-       &:hover, &:link, &:visited {
-               color: #333;
-       }
-}
-
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {
-       border: 1px solid #0082c9;
-       background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x;
-       font-weight: bold;
-       color: #0082c9;
-}
-
-.ui-state-active a {
-       color: #0082c9;
-       &:link, &:visited {
-               color: #0082c9;
-       }
-}
-
-/* Interaction Cues
-----------------------------------*/
-
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {
-       border: 1px solid #ddd;
-       background: #f8f8f8 url('images/ui-bg_highlight-hard_100_f8f8f8_1x100.png') 50% top repeat-x;
-       color: #555;
-}
-
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a, .ui-widget-header .ui-state-highlight a {
-       color: #555;
-}
-
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {
-       border: 1px solid #cd0a0a;
-       background: #b81900 url('images/ui-bg_diagonals-thick_18_b81900_40x40.png') 50% 50% repeat;
-       color: #ffffff;
-}
-
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a, .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text {
-       color: #ffffff;
-}
-
-/* Icons
-----------------------------------*/
-
-.ui-state-default .ui-icon, .ui-state-hover .ui-icon, .ui-state-focus .ui-icon, .ui-state-active .ui-icon {
-       background-image: url('images/ui-icons_1d2d44_256x240.png');
-}
-
-.ui-state-highlight .ui-icon {
-       background-image: url('images/ui-icons_ffffff_256x240.png');
-}
-
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {
-       background-image: url('images/ui-icons_ffd27a_256x240.png');
-}
-
-/* Misc visuals
-----------------------------------*/
-/* Overlays */
-
-.ui-widget-overlay {
-       background: #666666 url('images/ui-bg_diagonals-thick_20_666666_40x40.png') 50% 50% repeat;
-       opacity: .5;
-}
-
-.ui-widget-shadow {
-       margin: -5px 0 0 -5px;
-       padding: 5px;
-       background: #000000 url('images/ui-bg_flat_10_000000_40x100.png') 50% 50% repeat-x;
-       opacity: .2;
-       border-radius: 5px;
-}
-
-.ui-menu .ui-menu-item a {
-       padding: 6px;
-}
diff --git a/core/css/setup.css b/core/css/setup.css
new file mode 100644 (file)
index 0000000..67b1559
--- /dev/null
@@ -0,0 +1,1114 @@
+/*
+* Installation css file.
+* This file is used on the install page only when the database
+* isn't set, preventing scss files to be stored using the AppdataController.
+* It should contain every style needed to correctly display the installation template.
+*
+*/
+
+/* Reset */
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {
+       margin: 0;
+       padding: 0;
+       border: 0;
+       outline: 0;
+       font-weight: inherit;
+       font-size: 100%;
+       font-family: inherit;
+       vertical-align: baseline;
+       cursor: default;
+}
+
+html, body {
+       height: 100%;
+}
+
+article, aside, dialog, figure, footer, header, hgroup, nav, section {
+       display: block;
+}
+
+body {
+       line-height: 1.5;
+}
+
+table {
+       border-collapse: separate;
+       border-spacing: 0;
+       white-space: nowrap;
+}
+
+caption, th, td {
+       text-align: left;
+       font-weight: normal;
+}
+
+table, td, th {
+       vertical-align: middle;
+}
+
+a {
+       border: 0;
+       color: #000;
+       text-decoration: none;
+       cursor: pointer;
+}
+a * {
+       cursor: pointer;
+}
+
+input {
+       cursor: pointer;
+}
+input * {
+       cursor: pointer;
+}
+
+select, .button span, label {
+       cursor: pointer;
+}
+
+ul {
+       list-style: none;
+}
+
+body {
+       background-color: #ffffff;
+       font-weight: 400;
+       font-size: .8em;
+       line-height: 1.6em;
+       font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+       color: #000;
+       height: auto;
+}
+
+/* Global */
+#body-login {
+       text-align: center;
+       background-color: #0082c9;
+       background-image: url("../img/background.jpg?v=1");
+       background-position: 50% 50%;
+       background-repeat: no-repeat;
+       background-size: cover;
+       background-attachment: fixed;
+       /* fix background gradient */
+       height: 100%;
+       /* fix sticky footer */
+}
+
+
+/* heading styles */
+h2 {
+       font-size: 20px;
+       font-weight: 300;
+       margin-bottom: 12px;
+       line-height: 140%;
+}
+h3 {
+       font-size: 15px;
+       font-weight: 300;
+       margin: 12px 0;
+}
+
+
+/* do not use italic typeface style, instead lighter color */
+em {
+       font-style: normal;
+       -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+       opacity: .5;
+}
+
+#header {
+       padding-top: 100px;
+}
+
+p.info, form fieldset legend, #datadirContent label {
+       text-align: center;
+       color: #fff;
+}
+
+form fieldset .warning-info, form input[type='checkbox'] + label {
+       text-align: center;
+       color: #fff;
+}
+form .warning input[type='checkbox']:hover + label, form .warning input[type='checkbox']:focus + label, form .warning input[type='checkbox'] + label {
+       color: #fff !important;
+}
+
+.infogroup {
+       margin-bottom: 15px;
+}
+
+p#message img {
+       vertical-align: middle;
+       padding: 5px;
+}
+
+div.buttons {
+       text-align: center;
+}
+
+p.info {
+       width: 22em;
+       margin: 0 auto;
+       padding-top: 20px;
+       -webkit-user-select: none;
+       -moz-user-select: none;
+       -ms-user-select: none;
+       user-select: none;
+}
+p.info a {
+       font-weight: 600;
+       padding: 13px;
+       margin: -13px;
+       color: #fff;
+}
+
+#body-login .warning, #body-login .update, #body-login .error {
+       display: block;
+       padding: 10px;
+       background-color: rgba(0, 0, 0, 0.3);
+       color: #fff;
+       text-align: left;
+       border-radius: 3px;
+       cursor: default;
+}
+
+#body-login .warning {
+       margin: 0 7px 5px 4px;
+}
+
+form {
+       position: relative;
+       width: 280px;
+       margin: 16px auto;
+       padding: 0;
+}
+form fieldset {
+       margin-bottom: 20px;
+       text-align: left;
+       -webkit-user-select: none;
+       -moz-user-select: none;
+       -ms-user-select: none;
+       user-select: none;
+}
+form #sqliteInformation {
+       margin-top: -20px;
+       margin-bottom: 20px;
+}
+form #adminaccount {
+       margin-bottom: 15px;
+}
+form fieldset legend {
+       width: 100%;
+}
+form fieldset.warning legend, form fieldset.update legend {
+       top: 18px;
+       position: relative;
+}
+form fieldset.warning legend + p, form fieldset.update legend + p {
+       margin-top: 12px;
+}
+form input[type='checkbox'] + label {
+       position: relative;
+       margin: 0;
+       padding: 14px;
+       vertical-align: middle;
+       -webkit-user-select: none;
+       -moz-user-select: none;
+       -ms-user-select: none;
+       user-select: none;
+}
+form .errors {
+       background: #fed7d7;
+       border: 1px solid #f00;
+       list-style-indent: inside;
+       margin: 0 0 2em;
+       padding: 1em;
+}
+form .success {
+       background: #d7fed7;
+       border: 1px solid #0f0;
+       width: 35%;
+       margin: 30px auto;
+       padding: 1em;
+       text-align: center;
+}
+form #showAdvanced > img {
+       padding: 4px;
+       box-sizing: border-box;
+}
+form p.info a, form #showAdvanced {
+       color: #fff;
+}
+form #remember_login:hover + label, form #remember_login:focus + label {
+       opacity: .6;
+}
+form #forgot-password:hover, form #forgot-password:focus {
+       opacity: .6;
+}
+form p.info a:hover, form p.info a:focus {
+       opacity: .6;
+}
+form footer .info {
+       white-space: nowrap;
+}
+
+#datadirContent label {
+       display: block;
+       width: 100%;
+       margin: 0;
+}
+
+form #datadirField legend {
+       margin-bottom: 15px;
+}
+
+#showAdvanced {
+       padding: 13px;
+       /* increase clickable area of Advanced dropdown */
+}
+#showAdvanced img {
+       vertical-align: bottom;
+       /* adjust position of Advanced dropdown arrow */
+       margin-left: -4px;
+}
+
+.icon-info-white {
+       padding: 10px;
+}
+
+.float-spinner {
+       height: 32px;
+       display: none;
+}
+
+.strengthify-wrapper {
+       display: inline-block;
+       position: relative;
+       left: 15px;
+       top: -23px;
+       width: 250px;
+}
+
+.tipsy-inner {
+       font-weight: bold;
+       color: #ccc;
+}
+
+
+/* LOGO */
+#header .logo {
+       background-image: url(../img/logo-icon.svg?v=1);
+       background-repeat: no-repeat;
+       background-size: 175px;
+       background-position: center;
+       width: 252px;
+       height: 120px;
+       margin: 0 auto;
+}
+
+/* LOADER */
+#body-login .float-spinner {
+       margin-top: -32px;
+       padding-top: 32px;
+}
+
+[class^='icon-'], [class*=' icon-'] {
+       background-repeat: no-repeat;
+       background-position: center;
+       min-width: 16px;
+       min-height: 16px;
+}
+
+.loading, .loading-small, .icon-loading, .icon-loading-dark, .icon-loading-small, .icon-loading-small-dark {
+       position: relative;
+}
+
+.loading:after, .loading-small:after, .icon-loading:after, .icon-loading-dark:after, .icon-loading-small:after, .icon-loading-small-dark:after {
+       z-index: 2;
+       content: '';
+       height: 32px;
+       width: 32px;
+       margin: -17px 0 0 -17px;
+       position: absolute;
+       top: 50%;
+       left: 50%;
+       border-radius: 100%;
+       -webkit-animation: rotate .8s infinite linear;
+       animation: rotate .8s infinite linear;
+       -webkit-transform-origin: center;
+       -ms-transform-origin: center;
+       transform-origin: center;
+}
+
+.loading:after, .loading-small:after, .icon-loading:after, .icon-loading-dark:after, .icon-loading-small:after, .icon-loading-small-dark:after {
+       border: 2px solid rgba(150, 150, 150, 0.5);
+       border-top-color: #646464;
+}
+
+.icon-loading-dark:after, .icon-loading-small-dark:after {
+       border: 2px solid rgba(187, 187, 187, 0.5);
+       border-top-color: #bbb;
+}
+
+.icon-loading-small:after, .icon-loading-small-dark:after {
+       height: 16px;
+       width: 16px;
+       margin: -9px 0 0 -9px;
+}
+
+.icon-info-white {
+       background-image: url(../img/actions/info-white.svg?v=1);
+}
+
+@-webkit-keyframes rotate {
+       from {
+       -webkit-transform: rotate(0deg);
+       transform: rotate(0deg);
+       }
+       to {
+       -webkit-transform: rotate(360deg);
+       transform: rotate(360deg);
+       }
+}
+@keyframes rotate {
+       from {
+       -webkit-transform: rotate(0deg);
+       transform: rotate(0deg);
+       }
+       to {
+       -webkit-transform: rotate(360deg);
+       transform: rotate(360deg);
+       }
+}
+/*!
+       * Bootstrap v3.3.5 (http://getbootstrap.com)
+       * Copyright 2011-2015 Twitter, Inc.
+       * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+       */
+.tooltip {
+       position: absolute;
+       z-index: 1070;
+       display: block;
+       font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+       font-style: normal;
+       font-weight: normal;
+       letter-spacing: normal;
+       line-break: auto;
+       line-height: 1.42857143;
+       text-align: left;
+       text-align: start;
+       text-decoration: none;
+       text-shadow: none;
+       text-transform: none;
+       white-space: normal;
+       word-break: normal;
+       word-spacing: normal;
+       word-wrap: normal;
+       font-size: 12px;
+       opacity: 0;
+       filter: alpha(opacity=0);
+}
+.tooltip.in {
+       opacity: 0.9;
+       filter: alpha(opacity=90);
+}
+.tooltip.top {
+       margin-top: -3px;
+       padding: 5px 0;
+}
+.tooltip.right {
+       margin-left: 3px;
+       padding: 0 5px;
+}
+.tooltip.bottom {
+       margin-top: 3px;
+       padding: 5px 0;
+}
+.tooltip.left {
+       margin-left: -3px;
+       padding: 0 5px;
+}
+
+.tooltip-inner {
+       max-width: 350px;
+       padding: 3px 8px;
+       color: #ffffff;
+       text-align: center;
+       background-color: #000000;
+       border-radius: 4px;
+}
+
+.tooltip-arrow {
+       position: absolute;
+       width: 0;
+       height: 0;
+       border-color: transparent;
+       border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+       bottom: 0;
+       left: 50%;
+       margin-left: -5px;
+       border-width: 5px 5px 0;
+       border-top-color: #000000;
+}
+.tooltip.top-left .tooltip-arrow {
+       bottom: 0;
+       right: 5px;
+       margin-bottom: -5px;
+       border-width: 5px 5px 0;
+       border-top-color: #000000;
+}
+.tooltip.top-right .tooltip-arrow {
+       bottom: 0;
+       left: 5px;
+       margin-bottom: -5px;
+       border-width: 5px 5px 0;
+       border-top-color: #000000;
+}
+.tooltip.right .tooltip-arrow {
+       top: 50%;
+       left: 0;
+       margin-top: -5px;
+       border-width: 5px 5px 5px 0;
+       border-right-color: #000000;
+}
+.tooltip.left .tooltip-arrow {
+       top: 50%;
+       right: 0;
+       margin-top: -5px;
+       border-width: 5px 0 5px 5px;
+       border-left-color: #000000;
+}
+.tooltip.bottom .tooltip-arrow {
+       top: 0;
+       left: 50%;
+       margin-left: -5px;
+       border-width: 0 5px 5px;
+       border-bottom-color: #000000;
+}
+.tooltip.bottom-left .tooltip-arrow {
+       top: 0;
+       right: 5px;
+       margin-top: -5px;
+       border-width: 0 5px 5px;
+       border-bottom-color: #000000;
+}
+.tooltip.bottom-right .tooltip-arrow {
+       top: 0;
+       left: 5px;
+       margin-top: -5px;
+       border-width: 0 5px 5px;
+       border-bottom-color: #000000;
+}
+
+/* SCROLLING */
+::-webkit-scrollbar {
+       width: 5px;
+}
+
+::-webkit-scrollbar-track-piece {
+       background-color: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+       background: #ddd;
+       border-radius: 3px;
+}
+.error-wide {
+       width: 700px;
+       margin-left: -200px !important;
+}
+
+/* Config write issue */
+#body-login .v-align {
+       width: inherit;
+}
+#body-login .wrapper {
+       min-height: 100%;
+       margin: 0 auto -70px;
+       width: 300px;
+}
+.warning legend, .warning a, .error a {
+       color: #fff !important;
+       font-weight: 600 !important;
+}
+#body-login ul.error-wide {
+       margin-top: 35px;
+}
+
+/* Update info */
+#body-login .update {
+               width: inherit;
+               text-align: center;
+}
+#body-login .update h2 {
+               margin: 0 0 20px;
+}
+
+#body-login .update a {
+       color: #fff;
+       border-bottom: 1px solid #aaa;
+}
+
+/* INPUTS */
+input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="tel"], input[type="url"], input[type="time"], input[type="date"], textarea, select, button, .button, input[type="submit"], input[type="button"], #quota, .pager li a {
+               width: 130px;
+               margin: 3px 3px 3px 0;
+               padding: 7px 6px 5px;
+               font-size: 13px;
+               background-color: #fff;
+               color: #333;
+               border: 1px solid #ddd;
+               outline: none;
+               border-radius: 3px;
+}
+#body-login input {
+               font-size: 20px;
+               margin: 5px;
+               padding: 11px 10px 9px;
+}
+input[type="submit"], input[type="button"], button, .button {
+       width: auto;
+       min-width: 25px;
+       padding: 5px;
+       background-color: rgba(240, 240, 240, 0.9);
+       font-weight: 600;
+       color: #555;
+       border: 1px solid rgba(240, 240, 240, 0.9);
+       cursor: pointer;
+}
+
+input {
+       font-size: 20px;
+       margin: 5px;
+       padding: 11px 10px 9px;
+}
+input[type='text'], input[type='password'], input[type='email'] {
+       font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+       border: none;
+       font-weight: 300;
+       font-size: 20px;
+       margin: 5px;
+       padding: 11px 10px 9px;
+       -webkit-appearance: textfield;
+       -moz-appearance: textfield;
+       box-sizing: content-box;
+       background: #fff;
+       color: #555;
+       cursor: text;
+       font-family: inherit;
+       outline: none;
+       border-radius: 3px;
+       width: 249px;
+}
+input.login {
+       width: 269px;
+       background-position: right 16px center;
+}
+input[type='submit'] {
+       padding: 10px 20px;
+       /* larger log in and installation buttons */
+}
+
+/* Primary action button, use sparingly */
+.primary {
+       border: 1px solid #0082c9;
+       background-color: #00a2e9;
+       color: #fff;
+}
+
+input[type='submit'].primary, input[type='button'].primary {
+       border: 1px solid #0082c9;
+       background-color: #00a2e9;
+       color: #fff;
+}
+
+button.primary, .button.primary {
+       border: 1px solid #0082c9;
+       background-color: #00a2e9;
+       color: #fff;
+}
+
+.primary:hover {
+       background-color: #0092d9;
+       color: #fff;
+}
+
+input[type='submit'].primary:hover, input[type='button'].primary:hover {
+       background-color: #0092d9;
+       color: #fff;
+}
+
+button.primary:hover, .button.primary:hover, .primary:focus {
+       background-color: #0092d9;
+       color: #fff;
+}
+
+input[type='submit'].primary:focus, input[type='button'].primary:focus {
+       background-color: #0092d9;
+       color: #fff;
+}
+
+button.primary:focus, .button.primary:focus {
+       background-color: #0092d9;
+       color: #fff;
+}
+
+.primary:active {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+input[type='submit'].primary:active, input[type='button'].primary:active {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+button.primary:active, .button.primary:active, .primary:disabled {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+input[type='submit'].primary:disabled, input[type='button'].primary:disabled {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+button.primary:disabled, .button.primary:disabled, .primary:disabled:hover {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+input[type='submit'].primary:disabled:hover, input[type='button'].primary:disabled:hover {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+button.primary:disabled:hover, .button.primary:disabled:hover, .primary:disabled:focus {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+input[type='submit'].primary:disabled:focus, input[type='button'].primary:disabled:focus {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+
+button.primary:disabled:focus, .button.primary:disabled:focus {
+       background-color: #00a2e9;
+       color: #bbb;
+}
+input, textarea, select, button {
+               font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+}
+
+
+/* LOG IN & INSTALLATION ------------------------------------------------------------ */
+/* overrides another !important statement that sets this to unreadable black */
+#datadirContent label {
+       width: 100%;
+}
+
+/* Nicely grouping input field sets */
+.grouptop, .groupmiddle, .groupbottom {
+       position: relative;
+       -webkit-user-select: none;
+       -moz-user-select: none;
+       -ms-user-select: none;
+       user-select: none;
+}
+
+#body-login .grouptop input, .grouptop input {
+       margin-bottom: 0 !important;
+       border-bottom: 0 !important;
+       border-bottom-left-radius: 0 !important;
+       border-bottom-right-radius: 0 !important;
+}
+
+#body-login .groupmiddle input, .groupmiddle input {
+       margin-top: 0 !important;
+       margin-bottom: 0 !important;
+       border-top: 0 !important;
+       border-bottom: 0 !important;
+       border-radius: 0 !important;
+       box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
+}
+
+#body-login .groupbottom input, .groupbottom input {
+       margin-top: 0 !important;
+       border-top: 0 !important;
+       border-top-right-radius: 0 !important;
+       border-top-left-radius: 0 !important;
+       box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
+}
+
+#body-login .groupbottom input[type=submit] {
+       box-shadow: none !important;
+}
+
+/* keep the labels for screen readers but hide them since we use placeholders */
+label.infield {
+       display: none;
+}
+
+/* Show password toggle */
+#show, #dbpassword {
+       position: absolute;
+       right: 1em;
+       top: .8em;
+       float: right;
+}
+
+#show, #dbpassword, #personal-show {
+       display: none;
+}
+
+#show + label, #dbpassword + label {
+       right: 21px;
+       top: 15px !important;
+       margin: -14px !important;
+       padding: 14px !important;
+}
+
+#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
+       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)';
+       opacity: .8;
+}
+
+#show + label, #dbpassword + label, #personal-show + label {
+       position: absolute !important;
+       height: 20px;
+       width: 24px;
+       background-image: url("../img/actions/toggle.svg?v=1");
+       background-repeat: no-repeat;
+       background-position: center;
+       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
+       opacity: .3;
+}
+
+#show + label:before, #dbpassword + label:before, #personal-show + label:before {
+       display: none;
+}
+
+#pass2, input[name='personal-password-clone'] {
+       padding: .6em 2.5em .4em .4em;
+       width: 8em;
+}
+
+#personal-show + label {
+       height: 14px;
+       margin-top: -25px;
+       left: 295px;
+       display: block;
+}
+
+#passwordbutton {
+       margin-left: .5em;
+}
+
+/* Warnings and errors are the same */
+#body-user .warning, #body-settings .warning {
+       margin-top: 8px;
+       padding: 5px;
+       background: #fdd;
+       border-radius: 3px;
+}
+
+.warning legend, .warning a {
+       color: #fff !important;
+       font-weight: 600 !important;
+}
+
+.error a {
+       color: #fff !important;
+       font-weight: 600 !important;
+}
+.error a.button {
+       color: #555 !important;
+       display: inline-block;
+       text-align: center;
+}
+.error pre {
+       white-space: pre-wrap;
+       text-align: left;
+}
+
+.error-wide {
+       width: 700px;
+       margin-left: -200px !important;
+}
+.error-wide .button {
+       color: black !important;
+}
+
+.warning-input {
+       border-color: #ce3702 !important;
+}
+
+/* Alternative Logins */
+#alternative-logins legend {
+       margin-bottom: 10px;
+}
+#alternative-logins li {
+       height: 40px;
+       display: inline-block;
+       white-space: nowrap;
+}
+
+#remember_login {
+       margin: 18px 5px 0 16px !important;
+}
+
+#body-login {
+       background-attachment: fixed;
+       /* fix background gradient */
+       height: 100%;
+}
+#body-login #header {
+       padding-top: 100px;
+}
+#body-login p.info, #body-login form fieldset legend, #body-login #datadirContent label {
+       text-align: center;
+       color: #fff;
+}
+#body-login form fieldset .warning-info, #body-login form input[type='checkbox'] + label {
+       text-align: center;
+       color: #fff;
+}
+#body-login form .warning input[type='checkbox']:hover + label, #body-login form .warning input[type='checkbox']:focus + label, #body-login form .warning input[type='checkbox'] + label {
+       color: #fff !important;
+}
+#body-login .update h2 {
+       margin: 0 0 20px;
+}
+#body-login .update a {
+       color: #fff;
+       border-bottom: 1px solid #aaa;
+}
+#body-login .infogroup {
+       margin-bottom: 15px;
+}
+#body-login p#message img {
+       vertical-align: middle;
+       padding: 5px;
+}
+#body-login div.buttons {
+       text-align: center;
+}
+#body-login p.info {
+       margin: 0 auto;
+       padding-top: 20px;
+       -webkit-user-select: none;
+       -moz-user-select: none;
+       -ms-user-select: none;
+       user-select: none;
+}
+#body-login p.info a {
+       font-weight: 600;
+       padding: 13px;
+       margin: -13px;
+}
+#body-login form {
+       position: relative;
+       width: 280px;
+       margin: 16px auto;
+       padding: 0;
+}
+#body-login form fieldset {
+       margin-bottom: 20px;
+       text-align: left;
+       -webkit-user-select: none;
+       -moz-user-select: none;
+       -ms-user-select: none;
+       user-select: none;
+}
+#body-login form #sqliteInformation {
+       margin-top: -20px;
+       margin-bottom: 20px;
+}
+#body-login form #adminaccount {
+       margin-bottom: 15px;
+}
+#body-login form fieldset legend {
+       width: 100%;
+}
+#body-login #datadirContent label {
+       display: block;
+       margin: 0;
+}
+#body-login form #datadirField legend {
+       margin-bottom: 15px;
+}
+#body-login #showAdvanced {
+       padding: 13px;
+       /* increase clickable area of Advanced dropdown */
+}
+#body-login #showAdvanced img {
+       vertical-align: bottom;
+       /* adjust position of Advanced dropdown arrow */
+       margin-left: -4px;
+}
+#body-login .icon-info-white {
+       padding: 10px;
+}
+#body-login .strengthify-wrapper {
+       display: inline-block;
+       position: relative;
+       left: 15px;
+       top: -23px;
+       width: 250px;
+}
+#body-login .tipsy-inner {
+       font-weight: bold;
+       color: #ccc;
+}
+#body-login input[type='text'], #body-login input[type='password'], #body-login input[type='email'] {
+       border: none;
+       font-weight: 300;
+}
+#body-login .remember-login-container {
+       display: inline-block;
+       margin: 10px 0;
+       text-align: center;
+       width: 100%;
+}
+#body-login #forgot-password {
+       padding: 11px;
+       float: right;
+       color: #fff;
+}
+#body-login .wrapper {
+       min-height: 100%;
+       margin: 0 auto -70px;
+       width: 300px;
+}
+#body-login footer, #body-login .push {
+       height: 70px;
+}
+#body-login form #selectDbType {
+       text-align: center;
+       white-space: nowrap;
+       margin: 0;
+}
+#body-login form #selectDbType .info {
+       white-space: normal;
+}
+#body-login form #selectDbType label {
+       position: static;
+       margin: 0 -3px 5px;
+       font-size: 12px;
+       background: #f8f8f8;
+       color: #888;
+       cursor: pointer;
+       border: 1px solid #ddd;
+}
+#body-login form #selectDbType label span {
+       cursor: pointer;
+       padding: 10px 20px;
+}
+#body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active {
+       color: #000;
+       background-color: #e8e8e8;
+}
+#body-login .warning, #body-login .update, #body-login .error {
+       display: block;
+       padding: 10px;
+       background-color: rgba(0, 0, 0, 0.3);
+       color: #fff;
+       text-align: left;
+       border-radius: 3px;
+       cursor: default;
+}
+#body-login .update {
+       width: inherit;
+       text-align: center;
+}
+#body-login .update .appList {
+       list-style: disc;
+       text-align: left;
+       margin-left: 25px;
+       margin-right: 25px;
+}
+#body-login .v-align {
+       width: inherit;
+}
+#body-login .update img.float-spinner {
+       float: left;
+}
+#body-login form input[type='checkbox'] + label {
+       position: relative;
+       margin: 0;
+       padding: 14px;
+       vertical-align: middle;
+       -webkit-user-select: none;
+       -moz-user-select: none;
+       -ms-user-select: none;
+       user-select: none;
+}
+#body-login form .errors {
+       background: #fed7d7;
+       border: 1px solid #f00;
+       list-style-indent: inside;
+       margin: 0 0 2em;
+       padding: 1em;
+}
+#body-login .success {
+       background: #d7fed7;
+       border: 1px solid #0f0;
+       width: 35%;
+       margin: 30px auto;
+       padding: 1em;
+       text-align: center;
+}
+#body-login #showAdvanced > img {
+       padding: 4px;
+       box-sizing: border-box;
+}
+#body-login p.info a, #body-login #showAdvanced {
+       color: #fff;
+}
+#body-login #remember_login:hover + label, #body-login #remember_login:focus + label {
+       opacity: .6;
+}
+#body-login #forgot-password:hover, #body-login #forgot-password:focus {
+       opacity: .6;
+}
+#body-login p.info a:hover, #body-login p.info a:focus {
+       opacity: .6;
+}
+#body-login input {
+       font-size: 20px;
+       margin: 5px;
+       padding: 11px 10px 9px;
+}
+#body-login input[type='text'], #body-login input[type='password'] {
+       width: 249px;
+}
+#body-login input.login {
+       width: 269px;
+       background-position: right 16px center;
+}
+#body-login input[type='submit'] {
+       padding: 10px 20px;
+       /* larger log in and installation buttons */
+}
+#body-login ul.error-wide {
+       margin-top: 35px;
+}
+#body-login .warning {
+       margin: 0 7px 5px 4px;
+}
+#body-login .warning legend {
+       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+       opacity: 1;
+}
+#body-login a.warning {
+       cursor: pointer;
+}
+#body-login .updateProgress .error {
+       margin-top: 10px;
+       margin-bottom: 10px;
+}
index affaec1434276b606d80ca7df6ba1f2b68f289ca..28c3fb86c7275c9091490b1234ab7d271cad3fdf 100644 (file)
@@ -292,478 +292,6 @@ body {
        opacity: .4;
 }
 
-/* LOG IN & INSTALLATION ------------------------------------------------------------ */
-
-/* Some whitespace to the top */
-
-#body-login {
-       #header {
-               padding-top: 100px;
-       }
-       background-attachment: fixed;
-       /* fix background gradient */
-       height: 100%;
-       /* fix sticky footer */
-       p.info, form fieldset legend, #datadirContent label {
-               text-align: center;
-               color: #fff;
-       }
-       form {
-               fieldset .warning-info, input[type='checkbox'] + label {
-                       text-align: center;
-                       color: #fff;
-               }
-               .warning input[type='checkbox'] {
-                       &:hover + label, &:focus + label, + label {
-                               color: #fff !important;
-                       }
-               }
-       }
-       .update {
-               h2 {
-                       margin: 0 0 20px;
-               }
-               a {
-                       color: #fff;
-                       border-bottom: 1px solid #aaa;
-               }
-       }
-       .infogroup {
-               margin-bottom: 15px;
-       }
-       p#message img {
-               vertical-align: middle;
-               padding: 5px;
-       }
-       div.buttons {
-               text-align: center;
-       }
-       p.info {
-               margin: 0 auto;
-               padding-top: 20px;
-               -webkit-user-select: none;
-               -moz-user-select: none;
-               -ms-user-select: none;
-               user-select: none;
-               a {
-                       font-weight: 600;
-                       padding: 13px;
-                       margin: -13px;
-               }
-       }
-       form {
-               position: relative;
-               width: 280px;
-               margin: 16px auto;
-               padding: 0;
-               fieldset {
-                       margin-bottom: 20px;
-                       text-align: left;
-                       -webkit-user-select: none;
-                       -moz-user-select: none;
-                       -ms-user-select: none;
-                       user-select: none;
-               }
-               #sqliteInformation {
-                       margin-top: -20px;
-                       margin-bottom: 20px;
-               }
-               #adminaccount {
-                       margin-bottom: 15px;
-               }
-               fieldset legend {
-                       width: 100%;
-               }
-       }
-}
-
-/* Dark subtle label text */
-
-/* overrides another !important statement that sets this to unreadable black */
-
-#datadirContent label {
-       width: 100%;
-}
-
-#body-login {
-       #datadirContent label {
-               display: block;
-               margin: 0;
-       }
-       form #datadirField legend {
-               margin-bottom: 15px;
-       }
-       #showAdvanced {
-               padding: 13px;
-               /* increase clickable area of Advanced dropdown */
-               img {
-                       vertical-align: bottom;
-                       /* adjust position of Advanced dropdown arrow */
-                       margin-left: -4px;
-               }
-       }
-       .icon-info-white {
-               padding: 10px;
-       }
-       .strengthify-wrapper {
-               display: inline-block;
-               position: relative;
-               left: 15px;
-               top: -23px;
-               width: 250px;
-       }
-       .tipsy-inner {
-               font-weight: bold;
-               color: #ccc;
-       }
-       input {
-               &[type='text'], &[type='password'], &[type='email'] {
-                       border: none;
-                       font-weight: 300;
-               }
-       }
-}
-
-/* strengthify wrapper */
-
-/* tipsy for the strengthify wrapper looks better with following font settings */
-
-/* General new input field look */
-
-/* Nicely grouping input field sets */
-
-.grouptop, .groupmiddle, .groupbottom {
-       position: relative;
-       -webkit-user-select: none;
-       -moz-user-select: none;
-       -ms-user-select: none;
-       user-select: none;
-}
-
-#body-login .grouptop input, .grouptop input {
-       margin-bottom: 0 !important;
-       border-bottom: 0 !important;
-       border-bottom-left-radius: 0 !important;
-       border-bottom-right-radius: 0 !important;
-}
-
-#body-login .groupmiddle input, .groupmiddle input {
-       margin-top: 0 !important;
-       margin-bottom: 0 !important;
-       border-top: 0 !important;
-       border-bottom: 0 !important;
-       border-radius: 0 !important;
-       box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
-}
-
-#body-login .groupbottom input, .groupbottom input {
-       margin-top: 0 !important;
-       border-top: 0 !important;
-       border-top-right-radius: 0 !important;
-       border-top-left-radius: 0 !important;
-       box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
-}
-
-#body-login .groupbottom input[type=submit] {
-       box-shadow: none !important;
-}
-
-/* keep the labels for screen readers but hide them since we use placeholders */
-
-label.infield {
-       display: none;
-}
-
-#body-login {
-       form {
-               input[type='checkbox'] + label {
-                       position: relative;
-                       margin: 0;
-                       padding: 14px;
-                       vertical-align: middle;
-                       -webkit-user-select: none;
-                       -moz-user-select: none;
-                       -ms-user-select: none;
-                       user-select: none;
-               }
-               .errors {
-                       background: #fed7d7;
-                       border: 1px solid #f00;
-                       list-style-indent: inside;
-                       margin: 0 0 2em;
-                       padding: 1em;
-               }
-       }
-       .success {
-               background: #d7fed7;
-               border: 1px solid #0f0;
-               width: 35%;
-               margin: 30px auto;
-               padding: 1em;
-               text-align: center;
-       }
-       #showAdvanced > img {
-               padding: 4px;
-               box-sizing: border-box;
-       }
-       p.info a, #showAdvanced {
-               color: #fff;
-       }
-       #remember_login {
-               &:hover + label, &:focus + label {
-                       opacity: .6;
-               }
-       }
-       #forgot-password {
-               &:hover, &:focus {
-                       opacity: .6;
-               }
-       }
-       p.info a {
-               &:hover, &:focus {
-                       opacity: .6;
-               }
-       }
-}
-
-/* Show password toggle */
-
-#show, #dbpassword {
-       position: absolute;
-       right: 1em;
-       top: .8em;
-       float: right;
-}
-
-#show, #dbpassword, #personal-show {
-       display: none;
-}
-
-#show + label, #dbpassword + label {
-       right: 21px;
-       top: 15px !important;
-       margin: -14px !important;
-       padding: 14px !important;
-}
-
-#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
-       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)';
-       opacity: .8;
-}
-
-#show + label, #dbpassword + label, #personal-show + label {
-       position: absolute !important;
-       height: 20px;
-       width: 24px;
-       background-image: url('../img/actions/toggle.svg?v=1');
-       background-repeat: no-repeat;
-       background-position: center;
-       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
-       opacity: .3;
-}
-
-#show + label:before, #dbpassword + label:before, #personal-show + label:before {
-       display: none;
-}
-
-#pass2, input[name='personal-password-clone'] {
-       padding: .6em 2.5em .4em .4em;
-       width: 8em;
-}
-
-#personal-show + label {
-       height: 14px;
-       margin-top: -25px;
-       left: 295px;
-       display: block;
-}
-
-#passwordbutton {
-       margin-left: .5em;
-}
-
-/* Database selector */
-
-#body-login {
-       form #selectDbType {
-               text-align: center;
-               white-space: nowrap;
-               margin: 0;
-               .info {
-                       white-space: normal;
-               }
-               label {
-                       position: static;
-                       margin: 0 -3px 5px;
-                       font-size: 12px;
-                       background: #f8f8f8;
-                       color: #888;
-                       cursor: pointer;
-                       border: 1px solid #ddd;
-                       span {
-                               cursor: pointer;
-                               padding: 10px 20px;
-                       }
-                       &.ui-state-hover, &.ui-state-active {
-                               color: #000;
-                               background-color: #e8e8e8;
-                       }
-               }
-       }
-       .warning, .update, .error {
-               display: block;
-               padding: 10px;
-               background-color: rgba(0, 0, 0, 0.3);
-               color: #fff;
-               text-align: left;
-               border-radius: 3px;
-               cursor: default;
-       }
-       .update {
-               width: inherit;
-               text-align: center;
-               .appList {
-                       list-style: disc;
-                       text-align: left;
-                       margin-left: 25px;
-                       margin-right: 25px;
-               }
-       }
-       .v-align {
-               width: inherit;
-       }
-       .update img.float-spinner {
-               float: left;
-       }
-}
-
-/* Warnings and errors are the same */
-
-#body-user .warning, #body-settings .warning {
-       margin-top: 8px;
-       padding: 5px;
-       background: #fdd;
-       border-radius: 3px;
-}
-
-.warning {
-       legend, a {
-               color: #fff !important;
-               font-weight: 600 !important;
-       }
-}
-
-.error {
-       a {
-               color: #fff !important;
-               font-weight: 600 !important;
-               &.button {
-                       color: #555 !important;
-                       display: inline-block;
-                       text-align: center;
-               }
-       }
-       pre {
-               white-space: pre-wrap;
-               text-align: left;
-       }
-}
-
-.error-wide {
-       width: 700px;
-       margin-left: -200px !important;
-       .button {
-               color: black !important;
-       }
-}
-
-.warning-input {
-       border-color: #ce3702 !important;
-}
-
-/* Fixes for log in page, TODO should be removed some time */
-
-#body-login {
-       ul.error-wide {
-               margin-top: 35px;
-       }
-       .warning {
-               margin: 0 7px 5px 4px;
-               legend {
-                       -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
-                       opacity: 1;
-               }
-       }
-       a.warning {
-               cursor: pointer;
-       }
-       .updateProgress .error {
-               margin-top: 10px;
-               margin-bottom: 10px;
-       }
-}
-
-/* fixes for update page TODO should be fixed some time in a proper way */
-/* this is just for an error while updating the ownCloud instance */
-
-/* Alternative Logins */
-
-#alternative-logins {
-       legend {
-               margin-bottom: 10px;
-       }
-       li {
-               height: 40px;
-               display: inline-block;
-               white-space: nowrap;
-       }
-}
-
-/* Log in and install button */
-
-#body-login input {
-       font-size: 20px;
-       margin: 5px;
-       padding: 11px 10px 9px;
-       &[type='text'], &[type='password'] {
-               width: 249px;
-       }
-       &.login {
-               width: 269px;
-               background-position: right 16px center;
-       }
-       &[type='submit'] {
-               padding: 10px 20px;
-               /* larger log in and installation buttons */
-       }
-}
-
-#remember_login {
-       margin: 18px 5px 0 16px !important;
-}
-
-#body-login {
-       .remember-login-container {
-               display: inline-block;
-               margin: 10px 0;
-               text-align: center;
-               width: 100%;
-       }
-       #forgot-password {
-               padding: 11px;
-               float: right;
-               color: #fff;
-       }
-       .wrapper {
-               min-height: 100%;
-               margin: 0 auto -70px;
-               width: 300px;
-       }
-       footer, .push {
-               height: 70px;
-       }
-}
-
 /* Sticky footer */
 
 /* round profile photos */
index 351e6d1366f149e3d0d2b2a04e68783ed8502d67..6af4e319e363deed389df4a789f0b60817aed4f1 100644 (file)
@@ -39,7 +39,7 @@ class CSSResourceLocator extends ResourceLocator {
         * @param array $party_map
         * @param SCSSCacher $scssCacher
         */
-       public function __construct(ILogger $logger, $theme, $core_map, $party_map, SCSSCacher $scssCacher) {
+       public function __construct(ILogger $logger, $theme, $core_map, $party_map, $scssCacher) {
                $this->scssCacher = $scssCacher;
 
                parent::__construct($logger, $theme, $core_map, $party_map);
@@ -85,12 +85,17 @@ class CSSResourceLocator extends ResourceLocator {
         */
        protected function cacheAndAppendScssIfExist($root, $file, $webRoot = null) {
                if (is_file($root.'/'.$file)) {
-                       if($this->scssCacher->process($root, $file)) {
-                               $this->append($root, $this->scssCacher->getCachedSCSS('core', $file), $webRoot, false);
-                               return true;
+                       if($this->scssCacher !== null) {
+                               if($this->scssCacher->process($root, $file)) {
+                                       $this->append($root, $this->scssCacher->getCachedSCSS('core', $file), $webRoot, false);
+                                       return true;
+                               } else {
+                                       $this->logger->error('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
+                                       return false;
+                               }
                        } else {
-                               $this->logger->error('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
-                               return false;
+                               $this->logger->error('Scss is disabled for '.$root.'/'.$file.', ignoring', ['app' => 'core']);
+                               return true;
                        }
                }
                return false;
index bc6a485ad4369119711ad83200059082c86e2dd1..c3197b002823c508a8726db3b85a0f4814e67787 100644 (file)
@@ -162,14 +162,11 @@ class TemplateLayout extends \OC_Template {
 
                // Add the css files and check if server is already installed to prevent
                // appdata initialisation before database configuration
-               if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+               // Prevent scss initialisation if an update is needed
+               if(\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
                        $cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
                } else {
-                       $cssFiles = array(
-                               [\OC::$SERVERROOT, \OC::$WEBROOT, 'core/css/global.css'],
-                               [\OC::$SERVERROOT, \OC::$WEBROOT, 'core/css/fonts.css'],
-                               [\OC::$SERVERROOT, \OC::$WEBROOT, 'core/css/installation.css']
-                       );
+                       $cssFiles = self::findStylesheetFiles(\OC_Util::$styles, false);
                }
                $this->assign('cssfiles', array());
                $this->assign('printcssfiles', []);
@@ -190,16 +187,20 @@ class TemplateLayout extends \OC_Template {
         * @param array $styles
         * @return array
         */
-       static public function findStylesheetFiles($styles) {
+       static public function findStylesheetFiles($styles, $compileScss = true) {
                // Read the selected theme from the config file
                $theme = \OC_Util::getTheme();
 
-               $SCSSCacher = new SCSSCacher(
-                       \OC::$server->getLogger(),
-                       \OC::$server->getAppDataDir('css'),
-                       \OC::$server->getURLGenerator(),
-                       \OC::$server->getSystemConfig()
-               );
+               if($compileScss) {
+                       $SCSSCacher = new SCSSCacher(
+                               \OC::$server->getLogger(),
+                               \OC::$server->getAppDataDir('css'),
+                               \OC::$server->getURLGenerator(),
+                               \OC::$server->getSystemConfig()
+                       );
+               } else {
+                       $SCSSCacher = null;
+               }
 
                $locator = new \OC\Template\CSSResourceLocator(
                        \OC::$server->getLogger(),