From c8265d95b0247c146793c9804198a9ed45b6f846 Mon Sep 17 00:00:00 2001 From: Thomas LEBEAU Date: Fri, 7 Feb 2014 00:07:54 +0100 Subject: [add] maj theme courgette : ajout tag --- themes/courgette/_menu.twig | 1 + themes/courgette/_view.twig | 45 ++++++++++++++++++++++ themes/courgette/css/.DS_Store | Bin 6148 -> 0 bytes themes/courgette/css/font.css | 14 ++++++- themes/courgette/css/style.css | 76 ++++++++++++++++++++++++++++++++++--- themes/courgette/edit-tags.twig | 20 ++++++++++ themes/courgette/font/icomoon.eot | Bin 0 -> 3056 bytes themes/courgette/font/icomoon.svg | 23 +++++++++++ themes/courgette/font/icomoon.ttf | Bin 0 -> 2892 bytes themes/courgette/font/icomoon.woff | Bin 0 -> 3020 bytes themes/courgette/tags.twig | 8 ++++ themes/courgette/view.twig | 45 ---------------------- 12 files changed, 180 insertions(+), 52 deletions(-) create mode 100755 themes/courgette/_view.twig delete mode 100644 themes/courgette/css/.DS_Store create mode 100644 themes/courgette/edit-tags.twig create mode 100755 themes/courgette/font/icomoon.eot create mode 100755 themes/courgette/font/icomoon.svg create mode 100755 themes/courgette/font/icomoon.ttf create mode 100755 themes/courgette/font/icomoon.woff create mode 100644 themes/courgette/tags.twig delete mode 100755 themes/courgette/view.twig (limited to 'themes/courgette') diff --git a/themes/courgette/_menu.twig b/themes/courgette/_menu.twig index 85487f73..5e737299 100755 --- a/themes/courgette/_menu.twig +++ b/themes/courgette/_menu.twig @@ -3,6 +3,7 @@
  • {% trans "home" %}
  • {% trans "favorites" %}
  • {% trans "archive" %}
    • +
  • {% trans "tags" %}
  • {% trans "config" %}
  • {% trans "logout" %}
    • diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig new file mode 100755 index 00000000..e80829ef --- /dev/null +++ b/themes/courgette/_view.twig @@ -0,0 +1,45 @@ +{% extends "layout.twig" %} +{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} +{% block content %} +
    + +
    +
    +
    +

    {{ entry.title|raw }}

    +
    +
    + {{ content | raw }} +
    +
    + + +{% endblock %} \ No newline at end of file diff --git a/themes/courgette/css/.DS_Store b/themes/courgette/css/.DS_Store deleted file mode 100644 index c788a093..00000000 Binary files a/themes/courgette/css/.DS_Store and /dev/null differ diff --git a/themes/courgette/css/font.css b/themes/courgette/css/font.css index 7c16cce4..849ff85b 100755 --- a/themes/courgette/css/font.css +++ b/themes/courgette/css/font.css @@ -7,4 +7,16 @@ url('../font/fontello.svg?97381924#fontello') format('svg'); font-weight: normal; font-style: normal; -} \ No newline at end of file +} + +@font-face { + font-family: 'icomoon'; + src:url('../font/icomoon.eot?-72nnzw'); + src:url('../font/icomoon.eot?#iefix-72nnzw') format('embedded-opentype'), + url('../font/icomoon.woff?-72nnzw') format('woff'), + url('../font/comoon.ttf?-72nnzw') format('truetype'), + url('../font/icomoon.svg?-72nnzw#icomoon') format('svg'); + font-weight: normal; + font-style: normal; +} + diff --git a/themes/courgette/css/style.css b/themes/courgette/css/style.css index 2ba16b71..edd09c78 100755 --- a/themes/courgette/css/style.css +++ b/themes/courgette/css/style.css @@ -157,6 +157,8 @@ h1 a { transition-delay:1.55ms; } +#article_toolbar li:nth-child(2) { display: none; } + #menu:before { content: "\e801"; display: block; @@ -299,7 +301,7 @@ ul li { color:#000; } -.tools a:before { display: block; font-family: 'fontello'; } +.tools a:before { display: block; font-family: 'icomoon'; } .fav-off:before, .fav:before { content: '\e805'; } /* '' */ @@ -308,13 +310,13 @@ ul li { background: #FFF; color:#000; } -.link:before { content: '\e800'; } /* '' */ -.delete:before { content: '\e803'; } /* '' */ -.reading-time:before { content: '\e802'; } /* '' */ +.link:before { content: '\e801'; } /* '' */ +.delete:before { content: '\e80c'; } /* '' */ +.reading-time:before { content: '\e803'; } /* '' */ #article_toolbar a:before { display: block; - font-family: 'fontello'; + font-family: 'icomoon'; } #article_toolbar a { @@ -343,7 +345,8 @@ ul li { .email:before { content: '\e80a'; } /* '' */ .icon-check:before { content: '\e804'; } /* '' */ .back:before { content: '\e806'; } /* '' */ -.bad-display:before { content: '\e808'; } /* '' */ +.flattr:before { content: '\e800'; } /* '' */ +.bad-display:before { content: '\e600'; } /* '' */ .twitter:before { content: '\e807'; } /* '' */ #article_toolbar .flattrli { @@ -618,3 +621,64 @@ form button:hover, form button:focus, form input[type="submit"]:hover, form inpu position:static; } } + + +.w600p { + width: 70%; + margin: auto; +} + +.tagForm { + margin: 1em 0; +} + +.tagForm p { + font-style: italic; + margin: 0; + font-size: 0.8em; + color: #999; +} + +.tagForm label { + width: auto; + margin-right: 1em; +} + +.back:before { + font-family: "icomoon"; +} + +.back.link { + color: #000; + text-decoration: none; +} + +.back.link:before { + margin-right: 0.5em; +} + +.tag-list a { + color: #000; + text-decoration: none; +} + +.tag-list li { + display: inline-block; + margin-right: 1em; +} + +a:hover { + text-decoration: underline; +} + +.tag { + background: #000; + color: #FFF; + padding: 0.5em 1em; + text-decoration: none; +} + +.tag:hover, .tag:focus { + background: #FFF; + color: #000; +} \ No newline at end of file diff --git a/themes/courgette/edit-tags.twig b/themes/courgette/edit-tags.twig new file mode 100644 index 00000000..bcddbe46 --- /dev/null +++ b/themes/courgette/edit-tags.twig @@ -0,0 +1,20 @@ +{% extends "layout.twig" %} +{% block title %}edit tags{% endblock %} +{% block menu %} +{% include '_menu.twig' %} +{% endblock %} +{% block content %} +{% if tags is empty %} +no tags +{% endif %} + +
    + +

    {% trans "You can enter multiple tags, separated by commas." %}

    + + +
    +{% trans "return to article" %} +{% endblock %} diff --git a/themes/courgette/font/icomoon.eot b/themes/courgette/font/icomoon.eot new file mode 100755 index 00000000..ff2d109d Binary files /dev/null and b/themes/courgette/font/icomoon.eot differ diff --git a/themes/courgette/font/icomoon.svg b/themes/courgette/font/icomoon.svg new file mode 100755 index 00000000..8968452d --- /dev/null +++ b/themes/courgette/font/icomoon.svg @@ -0,0 +1,23 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/courgette/font/icomoon.ttf b/themes/courgette/font/icomoon.ttf new file mode 100755 index 00000000..52463a87 Binary files /dev/null and b/themes/courgette/font/icomoon.ttf differ diff --git a/themes/courgette/font/icomoon.woff b/themes/courgette/font/icomoon.woff new file mode 100755 index 00000000..ddb96f29 Binary files /dev/null and b/themes/courgette/font/icomoon.woff differ diff --git a/themes/courgette/tags.twig b/themes/courgette/tags.twig new file mode 100644 index 00000000..9dfdab52 --- /dev/null +++ b/themes/courgette/tags.twig @@ -0,0 +1,8 @@ +{% extends "layout.twig" %} +{% block title %}tags{% endblock %} +{% block menu %} +{% include '_menu.twig' %} +{% endblock %} +{% block content %} +{% for tag in tags %}{{ tag.value }} {% if token != '' %}{% endif %} {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/themes/courgette/view.twig b/themes/courgette/view.twig deleted file mode 100755 index e80829ef..00000000 --- a/themes/courgette/view.twig +++ /dev/null @@ -1,45 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} -{% block content %} -
    - -
    -
    -
    -

    {{ entry.title|raw }}

    -
    -
    - {{ content | raw }} -
    -
    - - -{% endblock %} \ No newline at end of file -- cgit v1.2.3