Updated remaining files and styles for style separation for themes

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 60f69b6850ef147cf8b4509cc08f9b9c964dff94..c2bb35a39580153a4b696015d104b42b4fb6b104 100644 (file)
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -383,7 +383,7 @@ class AvatarsettingsAction extends AccountSettingsAction
     {
         parent::showStylesheets();
         $jcropStyle =
-          common_path('theme/default/base/css/jquery.Jcrop.css?version='.LACONICA_VERSION);
+          common_path('theme/base/css/jquery.Jcrop.css?version='.LACONICA_VERSION);
 
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',

diff --git a/actions/designsettings.php b/actions/designsettings.php
index 05293f712616acc5e9e44ecf96525d9dd8c67e4b..cdd950e78c42f1ac966d4779eda1f39beb5e8936 100644 (file)
--- a/actions/designsettings.php
+++ b/actions/designsettings.php
@@ -196,7 +196,7 @@ class DesignsettingsAction extends AccountSettingsAction
     {
         parent::showStylesheets();
         $farbtasticStyle =
-          common_path('theme/default/base/css/farbtastic.css?version='.LACONICA_VERSION);
+          common_path('theme/base/css/farbtastic.css?version='.LACONICA_VERSION);
 
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',

diff --git a/theme/base/css/farbtastic.css b/theme/base/css/farbtastic.css
index 3b8fec58f817742ffc9403d89b971a38c9459e19..7efcc73c3b506dcd1e24a7135730ba30b00c125e 100644 (file)
--- a/theme/base/css/farbtastic.css
+++ b/theme/base/css/farbtastic.css
@@ -16,17 +16,17 @@
   height: 101px;
 }
 .farbtastic .wheel {
-  background: url(../../../../js/farbtastic/wheel.png) no-repeat;
+  background: url(../../../js/farbtastic/wheel.png) no-repeat;
   width: 195px;
   height: 195px;
 }
 .farbtastic .overlay {
-  background: url(../../../../js/farbtastic/mask.png) no-repeat;
+  background: url(../../../js/farbtastic/mask.png) no-repeat;
 }
 .farbtastic .marker {
   width: 17px;
   height: 17px;
   margin: -8px 0 0 -8px;
   overflow: hidden; 
-  background: url(../../../../js/farbtastic/marker.png) no-repeat;
+  background: url(../../../js/farbtastic/marker.png) no-repeat;
 }

diff --git a/theme/base/images/icons/icon_processing.gif b/theme/base/images/icons/icon_processing.gif
new file mode 100644 (file)
index 0000000..d0bce15
Binary files /dev/null and b/theme/base/images/icons/icon_processing.gif differ

diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 151758b4895ebdbf4be24faf841eebad2aee8388..b87722eec1f9bfc58a257416958b4aed5c0e13f1 100644 (file)
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -1328,7 +1328,7 @@ color:#333;
 color:#000;
 }
 #form_notice.processing #notice_action-submit {
-background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
 }