diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-02 23:30:24 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-02 23:30:24 -0400 |
| commit | 7d878b7c35e291e40202d7ac4c60aaf9114dac94 (patch) | |
| tree | a11c07e4984142cc03a6622bee823a8ba5f5d7fb /theme/base | |
| parent | 6c14235d6c3359a6c9012ec49077f8defe117779 (diff) | |
| parent | 3010429579fccbcf827652557246263412317e95 (diff) | |
Merge branch 'testing' into 0.9.x
Diffstat (limited to 'theme/base')
| -rw-r--r-- | theme/base/css/display.css | 2 | ||||
| -rw-r--r-- | theme/base/css/ie.css | 7 | ||||
| -rw-r--r-- | theme/base/css/ie6.css | 7 | ||||
| -rw-r--r-- | theme/base/css/jquery.Jcrop.css | 7 | ||||
| -rw-r--r-- | theme/base/css/uap.css | 2 |
5 files changed, 23 insertions, 2 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f48bdf55e..a278126dc 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -3,7 +3,7 @@ * @package StatusNet * @author Sarven Capadisli <csarven@status.net> * @copyright 2009-2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported * @link http://status.net/ */ diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 41d053ac4..48b5cd6af 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -1,3 +1,10 @@ +/** + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @copyright 2009-2010 StatusNet, Inc. + * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported + * @link http://status.net/ + */ /* IE specific styles */ input.checkbox, input.radio { diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css index 6df5e01ce..1784677d0 100644 --- a/theme/base/css/ie6.css +++ b/theme/base/css/ie6.css @@ -1,3 +1,10 @@ +/** + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @copyright 2009-2010 StatusNet, Inc. + * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported + * @link http://status.net/ + */ /* IE6 specific styles */ address { margin-left:7px; diff --git a/theme/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css index b35f332aa..a3f0d2277 100644 --- a/theme/base/css/jquery.Jcrop.css +++ b/theme/base/css/jquery.Jcrop.css @@ -1,3 +1,10 @@ +/** + * @package StatusNet + * @author Sarven Capadisli <csarven@status.net> + * @copyright 2009-2010 StatusNet, Inc. + * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported + * @link http://status.net/ + */ /* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */ .jcrop-holder { text-align: left; } diff --git a/theme/base/css/uap.css b/theme/base/css/uap.css index 73be5f0c1..80c73e2ea 100644 --- a/theme/base/css/uap.css +++ b/theme/base/css/uap.css @@ -7,7 +7,7 @@ * @package StatusNet * @author Sarven Capadisli <csarven@status.net> * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported * @link http://status.net/ */ |