diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
| commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
| tree | 1d19df6405103577d872902486792e8c23bce711 /trunk/infrastructure/ace/www/syntax-new.css | |
| parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
| parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
| download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip | |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'trunk/infrastructure/ace/www/syntax-new.css')
| -rw-r--r-- | trunk/infrastructure/ace/www/syntax-new.css | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/trunk/infrastructure/ace/www/syntax-new.css b/trunk/infrastructure/ace/www/syntax-new.css deleted file mode 100644 index 30f1823..0000000 --- a/trunk/infrastructure/ace/www/syntax-new.css +++ /dev/null @@ -1,35 +0,0 @@ -.syntax .t1 {font-style:italic;color:#2AC300;} -.syntax .t2 {color:#CC6633;} -.syntax .t3 {font-weight:bold;color:#6699FF;} -.syntax .t4 {color:#A700CC;} -.syntax .t5 {color:#000000;} -.syntax .t6 {font-weight:bold;color:#000CFF;} -.syntax .t7 {color:#318495;} -.syntax .t8 {color:#33CC33;} -.syntax .t9 {color:#1A921C;} -.syntax .t10 {font-weight:bold;color:#0C450D;} -.syntax .t11 {font-weight:bold;color:#000099;} -.syntax .t12 {} -.syntax .t13 {} -.syntax .t14 {} -.syntax .t15 {color:#70727E;} -.syntax .t16 {font-style:italic;color:#000000;} -.syntax .t17 {color:#990099;} -.syntax .t18 {color:#CC6633;} -.syntax .t19 {color:#990099;} -.syntax .t20 {color:#CC6633;} -.syntax .t21 {color:#000000;} -.syntax .t22 {color:#990000;font-weight:bold;} -.syntax .t23 {} -.syntax .t24 {} -.syntax .t25 {} -.syntax .t26 {color:#68685B;} -.syntax .t27 {color:#888888;} -.syntax .t28 {font-style:italic;} -.syntax .t29 {color:#1C02FF;} -.syntax .t30 {font-weight:bold;} -.syntax .t31 {font-style:italic;} -.syntax .t32 {font-weight:bold;color:#0C07FF;} -.syntax .t33 {font-style:italic;color:#000000;} -.syntax .t34 {color:#B90690;} -.syntax .t35 {color:#666666;} |