diff options
| author | friendica <info@friendica.com> | 2014-07-24 15:57:04 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-07-24 15:57:04 -0700 |
| commit | e331f9f6e7df4ca21732588839ea215fd0c4d5b7 (patch) | |
| tree | 39a4d9d7f5ba4518c144377b070aebb8e1029dbc /view | |
| parent | 5a5190f2ff5e007283882b99171a6681d6f6ba48 (diff) | |
| parent | 90014063466514530e5cf5ec8a7cceeab059a92b (diff) | |
| download | volse-hubzilla-e331f9f6e7df4ca21732588839ea215fd0c4d5b7.tar.gz volse-hubzilla-e331f9f6e7df4ca21732588839ea215fd0c4d5b7.tar.bz2 volse-hubzilla-e331f9f6e7df4ca21732588839ea215fd0c4d5b7.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 17 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 |
2 files changed, 2 insertions, 20 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 10d341691..c0f35904e 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -1,9 +1,5 @@ /* override some bootstrap settings */ -html { -font-size: 100%; -} - h1, .h1 { font-size: 24px; @@ -33,19 +29,6 @@ h6, .h6 { font-size: 10px; } -textarea { -line-height: initial; -} - -.radio, .checkbox{ -padding-left: 0px; -margin-left: 0px; -} - -.checkbox input[type="checkbox"], inline input[type="checkbox"]{ -float:none; -margin-left:0px; -} /* nav overrides */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 26bb4ef92..7e45a167b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -101,7 +101,6 @@ code { color: $code_txtcolour; padding: 10px; margin-top: 20px; - max-width: 80%; } pre { @@ -1908,11 +1907,11 @@ img.mail-list-sender-photo { } #profile-jot-text::-webkit-input-placeholder { - font-size:18px; + font-size:16px; } #profile-jot-text::-moz-placeholder { - font-size:18px; + font-size:16px; } #profile-jot-text:focus::-webkit-input-placeholder { |