summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-04-14 23:32:09 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-04-14 23:32:09 +0000
commit64e4b8a20f5ec3fb4f1a4c68337ae40b1b0b0dcf (patch)
tree26c19747f8c6e219784f01711c86fe13bb9784e6
parentd6a31c90a81a5e18af3379095bfccc444a5d7f73 (diff)
Updated remaining files and styles for style separation for themes
-rw-r--r--actions/avatarsettings.php2
-rw-r--r--actions/designsettings.php2
-rw-r--r--theme/base/css/farbtastic.css6
-rw-r--r--theme/base/images/icons/icon_processing.gifbin0 -> 673 bytes
-rw-r--r--theme/cloudy/css/display.css2
5 files changed, 6 insertions, 6 deletions
diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 60f69b685..c2bb35a39 100644
--- 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 05293f712..cdd950e78 100644
--- 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 3b8fec58f..7efcc73c3 100644
--- 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
index 000000000..d0bce1542
--- /dev/null
+++ b/theme/base/images/icons/icon_processing.gif
Binary files differ
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 151758b48..b87722eec 100644
--- 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;
}