diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-07-29 19:42:40 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-07-29 19:42:40 +0200 |
| commit | e5072b16728d5b503437fb3cf914bc4eb27a5225 (patch) | |
| tree | 5d6aa5d26dd103132555004e9bf51ea11fe9a019 | |
| parent | deb9d2c9a005c152983a70c17c227fc59c917f0b (diff) | |
| parent | 109a6fb7e22e04adec386f6147e2f1fd9438486e (diff) | |
denis merged
| -rw-r--r-- | application.rb | 1 | ||||
| -rw-r--r-- | public/favicon.ico | bin | 0 -> 1406 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | views/layout.haml | 1 | ||||
| -rw-r--r-- | views/style.sass | 31 |
4 files changed, 4 insertions, 29 deletions
diff --git a/application.rb b/application.rb index 2eca13d..cd4cb54 100644 --- a/application.rb +++ b/application.rb @@ -253,4 +253,3 @@ get '/stylesheets/style.css' do headers 'Content-Type' => 'text/css; charset=utf-8' sass :style end - diff --git a/public/favicon.ico b/public/favicon.ico Binary files differnew file mode 100644 index 0000000..ba4fae1 --- /dev/null +++ b/public/favicon.ico diff --git a/views/layout.haml b/views/layout.haml index 61d1650..a301358 100755..100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -10,7 +10,6 @@ %body .logo= image_tag "/ToxCreate_rgb_72.png", :alt => 'ToxCreate', :align => "right" - .index %ul %li{:class => ("selected" if /\/create/ =~ request.path )} diff --git a/views/style.sass b/views/style.sass index ce579e3..b64b919 100644 --- a/views/style.sass +++ b/views/style.sass @@ -21,23 +21,7 @@ body .headline .logo float: right - /* .logo - top: 1% - float: right - //display: inline - font-size: 2.5em - word-spacing: -2px - - .span1 - color: black - font-weight: bolder - letter-spacing: -3px - - .span2 - color = !ot_purple - font-weight: 500 - position: relative - left: -6px + .index clear: both ul @@ -74,15 +58,12 @@ body .content background-color: $bg_color height: 100% - //padding: 0.5em - //margin: 1% padding: 1em border: 1px solid color: $fg_color h2 margin: 20px 3px 2px 3px .notice - //background-color = !body_color padding: 1em background-color: $body_color border: 1px solid @@ -112,6 +93,7 @@ body padding: 1% background-color: white table + display: inline-table border-collapse: collapse th padding: 0.5em @@ -122,6 +104,7 @@ body border: 1px solid .predictions text-align: center + overflow: auto table border-spacing: 0 border-collapse: collapse @@ -170,19 +153,15 @@ body border: 1px solid margin-top: 0.6em dl - //display: block dt width: 15em font-weight: bold float: left clear: both - //display: block dd clear: right margin: 0.2em 0em - //display: block dl - //display: block clear: both padding: 0em background-color: $bg_color2 @@ -193,8 +172,7 @@ body font-weight: bold float: left clear: right - dd - //padding-left: 2em + .footer margin: 0.5em padding: 0.5em @@ -219,7 +197,6 @@ dl th border-bottom: 1px dotted white text-align: center - //background-color: #CCD2DC padding: 0.3em table border-collapse: collapse |