From: Lukasz Rekucki Date: Fri, 13 Nov 2009 17:31:31 +0000 (+0100) Subject: Annotations. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/950fe87b956be939ce4cc355ede2fc17c2be82df?ds=inline Annotations. --- diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 76670f50..fde7aeb9 100755 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -130,5 +130,5 @@ def pull_requests(request): # Testing # def renderer_test(request): - return direct_to_template(request, 'renderer.html', mimetype="application/xhtml+xml", + return direct_to_template(request, 'renderer.html', mimetype="text/html", extra_context = {} ) diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css index 8200037c..874d9e12 100755 --- a/platforma/static/css/master.css +++ b/platforma/static/css/master.css @@ -6,19 +6,6 @@ body { background: #AAA; } -/* fix icon buttons */ - -button img { - vertical-align: middle; - margin: 0px; -} - -/* default form style hacks */ -select { - border: none; - margin-left: 0.1em;f -} - #body-wrap { margin: 0px; padding: 0px; @@ -60,10 +47,6 @@ select { right: 1em; } -#header button { - vertical-align: middle; -} - /* Commit dialog */ #commit-dialog-error-empty-message { color: red; @@ -260,20 +243,6 @@ input.image-gallery-current-page { margin: 0px; } -body#base button { - background-color: #DDD; - border-width: 1px; - padding: 0px 0.5em; - font-family: Sans-Serif; - /* color: #000; */ - margin: 2px 4px; -} - -body#base button:hover { - background-color: #EEE; -} - - /* ================= */ /* = Message boxes = */ @@ -294,3 +263,71 @@ body#base button:hover { background-color: red; } + + +/* + * + * Buttons + * + */ +*.button { + /* reset margin and padding and see what happens */ + padding: 0; + margin: 0; + border: 2px solid blue; + + /* + * Borders and padding: + */ + + /* observation 1: Firefox doesn't apply top/bottom borders to spans in button */ + /* observation 2: Webkit leaves out some padding to left/right + also: it cuts the top/bottom margin to 1px max */ + + /* observation 3: Opera does the oposite then WK and FF -> + span has all borders, button has only left/right + */ + + /* Line Height */ + + /* 1. Wszystkie przeglądarki, domyślnie ustawiają vertical-align: baseline */ + vertical-align: baseline; + + /* 2. Opera ustawia rozmiar przycisku, na rozmiar line-height obiektu, który go zawiera */ + + display: inline-block; + position: relative; + background: yellow; + padding: 2px 4px; + + font-size: 16pt; + text-decoration: none; +} + +*.button:active { + background: aqua; +} + +*.button > span.upper-bg { + position: absolute; + top: 0px; + left: 2px; + right: 0px; + bottom: 5px; + + margin: 0px; + + background-color: white; + z-index: 0; + display: block; +} + +*.button > span.button-text { + position: relative; + margin: 0px; + display: inline-block; + z-index: 2; + background: blue; + opacity: 0.5; +} + diff --git a/platforma/templates/explorer/editor.html b/platforma/templates/explorer/editor.html index 08f7d41e..7eca642d 100755 --- a/platforma/templates/explorer/editor.html +++ b/platforma/templates/explorer/editor.html @@ -64,7 +64,8 @@ + {% endblock %} {% block maincontent %} - - -
+
+

+ Przykładowy tekst, bo ala ma + Przycisk + + ślicznego kotka i burego psa. +

+

+ Ta linijka ma 2pt wysokości, oraz czcionkę 12pt. jest super. +

+
{% endblock %} {% block extrabody %} diff --git a/platforma/urls.py b/platforma/urls.py index 318d97cc..ccb9fcf7 100755 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -11,9 +11,7 @@ PATH_END = PATH_SEC + "/$" urlpatterns = patterns('', # Explorer: url(r'^$', 'explorer.views.file_list', name='file_list'), - url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), - - url(r'^renderer$', 'explorer.views.renderer_test'), + url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), url(r'^management/pull-requests$', 'explorer.views.pull_requests'), @@ -50,11 +48,15 @@ else: ) # Static files -if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'): +if settings.DEBUG: urlpatterns += patterns('', - url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', - {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), - url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', - {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + url(r'^renderer$', 'explorer.views.renderer_test'), ) -# \ No newline at end of file + + if not hasattr(settings, 'DONT_SERVE_STATIC'): + urlpatterns += patterns('', + url(r'^%s(?P.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), + url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', + {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + ) \ No newline at end of file