diff options
author | kondou <kondou@ts.unde.re> | 2013-07-01 23:47:59 +0200 |
---|---|---|
committer | kondou <kondou@ts.unde.re> | 2013-07-09 16:08:32 +0200 |
commit | 4818e0062e5444a9b657a30001b6dbaca44413c7 (patch) | |
tree | 5c3c80992bb61f048448fb76f488b34cd9ffb8a3 | |
parent | f8dae11a23784bc9ebdef67511934630e46f870b (diff) | |
download | nextcloud-server-4818e0062e5444a9b657a30001b6dbaca44413c7.tar.gz nextcloud-server-4818e0062e5444a9b657a30001b6dbaca44413c7.zip |
General CSS cleanup
-rw-r--r-- | apps/files/css/files.css | 2 | ||||
-rw-r--r-- | core/css/styles.css | 56 | ||||
-rw-r--r-- | settings/css/settings.css | 4 | ||||
-rw-r--r-- | settings/templates/personal.php | 4 |
4 files changed, 44 insertions, 22 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index f2ca1065eca..d7937692e6f 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -114,7 +114,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } position:relative; width:100%; -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; } -#select_all { float:left; margin:.3em 0.6em 0 .5em; } +#select_all { float:left; margin:.4em 0.6em 0 .5em; } #uploadsize-message,#delete-confirm { display:none; } /* File actions */ diff --git a/core/css/styles.css b/core/css/styles.css index 40a17a42876..7c82b55deff 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -19,17 +19,27 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari #body-user #header, #body-settings #header { position:fixed; top:0; left:0; right:0; z-index:100; height:45px; line-height:2.5em; background:#1d2d44 url('../img/noise.png') repeat; - -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } -#body-login #header { margin: -2em auto 0; text-align:center; height:10em; padding:1em 0 .5em; - -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5); -background:#1d2d44; /* Old browsers */ -background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */ -background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */ -background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */ -background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */ -background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */ -background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */ -filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ } + -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; + -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; + box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; +} + +#body-login #header { + margin: -2em auto 0; + text-align:center; + height:10em; + padding:1em 0 .5em; + -moz-box-shadow:0 0 1em rgba(0, 0, 0, .5); + -webkit-box-shadow:0 0 1em rgba(0, 0, 0, .5); box-shadow:0 0 1em rgba(0, 0, 0, .5); + background:#1d2d44; /* Old browsers */ + background:-moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */ + background:-webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */ + background:-webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */ + background:-o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */ + background:-ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */ + background:linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */ + filter:progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */ +} #owncloud { position:absolute; top:0; left:0; padding:6px; padding-bottom:0; } .header-right { float:right; vertical-align:middle; padding:0.5em; } @@ -111,18 +121,24 @@ a.disabled, a.disabled:hover, a.disabled:focus { .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary { border:1px solid #1d2d44; background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; + -moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; + -webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; + box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; } .primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover, .primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus { border:1px solid #1d2d44; background:#2d3d54; color:#fff; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; + -moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; + -webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; + box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; } .primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active { border:1px solid #1d2d44; background:#1d2d44; color:#bbb; text-shadow:#000 0 -1px 0; - -moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; + -moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; + -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; + box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; } @@ -132,7 +148,7 @@ a.disabled, a.disabled:hover, a.disabled:focus { #remember_login { margin:.8em .2em 0 1em; vertical-align:text-bottom; } .searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; } input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } -#select_all{ margin-top:.4em !important;} +#select_all{ margin-top:.4em } /* CONTENT ------------------------------------------------------------------ */ #controls { @@ -333,10 +349,16 @@ li.update, li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; bac } #expanddiv a { display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + filter:alpha(opacity=70); + opacity:.7; } #expanddiv a img { margin-bottom:-3px; } - #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } + #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; + filter:alpha(opacity=100); + opacity:1; + } /* VARIOUS REUSABLE SELECTORS */ diff --git a/settings/css/settings.css b/settings/css/settings.css index 3c406109a1f..d7b63891903 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -9,10 +9,10 @@ input#openid, input#webdav { width:20em; } /* PERSONAL */ /* Sync clients */ -.clientsbox { margin:12px; text-align:center; } +.clientsbox { margin:12px; } .clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; } .clientsbox h2 { font-size:20px; font-weight:bold; margin:35px 0 10px; } -.clientsbox center { margin-top:10px; } +.clientsbox .center { margin-top:10px; } #passworderror { display:none; } #passwordchanged { display:none; } diff --git a/settings/templates/personal.php b/settings/templates/personal.php index d4396407525..e6d43a430fd 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -6,7 +6,7 @@ <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> -<div class="clientsbox"> +<div class="clientsbox center"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> <a href="<?php p($_['clients']['desktop']); ?>" target="_blank"> <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.png')); ?>" /> @@ -18,7 +18,7 @@ <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.png')); ?>" /> </a> <?php if(OC_APP::isEnabled('firstrunwizard')) {?> - <center><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></center> + <p class="center"><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p> <?php }?> </div> |