diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-06-19 11:30:18 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-06-19 11:30:18 +0200 |
| commit | ccacb6f9188a58ed3579a3f9542d4d7d635fa893 (patch) | |
| tree | 6b008f6c450720195ec664e3e861cf1478fc4f2c /core | |
| parent | 6bd0a158f7ae71320a1b0c00e187633200561269 (diff) | |
| parent | 0469f529fa3c5bb5c643f4c253f886f58ca50ba7 (diff) | |
| download | nextcloud-server-ccacb6f9188a58ed3579a3f9542d4d7d635fa893.tar.gz nextcloud-server-ccacb6f9188a58ed3579a3f9542d4d7d635fa893.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 0ff381e9e63..6d272845ebe 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -111,8 +111,8 @@ label.infield { cursor: text !important; } .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; } .action { width: 16px; height: 16px; } -#logout { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } -.action:hover, .selectedActions a:hover, #logout:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } +.header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } +.action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } table:not(.nostyle) tr { -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; } tbody tr:hover, tr:active { background-color:#f8f8f8; } diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index c6696fc72bf..500ac9beda3 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -45,7 +45,7 @@ <body id="<?php echo $_['bodyid'];?>"> <header><div id="header"> <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> - <a class="header-right" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> + <a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a> <form class="searchbox header-right" action="#" method="post"> <input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo htmlentities($_POST['query']);};?>" autocomplete="off" /> </form> |