From e4ab5dd32f2c792dfc7944ff7c90b89218bf09c1 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 22 Oct 2012 16:53:56 +0200 Subject: [PATCH] new file: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php --- view/theme/smoothly/css/typography.css | 273 +++++++++++++++++++++++++ view/theme/smoothly/style.css | 140 +++++-------- view/theme/smoothly/theme.php | 2 +- 3 files changed, 322 insertions(+), 93 deletions(-) create mode 100644 view/theme/smoothly/css/typography.css diff --git a/view/theme/smoothly/css/typography.css b/view/theme/smoothly/css/typography.css new file mode 100644 index 00000000..bedb0a0f --- /dev/null +++ b/view/theme/smoothly/css/typography.css @@ -0,0 +1,273 @@ +/* global typography settings */ + +textarea, +pre, +code, +kbd, +samp, +var, +tt { + font-family:Consolas, "Lucida Console", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier; +} + +/* (en) base layout gets standard font size 15px */ +/* (de) Basis-Layout erhält Standardschriftgröße von 15 Pixeln */ + +body { + margin: 0 auto; + padding-bottom: 3em; + width: 960px; + font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif; + font-size: 15px; + font-size-adjust: none; + font-style: normal; + font-variant: normal; + font-weight: normal; + line-height: 18px; + color: #626262; + background-color: #F2F2F2; + color: #333333; +/* (en) Prevent auto-scaling of text in mobile webkit browsers */ +/* (de) Automatische Schriftvergrößerung in mobilen Webkit-Browsern vermeiden */ + -webkit-text-size-adjust:100%; +} + +/*--- Headings | Überschriften ------------------------------------------------------------------------*/ + +h1, +h2, +h3, +h4, +h5, +h6 { + font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif; + font-weight: 400; + color:#626262; + margin:0; +} + +h1 { + font-size:250%; + line-height: 0.8571em; + margin: 0.4286em 0 0; +} + +h2 { + font-size:200%; + line-height: 1.2em; + margin: 0.6em 0 0 0; +} + +h3 { + font-size:145%; + margin:0 0 5px 0; +} + +h4 { + font-size:133.33%; + line-height: 1.125em; + margin:1.125em 0 0 0; +} + +h5 { + font-size:116.67%; + line-height: 1.2857em; + margin: 1.2857em 0 0 0; +} + +h6 { + font-weight: bold; + font-size:100%; + line-height: 1.5em; + margin: 1.5em 0 0 0; +} + +/*h3 > a, h4 > a { + font-size: 18px; + color: #626262; +}*/ + +/* --- Lists | Listen -------------------------------------------------------------------------------- */ + +ul, +ol, +dl { + font-size:1em; + line-height:1.5em; +} + +ul { + list-style-type:disc; +} + +ol { + list-style-type:decimal; +} + +ul ul { + list-style-type:circle; + margin-top:0; +} + +ol ol { + list-style-type:lower-latin; + margin-top:0; +} + +ol ul { + list-style-type:circle; + margin-top:0; +} + +li { + font-size:1em; + line-height:1.5em; + list-style: none outside none; +} + +dt { font-weight:bold; } + +dd { margin:0 0 1.5em 0.8em; } + + +/* --- general text formatting | Allgemeine Textauszeichnung ------------------------------------------ */ + +p { + max-width: 600px; + font-size:1em; + line-height:1.5em; + margin: 1.5em 0 0 0; +} + +blockquote, cite, q { + font-family: Georgia, "Times New Roman", Times, serif; + font-style:italic; +} + +blockquote { + background-color: #F4F8F9; + border-left: 4px solid #DAE4EE; + padding: 0.4em; +} + +strong, b { font-weight:bold; } + +em, i { font-style:italic; } + +big { + font-size:116.667%; +} + +small { + font-size:85.71%; +} + +pre, +code, +kbd, +tt, +samp, +var { + font-size:100%; +} + +pre { + line-height:1.5em; + margin: 1.5em 0 0 0; + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} + +pre, code { color:#800; } + +kbd, samp, var, tt { + color:#666; + font-weight:bold; +} + +var, dfn { font-style:italic; } + +acronym, abbr { + border-bottom:1px #aaa dotted; + font-variant:small-caps; + letter-spacing:.07em; + cursor:help; +} + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { top: -0.5em; } +sub { bottom: -0.25em; } + +mark { + background: #ff0; + color: #000; +} + +hr { + color:#fff; + background:transparent; + margin:0 0 0.75em 0; + padding:0 0 0.75em 0; + border:0; + border-bottom:1px #eee solid; +} + +.required { + display: inline; + color: #1873a2; +} + +/*--- Links ----------------------------------------------------------------------------------------- */ + +a { + color: #1873a2; + text-decoration: none; + margin-bottom: 1px; + background:transparent; +} + +a:active { outline: none; } + +/* (en) maximum constrast for tab focus - change with great care */ +/* (en) Maximaler Kontrast für Tab Focus - Ändern Sie diese Regel mit Bedacht */ +a:hover, +a:focus { + color: #6da6c4; + text-decoration:none; +} + +/* --- images ------------------ */ + +img, +figure { + border: 0 none; + max-width: 550px; + margin: 0; +} + +.flexible { + margin-top: 1.5em; + max-width: 100%; + height: auto; +} + +* html .flexible { /* IE6 support */ + width: 98%; /* 2% space for borders */ +} + +.bordered { + margin-top: 1.5em; + border: 2px #eee solid; + border: 2px rgba(255,255,255,1) solid; + -webkit-box-shadow: 0 0 3px rgba(0,0,0,.25); + -moz-box-shadow: 0 0 3px rgba(0,0,0,.25); + box-shadow: 0 0 3px rgba(0,0,0,.25); +} diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index e4e75f1c..37b13234 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -2,7 +2,7 @@ style.css Smoothly - Created by alex@friendica.pixelbits.de on 2012-10-19 + Created by alex@friendica.pixelbits.de on 2012-10-22 ** Colors ** Blue links - #1873a2 @@ -14,85 +14,8 @@ Dark Grey Gradients - #7c7d7b and #555753 Orange - #fec01d */ -body { - margin: 0 auto; - padding-bottom: 3em; - width: 960px; - font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif; - font-size: 15px; - font-size-adjust: none; - font-style: normal; - font-variant: normal; - font-weight: normal; - line-height: 18px; - color: #626262; - background-color: #F2F2F2; - color: #333333; -} +@import url('css/typography.css'); -img { - border: 0 none; - max-width: 550px; -} - -a { - color: #1873a2; - text-decoration: none; - margin-bottom: 1px; -} - -a:hover { - color: #6da6c4; - padding-bottom: 0px; -} - -h3 > a, h4 > a { - font-size: 18px; - color: #626262; -} - -h3 { - margin: 0px; - margin-bottom: 5px; - font-size: 18px; - color: #626262; -} - -h2 { - color: #626262; -} - -p { - max-width: 600px; -} - -li { - list-style: none outside none; -} - -li.widget-list { - list-style: none outside none; - background: url("arrow.png") no-repeat scroll left center transparent; - display: block; - padding: 3px 24px; -} - -.required { - display: inline; - color: #1873a2; -} - -.fakelink, .fakelink:visited, .fakelink:link { - color: #1873a2; - cursor: pointer; - margin-bottom: 10px; - margin-left: 10px; - /*background: url("down.png") no-repeat scroll left center transparent;*/ -} - -.fakelink:hover { - color: #6da6c4; -} .lockview { cursor: pointer; @@ -155,6 +78,10 @@ input[type=submit]:active { top: 1px; } +#search-submit { + margin: 10px 10px 0 0; +} + .smalltext { font-size: 0.7em } @@ -331,7 +258,8 @@ section { /* ========= */ .pager { - padding-top: 30px; + padding-top: 10px; + padding-bottom: 10px; display: block; clear: both; text-align: center; @@ -479,6 +407,7 @@ nav #nav-link-wrapper .nav-link { padding-bottom: 8px; } */ + .error-message { color: #FF0000; font-size: 1.1em; @@ -639,7 +568,7 @@ aside { float: right; width: 205px; margin-top: 45px; - font-size: 0.9em; + /*font-size: 0.9em;*/ font-style: bold; } @@ -782,13 +711,17 @@ h3#search:before { padding-bottom: 10px; } +#peoplefind-desc { + margin-left: 10px; +} + #sidebar-group-list { margin-left: 0px; margin-right: 30px; } #sidebar-group-list a { - padding-bottom: 10px; + /*padding-bottom: 10px;*/ } /*#sidebar-group-list ul { @@ -822,6 +755,13 @@ h3#search:before { border: 1px solid #cdcdcd; } +li.widget-list { + list-style: none outside none; + background: url("arrow.png") no-repeat scroll left center transparent; + display: block; + padding: 3px 24px; +} + #sidebar-new-group { padding: 7px; width: 165px; @@ -888,7 +828,7 @@ h3#search:before { ul .sidebar-group-li { list-style: none; font-size: 1.0em; - padding-bottom: 5px; + /*padding-bottom: 5px;*/ } ul .sidebar-group-li .icon { @@ -902,7 +842,7 @@ ul .sidebar-group-li .icon { } .nets-ul li, .fileas-ul li, .categories-ul li { - margin-top: 10px; + /*margin-top: 10px;*/ } .nets-link { @@ -921,6 +861,7 @@ ul .sidebar-group-li .icon { } .widget h3 { + font-size: 125%; background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f0edf0), color-stop(1, #e2e2e2) ); background: -moz-linear-gradient( center top, #f0edf0 5%, #e2e2e2 100% ); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f0edf0', endColorstr='#e2e2e2'); @@ -937,6 +878,10 @@ ul .sidebar-group-li .icon { text-shadow: -1px 0px 0px #bdbdbd; } +#connect-desc { + margin-left: 10px; +} + #group-sidebar h3:before { content: url("groups.png"); padding-right: 10px; @@ -1513,7 +1458,7 @@ ul .sidebar-group-li .icon { } .wall-item-location .smalltext { - margin-left: 25px; + margin-left: 0px; font-size: 0.9em; display: block; } @@ -1643,11 +1588,6 @@ code { margin-top: 10px; } -blockquote { - background-color: #F4F8F9; - border-left: 4px solid #DAE4EE; - padding: 0.4em; -} /* ============ */ /* = Comments = */ @@ -3003,11 +2943,12 @@ margin-left: 0px; #settings-nickname-desc { width: 80%; background-color: #efefef; + margin-top: 10px; margin-bottom: 10px; border-radius: 5px; -webkit-border-radius: 5px; -moz-border-radius: 5px; - padding: 5px; + padding: 10px; } #register-form div { @@ -3598,7 +3539,8 @@ tr { .field_help { display: block; - margin-left: 100px; + margin-left: 0px; + margin-bottom: 10px; color: #666666; } @@ -4241,3 +4183,17 @@ hr.line-dots { div#datebrowse-sidebar.widget { text-align:center; } + +/* Fakelink */ + +.fakelink, .fakelink:visited, .fakelink:link { + color: #1873a2; + cursor: pointer; + margin-bottom: 10px; + margin-left: 10px; + /*background: url("down.png") no-repeat scroll left center transparent;*/ +} + +.fakelink:hover { + color: #6da6c4; +} diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index f057a019..57db94b0 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -3,7 +3,7 @@ /* * Name: Smoothly * Description: Like coffee with milk. Theme works fine with iPad[2]. - * Version: Version 0.10.19 + * Version: Version 0.10.22 * Author: Alex * Maintainer: Alex * Screenshot: Screenshot