diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-10-10 04:48:11 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-10-10 04:48:11 -0700 |
| commit | d968843bf629c188d7f3e8a85e565cf78878e02f (patch) | |
| tree | 7602725fe3adee31d4542116ab3045a8fc895ffb | |
| parent | 666e52a46b971d49eb43024afe87cabf42b6f49b (diff) | |
| parent | 94ae66c651978f9c8f981e23993ac5dd4cd84b3c (diff) | |
| download | nextcloud-server-d968843bf629c188d7f3e8a85e565cf78878e02f.tar.gz nextcloud-server-d968843bf629c188d7f3e8a85e565cf78878e02f.zip | |
Merge pull request #5244 from owncloud/more-css-fixes
More css fixes
| -rw-r--r-- | core/css/apps.css | 4 | ||||
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/templates/layout.base.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 1 |
5 files changed, 7 insertions, 2 deletions
diff --git a/core/css/apps.css b/core/css/apps.css index 49fb189f384..f68f53d6999 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -104,8 +104,8 @@ padding-left: 32px; } #app-navigation > .with-icon ul li > a { - padding-left: 48px; - background-position: 24px center; + padding-left: 68px; + background-position: 44px center; } #app-navigation .open { diff --git a/core/css/styles.css b/core/css/styles.css index be53b67c858..38676de7a12 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -253,6 +253,8 @@ input[type="submit"].enabled { } #body-login p.info a { font-weight: bold; + padding: 13px; + margin: -13px; } #body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */ diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index ea10c3042b5..8caa9a0bbea 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -11,6 +11,7 @@ <?php p($theme->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="viewport" content="width=device-width; initial-scale=1.0;"> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> <?php foreach ($_['cssfiles'] as $cssfile): ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 9c9eb63382f..cecd97ace27 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -11,6 +11,7 @@ <?php p($theme->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <meta name="viewport" content="width=device-width; initial-scale=1.0;"> <meta name="apple-itunes-app" content="app-id=543672169"> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index fcca43624fe..39cc43fc465 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -14,6 +14,7 @@ </title> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width; initial-scale=1.0;"> <meta name="apple-itunes-app" content="app-id=543672169"> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> |