From: Philippe Barbosa Date: Fri, 4 Mar 2016 14:38:50 +0000 (+0100) Subject: Sidebar styles X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c623f5a92edb235e0e22ac3d6ae23fd3078d5e49;p=mezzo.git Sidebar styles --- diff --git a/app/festival/static/css/index.css b/app/festival/static/css/index.css index c62a4efa..35cb38ea 100755 --- a/app/festival/static/css/index.css +++ b/app/festival/static/css/index.css @@ -797,6 +797,9 @@ pre > p { /* line 37, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_layout.scss */ .aside { display: block; + background: #fff; + padding: 1rem .5rem; + margin-bottom: 3rem; } /** @@ -963,7 +966,6 @@ input:not([type]):focus, select[multiple=multiple]:focus, textarea:focus { border-color: #798d8f; - border-left: 0.33333rem solid #e8ca88; box-shadow: 0; outline: none; } @@ -2700,20 +2702,26 @@ th { /* line 6, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__name { margin: 0 0 1rem; + font-size: 1.2rem; +} + +/* line 11, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__description { + padding-bottom: 1em; + border-bottom: 1px solid #bdc3c7; + margin-bottom: 1em; } -/* line 10, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 17, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta { display: inline-block; *display: inline; *zoom: 1; text-align: right; - padding: .3rem; - border: 1px solid #ecf0f1; - color: black; + font-family: "Interstate", "Helvetica Neue", Helvetica, Arial, sans-serif; } -/* line 20, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +/* line 28, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ .event__meta:before { content: '\f041'; font-family: "Font-Awesome"; @@ -2723,7 +2731,14 @@ th { vertical-align: middle; margin-right: .6rem; font-size: 2rem; - color: #d7a433; + color: rgba(232, 202, 136, 0.5); +} + +/* line 41, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/event-card.scss */ +.event__detail, +.event__detail a { + text-align: right; + color: #555; } /* line 5, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/modules/hero-slider.scss */ @@ -2739,7 +2754,7 @@ th { .user__panel { margin: 1rem auto; padding: .5rem 1rem; - background: #fff; + background: #f9f0dd; } @media (min-width: 769px) {/* line 140, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form { @@ -2798,7 +2813,6 @@ th { .aside { float: left; width: 30%; - padding: 0 .5rem; }/* line 149, /Users/philippebarbosa/Sites/ircam-manifeste/app/festival/static/scss/base/_forms.scss */ .sticked-form input { width: 60%; diff --git a/app/festival/static/scss/base/_forms.scss b/app/festival/static/scss/base/_forms.scss index 6ae1fa6c..d639033b 100755 --- a/app/festival/static/scss/base/_forms.scss +++ b/app/festival/static/scss/base/_forms.scss @@ -78,7 +78,7 @@ textarea { &:focus { border-color: darken($base_border_color, 10); - border-left: ($base_font_size / 3) solid $main_color; + // border-left: ($base_font_size / 3) solid $main_color; box-shadow: $form_box_shadow-focus; outline: none; } diff --git a/app/festival/static/scss/base/_layout.scss b/app/festival/static/scss/base/_layout.scss index 3c95bc43..f8d53658 100755 --- a/app/festival/static/scss/base/_layout.scss +++ b/app/festival/static/scss/base/_layout.scss @@ -36,10 +36,12 @@ .aside { display: block; + background: #fff; + padding: 1rem .5rem; + margin-bottom: 3rem; @media (min-width : $desktop ) { float: left; width: 30%; - padding: 0 .5rem; } } diff --git a/app/festival/static/scss/modules/event-card.scss b/app/festival/static/scss/modules/event-card.scss index 611e4a0e..45b87286 100644 --- a/app/festival/static/scss/modules/event-card.scss +++ b/app/festival/static/scss/modules/event-card.scss @@ -5,6 +5,13 @@ .event__name { margin: 0 0 1rem; + font-size: 1.2rem; +} + +.event__description { + padding-bottom: 1em; + border-bottom: 1px solid $gray; + margin-bottom: 1em; } .event__meta { @@ -12,11 +19,12 @@ *display: inline; *zoom: 1; text-align: right; + font-family: $header_font_family; - padding: .3rem; + // padding: .3rem; // background: $main_color; - border: 1px solid $gray_light; - color: black; + // border: 1px solid $gray_light; + // color: black; &:before { content: '\f041'; font-family: $icon-font; @@ -26,8 +34,14 @@ vertical-align: middle; margin-right: .6rem; font-size: 2rem; - color: darken($main_color, 20); + color: transparentize($main_color, .5); } } +.event__detail, +.event__detail a { + text-align: right; + color: $base_font_color; +} + // f041 \ No newline at end of file diff --git a/app/festival/static/scss/modules/user.scss b/app/festival/static/scss/modules/user.scss index 2dd10a95..3cba9d14 100644 --- a/app/festival/static/scss/modules/user.scss +++ b/app/festival/static/scss/modules/user.scss @@ -1,5 +1,5 @@ .user__panel { margin: 1rem auto; padding: .5rem 1rem; - background: #fff; + background: lighten($main_color, 20); } \ No newline at end of file diff --git a/app/templates/agenda/event_list.html b/app/templates/agenda/event_list.html index 8f12f7e0..ecd5d7d7 100644 --- a/app/templates/agenda/event_list.html +++ b/app/templates/agenda/event_list.html @@ -96,7 +96,9 @@ {% block event_list_event_content %} {% editable event.content %} - {{ event.description_from_content|safe }} +
+ {{ event.description_from_content|safe }} +
{% endeditable %} {% endblock %} @@ -116,7 +118,7 @@ {% endblock %} {% block event_list_event_links %} -
+
{% keywords_for event as tags %} {% if tags %}
    diff --git a/app/templates/pages/menus/dropdown.html b/app/templates/pages/menus/dropdown.html index ad97fb70..36eb79be 100644 --- a/app/templates/pages/menus/dropdown.html +++ b/app/templates/pages/menus/dropdown.html @@ -5,7 +5,7 @@ {% if page_branch_in_menu %} {% if branch_level == 0 %} -