Refactoring the code so that base.css is not required to be manually built but is compiled on each page view which should be fast enough

8 files changed, 59 insertions, 956 deletions

diff --git a/core/AssetManager.php b/core/AssetManager.php
index c3c3101762..5a4a51665e 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -55,6 +55,25 @@ class AssetManager
     const MINIFIED_JS_RATIO = 100;
 
     /**
+     * @param $file
+     * @param $less
+     * @param $mergedContent
+     * @return string
+     */
+    protected static function getCssContentFromFile($file, $less)
+    {
+        self::validateCssFile($file);
+
+        $fileLocation = self::getAbsoluteLocation($file);
+        $less->addImportDir(dirname($fileLocation));
+
+        $content = file_get_contents($fileLocation);
+        $content = self::rewriteCssPathsDirectives($file, $content);
+
+        return $content;
+    }
+
+    /**
      * Returns CSS file inclusion directive(s) using the markup <link>
      *
      * @return string
@@ -106,23 +125,13 @@ class AssetManager
             return;
         }
 
+        $files = self::getStylesheetFiles();
         $less = self::makeLess();
 
         // Loop through each css file
-        $files = self::getStylesheetFiles();
         $mergedContent = "";
         foreach ($files as $file) {
-
-            self::validateCssFile($file);
-
-            $fileLocation = self::getAbsoluteLocation($file);
-            $less->addImportDir(dirname($fileLocation));
-
-            $content = file_get_contents($fileLocation);
-
-            $content = self::rewriteCssPathsDirectives($file, $content);
-
-            $mergedContent = $mergedContent . $content;
+            $mergedContent .= self::getCssContentFromFile($file, $less, $mergedContent);
         }
 
         $fileHash = md5($mergedContent);
@@ -166,6 +175,20 @@ class AssetManager
         return $less;
     }
 
+    /**
+     * Returns the base.less compiled to css
+     *
+     * @return string
+     */
+    public static function getCompiledBaseCss()
+    {
+        $file =  '/plugins/Zeitgeist/stylesheets/base.less';
+        $less = self::makeLess();
+        $lessContent = self::getCssContentFromFile($file, $less);
+        $css = $less->compile($lessContent);
+        return $css;
+    }
+
     /*
      * Rewrite css url directives
      * - rewrites relative paths
@@ -256,7 +279,7 @@ class AssetManager
 
         $stylesheets = self::sortCssFiles($stylesheets);
 
-        // We also look for the currently enabled theme and add CSS from the json
+        // We look for the currently enabled theme and add CSS from the json
         $theme = PluginsManager::getInstance()->getThemeEnabled();
         if($theme) {
             $info = $theme->getInformation();
diff --git a/core/View.php b/core/View.php
index 72395a3598..2898658592 100644
--- a/core/View.php
+++ b/core/View.php
@@ -179,6 +179,7 @@ class View implements ViewInterface
             '~<script type=[\'"]text/javascript[\'"] src=[\'"]([^\'"]+)[\'"]>~',
             '~<script src=[\'"]([^\'"]+)[\'"] type=[\'"]text/javascript[\'"]>~',
             '~<link rel=[\'"]stylesheet[\'"] type=[\'"]text/css[\'"] href=[\'"]([^\'"]+)[\'"] ?/?>~',
+            // removes the double ?cb= tag
             '~(src|href)=\"index.php\?module=([A-Za-z0-9_]+)&action=([A-Za-z0-9_]+)\?cb=~',
         );
 
diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig
index 95c2c5707c..2c359dd2db 100644
--- a/plugins/CoreUpdater/templates/layout.twig
+++ b/plugins/CoreUpdater/templates/layout.twig
@@ -7,7 +7,7 @@
     <meta name="viewport" content="initial-scale=1.0" />
 
     <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/base.css" />
+    <link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
     <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/simple_structure.css"/>
     <link rel="stylesheet" type="text/css" href="plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css" />
     <link rel="stylesheet" type="text/css" href="plugins/CoreUpdater/stylesheets/updateLayout.css" />
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 3c66647838..dbc901c0a1 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -13,6 +13,7 @@ namespace Piwik\Plugins\Installation;
 use Exception;
 use Piwik\Access;
 use Piwik\API\Request;
+use Piwik\AssetManager;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
@@ -22,6 +23,7 @@ use Piwik\DbHelper;
 use Piwik\Filechecks;
 use Piwik\Filesystem;
 use Piwik\Http;
+use Piwik\Log;
 use Piwik\Piwik;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
@@ -111,7 +113,8 @@ class Controller extends \Piwik\Controller\Admin
             $this->getInstallationSteps(),
             __FUNCTION__
         );
-        $view->newInstall = !file_exists(Config::getLocalConfigPath());
+        $isConfigFileFound = file_exists(Config::getLocalConfigPath());
+        $view->newInstall = !$isConfigFileFound;
         $view->errorMessage = $message;
         $this->skipThisStep(__FUNCTION__);
         $view->showNextStep = $view->newInstall;
@@ -533,7 +536,6 @@ class Controller extends \Piwik\Controller\Admin
         $this->createDbFromSessionInformation();
 
         Piwik::setUserIsSuperUser();
-        \Piwik\Log::make();
     }
 
     /**
@@ -588,6 +590,18 @@ class Controller extends \Piwik\Controller\Admin
     }
 
     /**
+     * Prints out the CSS for installer/updater
+     *
+     * During installation and update process, we load a minimal Less file.
+     * At this point Piwik may not be setup yet to write files in tmp/assets/
+     * so in this case we compile and return the string on every request.
+     */
+    public function getBaseCss()
+    {
+        echo AssetManager::getCompiledBaseCss();
+    }
+
+    /**
      * The previous step is valid if it is either
      * - any step before (OK to go back)
      * - the current step (case when validating a form)
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 16fd18bc5e..d7878d40fa 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -63,7 +63,10 @@ class Installation extends \Piwik\Plugin
 
         $step = Common::getRequestVar('action', 'welcome', 'string');
         $controller = $this->getInstallationController();
-        if (in_array($step, array_keys($controller->getInstallationSteps())) || $step == 'saveLanguage') {
+        $isActionWhiteListed = in_array($step, array( 'saveLanguage', 'getBaseCss'));
+        if (in_array($step, array_keys($controller->getInstallationSteps()))
+            || $isActionWhiteListed
+        ) {
             $controller->$step($message);
         } else {
             Piwik::exitWithErrorMessage(Piwik_Translate('Installation_NoConfigFound'));
diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig
index cfdbc43193..34ec501a8d 100644
--- a/plugins/Installation/templates/layout.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Piwik &rsaquo; {{ 'Installation_Installation'|translate }}</title>
     <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
-    <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/base.css"/>
+    <link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
     <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
     <script type="text/javascript" src="libs/jquery/jquery.js"></script>
     <script type="text/javascript" src="libs/jquery/jquery-ui.js"></script>
diff --git a/plugins/Zeitgeist/stylesheets/base.css b/plugins/Zeitgeist/stylesheets/base.css
deleted file mode 100644
index ffd6c57213..0000000000
--- a/plugins/Zeitgeist/stylesheets/base.css
+++ /dev/null
@@ -1,935 +0,0 @@
-/* TO GENERATE: lessc plugins/Zeitgeist/stylesheets/base.less plugins/Zeitgeist/stylesheets/base.css */
-/* base.less is a standalone Less file */
-/* base.css is automatically generated. DO NOT MODIFY */
-/* General styles */
-/* reset style */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-font,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-size: 100%;
-  vertical-align: baseline;
-  background: transparent;
-}
-abbr {
-  border-bottom: 1px dotted;
-}
-form {
-  margin: 0;
-}
-body {
-  line-height: 1.33;
-  background-color: white;
-  color: #333;
-}
-ol, ul {
-  list-style: none;
-}
-blockquote, q {
-  quotes: none;
-}
-code {
-  background-color: #F6F9F9;
-  border: 1px dashed;
-  border-left: 5px solid  #4B4BD5;
-  direction: ltr;
-  display: table;
-  font-size: 100%;
-  margin: 12px 2px 0;
-  padding: 5px 50px 5px 15px;
-  text-align: left;
-  line-height: 1.3em;
-  font-family: "Courier New" Courier monospace;
-}
-pre.code-pre {
-  white-space: pre-wrap;
-}
-/* remember to define focus styles! */
-:focus {
-  outline: 0;
-}
-/* remember to highlight inserts somehow! */
-ins {
-  text-decoration: none;
-}
-del {
-  text-decoration: line-through;
-}
-/* form general */
-label {
-  cursor: pointer;
-}
-textarea {
-  font-size: 1em;
-}
-input, select, textarea {
-  border-radius: 4px;
-  border: 1px solid #d4d4d4;
-  background: #ffffff url(plugins/Zeitgeist/images/inp_bg.png) repeat-x 0 0;
-  padding: 3px 10px;
-  color: #255792;
-  margin-bottom: 3px;
-}
-input[disabled] {
-  background: #E9E9E9 none;
-  font-style: italic;
-}
-select {
-  padding-right: 3px;
-  padding-left: 7px;
-  margin-right: 6px;
-}
-/* start piwik styles */
-body {
-  font-family: Arial, Verdana, Helvetica, sans-serif;
-  font-size: 1em;
-}
-a {
-  color: #255792;
-  text-decoration: underline;
-  cursor: pointer;
-}
-#root {
-  margin: 0 10px;
-  position: relative;
-}
-/* br clear="all" deprecated */
-br.clearAll {
-  clear: both;
-  height: 0;
-  line-height: 0;
-  font-size: 0;
-  /*for IE*/
-
-}
-br.clear, div.clear {
-  clear: both;
-  height: 0;
-  overflow: hidden;
-}
-/* IE < 9 will use this */
-html.old-ie .ie-hide {
-  display: none;
-}
-.centerLargeDiv {
-  width: 850px;
-  margin: auto;
-}
-.center {
-  margin: auto;
-  text-align: center;
-  padding-bottom: 10px;
-}
-.section-toggler-link {
-  font-size: .8em;
-  font-style: italic;
-  text-decoration: none;
-}
-.section-toggler-link:hover {
-  text-decoration: underline;
-}
-.metricEvolution {
-  display: inline-block;
-  font-size: 9pt;
-  opacity: 0.75;
-}
-.reportsByDimensionView > .entityList {
-  float: left;
-  width: 220px;
-  min-height: 450px;
-}
-.dimensionCategory {
-  margin-top: 10px;
-}
-.submit {
-  clear: both;
-  color: #fff;
-  font: 18px Arial, Helvetica, sans-serif;
-  padding: 3px 10px;
-  border-radius: 4px;
-  border: 0;
-  background: #847b6d url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0;
-  float: right;
-  margin: 12px 0 10px 0;
-  cursor: pointer;
-}
-/* on admin screen, Save button aligned on the left */
-.admin .submit {
-  margin-left: 50px;
-  float: none;
-}
-.admin .entityContainer .submit {
-  margin: 0;
-}
-.entityContainer .link_but {
-  white-space: nowrap;
-  display: inline-block;
-  margin: 0 10px 0 0;
-  text-decoration: none;
-}
-.entityContainer .link_but img {
-  white-space: nowrap;
-  margin: 0 1px 0 0 !important;
-}
-.entityAddContainer .entityTable th, #entityEditContainer .entityTable th, #entityEditContainer .entityTable td {
-  vertical-align: middle !important;
-}
-.entityAddContainer .entityTable tr td.first {
-  font-weight: bold;
-}
-.entityAddContainer tr:hover {
-  background: none !important;
-}
-/* Add / Edit / List entities */
-.entityContainer {
-  width: 800px;
-  font-size: 14px;
-}
-.entityInlineHelp {
-  color: #9B9B9B;
-  margin-top: 5px;
-}
-.entityTable {
-  border-radius: 4px !important;
-  border-top: 1px solid #cdc8bf !important;
-  border-bottom: 1px solid #948c7d !important;
-}
-.entityTable tr th {
-  font-size: 16px;
-}
-.entityTable tr td.first, .entityTable tr th.first {
-  border-left: 0 !important;
-  vertical-align: middle;
-}
-.entityTable tr th {
-  white-space: nowrap;
-  padding-top: 10px !important;
-  padding-bottom: 10px !important;
-}
-.entityTable tr td, .entityTable tr th {
-  border-bottom: 0 !important;
-  border-top: 1px solid #E7E7E7 !important;
-}
-table.entityTable tr td a {
-  text-decoration: underline;
-}
-.entityTable tr.highlighted td {
-  background-color: #ECF9DD;
-}
-/* cancel button below Forms */
-.entityCancel {
-  float: right;
-  clear: both;
-  padding: 10px 0;
-  font-size: 12px;
-}
-/* List with grey arrows on left */
-.entityList ul.listCircle {
-  font-weight: normal;
-  list-style: none;
-  padding: 4px 0;
-}
-.entityList ul li {
-  background: #ffffff url(plugins/Zeitgeist/images/li_dbl_gray.gif) no-repeat 6px 10px;
-  padding: 0 0 0 21px;
-  line-height: 22px;
-}
-.entityList ul li .dimension {
-  cursor: pointer;
-  border-bottom: 1px solid #d0d0d0;
-}
-.entityList ul li.activeDimension .dimension {
-  font-weight: bold;
-  border: 0;
-}
-.entityList ul.listCircle li a {
-  color: #000;
-}
-/* jQuery Tooltip */
-#tooltip h3 {
-  font-weight: normal;
-  font-size: .85em;
-  font-style: italic;
-  color: #162540;
-  margin: 0;
-  padding: 0;
-}
-#tooltip {
-  position: absolute;
-  z-index: 3000;
-  border: 1px solid #e4e2d7 /*#111*/;
-  padding: 5px 7px 5px 7px;
-  background-color: #F5F7FF;
-  opacity: 0.95;
-}
-/* jQuery Ajax */
-.ajaxError {
-  color: red;
-  text-align: center;
-  font-weight: bold;
-  width: 550px;
-  border: 3px solid red;
-  margin: 10px;
-  padding: 10px;
-  border-radius: 9px;
-}
-.ajaxSuccess {
-  font-size: 14px;
-  margin: 10px;
-  padding: 15px;
-  color: #301901;
-  display: inline-block;
-  background-color: #ffffe0;
-  border: 1px solid #e6db55;
-  border-radius: 3px;
-}
-/* extending the jquery UI css, for visitor Log popover */
-.ui-widget .dataTable {
-  font-size: 14px;
-}
-/* for inline help */
-.ui-widget {
-  text-align: justify;
-}
-.ui-inline-help {
-  padding: 0.7em;
-  width: 170px;
-  margin-top: 20px;
-  font-size: 8pt;
-  line-height: 140%;
-}
-div.ui-state-highlight {
-  border-color: #545903;
-  background-color: #FFFFD6;
-}
-.ui-datepicker {
-  border: 1px solid #fff !important;
-  border-radius: 0 !important;
-  font-size: 11px !important;
-  padding: 0 !important;
-  width: 160px !important;
-}
-.ui-datepicker-header {
-  background: #847b6d url(../images/dashboard_h_bg_hover.png) repeat-x 0 0 !important;
-  color: #fff !important;
-  border-radius: 0 !important;
-}
-.ui-datepicker select {
-  padding: 0;
-}
-.ui-datepicker-header .ui-icon-circle-triangle-w {
-  background: url(../images/datepicker_arr_l.png) no-repeat 5px 4px !important;
-}
-.ui-datepicker-header .ui-icon-circle-triangle-e {
-  background: url(../images/datepicker_arr_r.png) no-repeat 6px 4px !important;
-}
-.ui-datepicker .ui-datepicker-next-hover, .ui-datepicker .ui-datepicker-prev-hover {
-  background: none !important;
-  border-color: #f1f0eb !important;
-}
-.ui-datepicker table {
-  font-size: 11px !important;
-  margin: 0 !important;
-}
-.ui-datepicker th {
-  color: #887f71 !important;
-  font-weight: normal !important;
-  background: #f1f0eb !important;
-  padding: 3px 0 !important;
-}
-.ui-datepicker th.ui-datepicker-week-end {
-  background: #d4d0c7 !important;
-}
-.ui-datepicker td {
-  padding: 0 !important;
-}
-.ui-state-default {
-  border: 1px solid #f2f6f9 !important;
-  border-right: 0 !important;
-  background: #fff !important;
-  color: #000 !important;
-  text-align: center !important;
-}
-.ui-datepicker td.ui-datepicker-week-end .ui-state-default {
-  background: #f6f6f6 !important;
-}
-.ui-datepicker td.ui-datepicker-current-period a.ui-state-default,
-td .ui-state-active,
-.ui-datepicker td.ui-datepicker-current-period a.ui-state-active,
-.ui-datepicker td.ui-datepicker-week-end .ui-state-active,
-.ui-datepicker td.ui-datepicker-other-month.ui-datepicker-current-period {
-  border-color: #887f71 !important;
-  background: #887f71 !important;
-  color: #fff !important;
-  opacity: 1 !important;
-}
-.ui-datepicker td .ui-state-hover, .ui-datepicker .ui-datepicker td.ui-datepicker-current-period a.ui-state-hover, .ui-datepicker td.ui-datepicker-week-end .ui-state-hover {
-  background: #e5e3e0 !important;
-  color: #000 !important;
-}
-.ui-datepicker td.ui-datepicker-current-period .ui-state-default.ui-state-hover, .ui-datepicker td.ui-datepicker-current-period .ui-state-hover:hover {
-  background: #978c7c !important;
-  border-color: #978c7c !important;
-}
-td.ui-datepicker-other-month.ui-state-hover {
-  background: #e5e3e0 !important;
-  color: #000 !important;
-  opacity: 1 !important;
-  border-style: none;
-  cursor: pointer !important;
-}
-td.ui-datepicker-other-month.ui-state-hover.ui-datepicker-current-period {
-  background: #978c7c !important;
-}
-.ui-datepicker-month:disabled {
-  border-color: #ccc !important;
-  background: #f5f3f0 !important;
-}
-/* Piwik jQuery UI Tooltips */
-.ui-tooltip {
-  position: absolute;
-  z-index: 2000;
-  text-align: left;
-  background: #f7f7f7;
-  color: #444;
-  font-size: 12px;
-  font-weight: normal;
-  border: 1px solid #e4e5e4;
-  padding: 5px 10px 6px 10px;
-  border-radius: 4px;
-  -moz-box-shadow: 1px 1px 2px #666;
-  -webkit-box-shadow: 1px 1px 2px #666;
-  box-shadow: 1px 1px 2px #666;
-  overflow: hidden;
-  max-width: 600px;
-  min-width: 50px;
-  line-height: 14px;
-  left: -28000px;
-  top: -28000px;
-  display: none;
-  font-family: Arial, Helvetica, sans-serif;
-}
-.ui-tooltip h3 {
-  font-weight: bold;
-  color: #7E7363;
-}
-.ui-tooltip h3 {
-  font-size: 12px;
-  margin: 0 0 2px 0;
-}
-body .ui-tooltip.small {
-  font-size: 11px;
-  padding: 3px 5px 3px 6px;
-}
-/* Popover */
-.ui-dialog .ui-widget-header {
-  background: none;
-  border: 0;
-  font: bold 18px Arial, Helvetica, sans-serif;
-  color: #7e7363;
-  clear: both;
-}
-.ui-dialog-titlebar-help {
-  position: absolute;
-  right: 33px;
-  top: 50%;
-  width: 16px;
-  margin: -8px 0 0 0;
-  padding: 0;
-  height: 16px;
-  background: url(plugins/Zeitgeist/images/help.png);
-  overflow: hidden;
-}
-/* Component styles */
-#header {
-  min-height: 60px;
-}
-/* Clear fix */
-#header:after {
-  display: table;
-  clear: both;
-  content: "";
-}
-#logo {
-  float: left;
-  padding-top:5px;
-}
-#logo > a {
-  text-decoration: none;
-}
-#javascriptDisabled, #javascriptDisabled a {
-  font-weight: bold;
-  color: #F88D22;
-  padding: 15px;
-  clear: both;
-}
-#topBars {
-  float: right;
-  color: #9c9c9c;
-  margin: 4px 0 8px;
-  font-size: 13px;
-}
-#topLeftBar, #topRightBar {
-  margin-bottom: 4px;
-  float: left;
-}
-#topLeftBar {
-  margin-right: 40px;
-}
-.topBarElem {
-  padding: 0 5px;
-  display: inline-block;
-}
-/* About Piwik box top right */
-#header_message {
-  z-index: 0;
-  cursor: default;
-  position: absolute;
-  right: 4px;
-  overflow: hidden;
-  display: block;
-  height: 20px;
-  line-height: 20px;
-  padding: 5px 8px 5px 38px;
-  font-size: 14px;
-  border-radius: 4px;
-}
-#header_message:hover, #header_message.active {
-  width: auto;
-  height: auto;
-  z-index: 150;
-}
-#header_message .header_short {
-  display: block;
-  white-space: nowrap;
-}
-#header_message .header_full {
-  display: none;
-}
-#header_message:hover .header_short, #header_message.active .header_short {
-  display: none;
-}
-#header_message:hover .header_full, #header_message.active .header_full {
-  display: block;
-}
-.header_full {
-  padding-bottom: 5px;
-  line-height: 1.7em;
-}
-/* Orange alerts box */
-.header_alert {
-  background: #fffdf7 url(plugins/Zeitgeist/images/ico_alert.png) no-repeat 7px 4px;
-  border: 1px solid #FF7F00;
-  font-weight: bold;
-}
-.header_alert, .header_alert a {
-  color: #FF7F00;
-}
-/* Blue info box */
-.header_info {
-  background: #fafafa url(plugins/Zeitgeist/images/ico_info.png) no-repeat 7px 4px;
-  border: 1px solid #CBD9EB;
-}
-.header_info, .header_info a {
-  color: #444;
-}
-/*sites_autocomplete*/
-.sites_autocomplete {
-  position: absolute;
-  font-size: 12px;
-  display: inline-block;
-}
-.top_bar_sites_selector {
-  float: right;
-}
-.top_bar_sites_selector > label {
-  display: inline-block;
-  padding: 7px 0 6px 0;
-  float: left;
-  font-size: 12px;
-}
-.top_bar_sites_selector > .sites_autocomplete {
-  position: static;
-  padding-left: 12px;
-}
-.autocompleteMatched {
-  color: #5256BE;
-  font-weight: bold;
-}
-.sites_autocomplete .custom_select {
-  float: left;
-  position: relative;
-  z-index: 19;
-  padding: 6px 6px 5px 6px;
-  background: #ffffff url(plugins/Zeitgeist/images/sites_selection.png) repeat-x 0 0;
-  border: 1px solid #d4d4d4;
-  color: #255792;
-  border-radius: 4px;
-}
-.sites_autocomplete .custom_select_main_link {
-  padding: 0 20px 0 4px;
-  display: block;
-  text-decoration: none;
-  background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) no-repeat right 0;
-}
-.sites_autocomplete .custom_select_main_link.noselect {
-  padding: 0 8px;
-  display: block;
-  text-decoration: none;
-  background: none;
-}
-.sites_autocomplete .custom_select_loading {
-  background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat right 3px;
-}
-.sites_autocomplete .custom_select_ul_list, .sites_autocomplete ul.ui-autocomplete {
-  position: relative;
-  list-style: none;
-  line-height: 18px;
-  padding: 0 0 15px 0;
-}
-.sites_autocomplete .custom_select_ul_list li a, .sites_autocomplete .custom_select_all a {
-  line-height: 18px;
-  padding: 0 20px 0 4px;
-  height: auto;
-  display: block;
-  text-decoration: none;
-}
-.sites_autocomplete .custom_select_ul_list li a:hover, .sites_autocomplete .custom_select_all a:hover {
-  background: #ebeae6;
-}
-.sites_autocomplete .custom_select_all a {
-  text-decoration: none;
-  margin: 0 0 5px 0;
-}
-.sites_autocomplete .custom_select_search {
-  margin: 0 0 0 4px;
-  height: 26px;
-  display: block;
-  white-space: nowrap;
-  background: url(plugins/Zeitgeist/images/search_bg.png) no-repeat 0 0;
-}
-.sites_autocomplete .custom_select_search .inp {
-  vertical-align: top;
-  width: 114px;
-  padding: 2px 6px;
-  border: 0;
-  background: transparent;
-  font-size: 10px;
-  color: #454545;
-}
-.sites_autocomplete .custom_select_search .but {
-  vertical-align: top;
-  font-size: 10px;
-  border: 0;
-  background: transparent;
-  width: 21px;
-  height: 17px;
-  overflow: hidden;
-  opacity: 0;
-  cursor: pointer;
-}
-.sites_selector_container > .sites_autocomplete {
-  padding-left: 12px;
-}
-.custom_select_block {
-  height: 0;
-  overflow: hidden;
-}
-.custom_select_block_show {
-  height: auto;
-  overflow: visible;
-  padding-top: 5px;
-}
-.siteSelect a {
-  white-space: normal;
-  text-align: left;
-}
-#periodString {
-  display: block;
-  color: #444;
-  font-size: 14px;
-  border: 1px solid #e4e5e4;
-  padding: 5px 30px 6px 10px;
-  border-radius: 4px;
-  float: left;
-  margin-right: 12px;
-  z-index: 999;
-  position: absolute;
-  background-color: #f7f7f7;
-}
-#periodString:hover {
-  background-color: #f1f0eb;
-  border-color: #a9a399;
-}
-#periodString .calendar-icon {
-  width: 13px;
-  height: 15px;
-  display: inline-block;
-  position: absolute;
-  right: 9px;
-  top: 7px;
-  background: url("plugins/Zeitgeist/images/icon-calendar.gif") no-repeat scroll;
-  cursor: pointer;
-}
-#periodString #date {
-  cursor: pointer;
-  padding: 5px 10px 6px 10px;
-  margin: -5px -10px -6px -10px;
-}
-#periodString #date img {
-  vertical-align: middle;
-  margin: 0 0 0 6px;
-}
-#periodString strong {
-  color: #255792;
-}
-#periodString h6 {
-  font-size: 14px;
-  padding: 0 0 4px 0;
-}
-#periodMore {
-  padding: 6px 0 0 0;
-  display: none;
-}
-#periodString .period-date, #periodString .period-range {
-  float: left;
-  padding: 0 16px 0 0;
-}
-#periodString .period-type {
-  float: left;
-  padding: 0 20px 0 0;
-}
-#periodString .period-type label {
-  font-size: 12px;
-  display: inline-block;
-  padding: 2px 0 3px 0;
-  vertical-align: top;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-#periodString label.selected-period-label {
-  text-decoration: underline;
-}
-#languageSelect {
-  max-height: 400px;
-  overflow-y: auto;
-  overflow-x: hidden;
-  padding: 0 !important;
-  z-index: 9999;
-  background: #FFF;
-  border: 1px solid #1F447F!important;
-  position: relative;
-}
-#languageSelection > form {
-  display: inline-block;
-}
-#languageSelection input, #languageSelection select {
-  display: none;
-}
-#languageSelection .ui-autocomplete-input:after {
-  display: inline;
-  content: " \25BC";
-}
-#languageSelection .ui-autocomplete-input {
-  text-decoration: underline;
-}
-#languageSelect .ui-autocomplete-input:hover {
-  text-decoration: underline;
-}
-#languageSelect a {
-  text-decoration: none!important;
-  padding: 1px 25px 1px 3px!important;
-}
-#languageSelect a:hover {
-  background: #176999!important;
-  color: #FFF!important;
-}
-.loadingPiwik {
-  font-size: 1.1em;
-  color: #444;
-  padding: 0.5em;
-}
-.loadingPiwik img {
-  margin-right: 5px;
-}
-.loadingSegment {
-  color: grey;
-  font-size: 10pt;
-  margin-left: 28px;
-  display: none;
-}
-#loadingError {
-  font-weight: bold;
-  font-size: 1.1em;
-  color: #F88D22;
-  padding: 0.5em;
-  margin-left: 30%;
-  display: none;
-}
-/* Remote components */
-.piwik-donate-call {
-  padding: 1em;
-  border: 1px solid #CCC;
-  border-radius: 4px;
-  max-width: 432px;
-  position: relative;
-}
-#piwik-worth {
-  font-size: 1.2em;
-  font-weight: bold;
-  font-style: italic;
-  display: block;
-  margin: 0 1em 0 1em;
-}
-.piwik-donate-slider {
-  height: 56px;
-  margin: 1em 0 1em 1em;
-}
-.piwik-donate-slider > .slider-range {
-  vertical-align: top;
-  position: relative;
-  display: inline-block;
-  border: 1px solid #999;
-  background-color: #f7f7f7;
-  border-radius: 6px;
-  height: 14px;
-  width: 270px;
-  margin: 22px 8px 0 0;
-  cursor: pointer;
-}
-.piwik-donate-slider .slider-position {
-  border: 1px solid #999;
-  background-color: #CCC;
-  border-radius: 3px;
-  height: 18px;
-  width: 10px;
-  position: absolute;
-  top: -3px;
-  left: -1px;
-}
-.piwik-donate-slider .slider-donate-amount {
-  display: inline-block;
-  padding: .3em .5em .3em .5em;
-  margin: 16px 8px 0 0;
-  vertical-align: top;
-  width: 48px;
-  text-align: center;
-  background-color: #CCC;
-  color: #333;
-  cursor: pointer;
-}
-.piwik-donate-slider .slider-smiley-face {
-  margin: 8px 0 8px 0;
-  display: inline-block;
-  cursor: pointer;
-}
-.piwik-donate-call .donate-submit {
-  min-height: 55px;
-  position: relative;
-}
-.piwik-donate-call .donate-submit input {
-  margin-left: 13px;
-  border-style: none;
-  background-image: none;
-  padding: 0;
-}
-.piwik-donate-call .donate-submit a {
-  display: inline-block;
-  margin-left: 1.2em;
-  font-size: 1em;
-  font-style: italic;
-}
-.piwik-donate-call .donate-submit a.donate-spacer {
-  margin-bottom: .5em;
-  visibility: hidden;
-}
-.piwik-donate-call .donate-submit a.donate-one-time {
-  position: absolute;
-  bottom: .5em;
-  right: 1.2em;
-}
-.piwik-donate-call > .piwik-donate-message {
-  margin-bottom: .5em;
-}
-.piwik-donate-call > .piwik-donate-message p {
-  margin-left: 1em;
-}
-.piwik-donate-call > .form-description {
-  margin-top: 1.25em;
-}
-.donate-form-instructions {
-  font-size: .8em;
-  margin: 0 1.25em 0 1.25em;
-  color: #666;
-  font-style: italic;
-}
-.widget .piwik-donate-call {
-  border-style: none;
-}
-.widget .piwik-donate-slider > .slider-range {
-  width: 240px;
-}
diff --git a/plugins/Zeitgeist/stylesheets/base.less b/plugins/Zeitgeist/stylesheets/base.less
index f4afcc6220..caa900da61 100644
--- a/plugins/Zeitgeist/stylesheets/base.less
+++ b/plugins/Zeitgeist/stylesheets/base.less
@@ -1,7 +1,4 @@
-/* TO GENERATE: lessc plugins/Zeitgeist/stylesheets/base.less plugins/Zeitgeist/stylesheets/base.css */
 /* base.less is a standalone Less file */
-/* base.css is automatically generated. DO NOT MODIFY */
-
 
 /* General styles */
 @import "general/_default.less";