Merge branch 'feature/272-iphone-schedule' into develop

nastachku · Apr 5, 2013 · 4ef575a · 4ef575a
2 parents 8812cb7 + f7cb0a5
commit 4ef575a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/app/assets/stylesheets/custom/_areas.scss b/app/assets/stylesheets/custom/_areas.scss
@@ -322,6 +322,20 @@ $i : $min_speech_time;
   .modal-body {
     background-color: #d4724b;
     color: #fff;
+    &.parent {
+      padding: 0;
+      .userinfo {
+        padding: 15px;
+      }
+      .child-content {
+        padding: 15px;
+      }
+    }
+  }
+}
+@media (max-width: 400px) {
+  .modal-body {
+    max-height: 300px;
   }
 }
 
@@ -341,6 +355,7 @@ $i : $min_speech_time;
       font-size: 36px;
       padding-left: 0 !important;
       text-decoration: underline;
+      line-height: 100% !important;
       &:hover {
         background: none !important;
         border: none !important;

diff --git a/app/views/web/schedules/_lecture.html.haml b/app/views/web/schedules/_lecture.html.haml
@@ -4,18 +4,18 @@
       %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
       %h3{id: "#{dom_id(slot)}myModalLabel__author_info"}
         = slot.event.user.full_name
-    .modal-body
+    .modal-body.parent
       .userinfo
         - if slot.event.user.photo?
           .pull-left.userpic
             = image_tag(slot.event.user.photo.url)
         %p.userabout= slot.event.user.about
         .clearfix
-    .modal-header
-      %h3{id: "#{dom_id(slot)}myModalLabel"}
-        = slot.event.title
-    .modal-body
-      %p= nl2br(slot.event.thesises)
+      .modal-header
+        %h3{id: "#{dom_id(slot)}myModalLabel"}
+          = slot.event.title
+      .child-content
+        %p= nl2br(slot.event.thesises)
 
 - else
   .modal.hide.fade{id: dom_id(slot), "aria-hidden" => "true", "aria-labelledby" => "#{dom_id(slot)}myModalLabel", :role => "dialog", :tabindex => "-1"}