]> git.parisson.com Git - mezzo.git/commitdiff
Sidebar styles
authorPhilippe Barbosa <contact@philippebarbosa.com>
Fri, 4 Mar 2016 14:38:50 +0000 (15:38 +0100)
committerPhilippe Barbosa <contact@philippebarbosa.com>
Fri, 4 Mar 2016 14:38:50 +0000 (15:38 +0100)
app/festival/static/css/index.css
app/festival/static/scss/base/_forms.scss
app/festival/static/scss/base/_layout.scss
app/festival/static/scss/modules/event-card.scss
app/festival/static/scss/modules/user.scss
app/templates/agenda/event_list.html
app/templates/pages/menus/dropdown.html

index c62a4efa103ab736682c0bae6a00dedda8370bb7..35cb38ea2711a72455ccaeb58f5beeb77ec4d32e 100755 (executable)
@@ -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%;
index 6ae1fa6cb885cd9272b76933e6d5f24f8e8dc96e..d639033bc5ca29d6debfe5006419dbbda9724ff8 100755 (executable)
@@ -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;
   }
index 3c95bc4394d1472ddd6e04cf194f666e8b97303f..f8d53658bd38435010319b3c05b21b1e64615680 100755 (executable)
 
 .aside {
   display: block;
+  background: #fff;
+  padding: 1rem .5rem;
+  margin-bottom: 3rem;
   @media (min-width : $desktop ) {
     float: left;
     width: 30%;
-    padding: 0 .5rem;
   }
 }
 
index 611e4a0e9a438fe66c9acf911834cbfbe379bddc..45b872862239eecf4c9e5d324b8eb38a4f0ffe60 100644 (file)
@@ -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 {
   *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;
     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
index 2dd10a95c2f75b09843cd9fa84fce9b5684a3623..3cba9d14c95e1ddc12ef5197fdcc68cc1fbdcb35 100644 (file)
@@ -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
index 8f12f7e0ba2c8fc76281db8137d8d6a241e0dd2b..ecd5d7d729dbd9b8fd214a6263afdfb985fa50c2 100644 (file)
@@ -96,7 +96,9 @@
 
     {% block event_list_event_content %}
         {% editable event.content %}
-            {{ event.description_from_content|safe }}
+            <div class="event__description">
+                {{ event.description_from_content|safe }}
+            </div>
         {% endeditable %}
     {% endblock %}
 
     {% endblock %}
 
 {% block event_list_event_links %}
-<div class="event-list-detail">
+<div class="event__detail">
     {% keywords_for event as tags %}
     {% if tags %}
     <ul class="list-inline tags">
index ad97fb702f97375c3afdc25f3d816de040f238d3..36eb79bec21792a9885bf78126ac63353c4bb20a 100644 (file)
@@ -5,7 +5,7 @@
 {% if page_branch_in_menu %}
 
 {% if branch_level == 0 %}
-<ul class="menu toto">
+<ul class="menu">
     {% for page in page_branch %}
     {% if not has_home and page.is_primary and forloop.first %}
     <li class="menu__item {% if on_home %}active{% endif %}">