Merge branch 'release/v12'

nastachku · Mar 19, 2013 · 80b057f · 80b057f
2 parents a1a394b + 04cf37d
commit 80b057f
Show file tree

Hide file tree

Showing 22 changed files with 238 additions and 217 deletions.
diff --git a/Gemfile b/Gemfile
@@ -49,6 +49,7 @@ group :assets do
   gem 'coffee-rails', '~> 3.2.1'
   gem 'therubyracer', :platforms => :ruby
   gem 'uglifier', '>= 1.0.3'
+  gem 'compass-rails'
 end
 
 group :test, :development do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -70,6 +70,7 @@ GEM
       railties (>= 3.0)
       sass-rails (>= 3.2)
     chronic (0.9.0)
+    chunky_png (1.2.7)
     ci_reporter (1.8.4)
       builder (>= 2.1.2)
     ckeditor (4.0.2)
@@ -85,6 +86,12 @@ GEM
     coffee-script-source (1.4.0)
     colorize (0.5.8)
     commonjs (0.2.6)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    compass-rails (1.0.3)
+      compass (>= 0.12.2, < 0.14)
     configus (0.0.4)
       rake
     coveralls (0.5.6)
@@ -106,6 +113,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.5)
       multipart-post (~> 1.1)
+    fssm (0.2.10)
     gon (4.0.2)
       actionpack (>= 2.3.0)
       json
@@ -320,6 +328,7 @@ DEPENDENCIES
   ckeditor
   cocoon
   coffee-rails (~> 3.2.1)
+  compass-rails
   configus
   coveralls
   enumerize

diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
diff --git a/app/assets/images/stars.png b/app/assets/images/stars.png
diff --git a/app/assets/javascripts/custom.js.coffee b/app/assets/javascripts/custom.js.coffee
@@ -26,6 +26,17 @@ window.onload = ->
       $(".b-affix").removeClass("bottom")
 
 $(document).ready ->
+
+  # timetable long events hover
+  $('.event').mouseenter ->
+    heightSummary = $(this).find('.summary').outerHeight()
+    heightEvent = $(this).outerHeight()
+    if heightSummary > heightEvent
+      $(this).addClass('expand')
+  .mouseleave ->
+    $(this).removeClass('expand')
+
+  # events editing table
   $('table').delegate 'a.edit-event', 'click', ->
     parent_row = $(this).closest('tr')
     parent_row.next().toggleClass('hidden')
@@ -39,16 +50,13 @@ $(document).ready ->
     row.remove()
     delay 4000, -> $('.alert').fadeOut('slow')
 
-  # popover demo
-  $("[data-toggle=popover]").popover()
-
   # Twitter Bootstrap tabs hashes
 
   # Automagically jump on good tab based on anchor; for page reloads or links
   $("a[href=" + location.hash + "]").tab "show"  if location.hash
 
   # Update hash based on tab, basically restores browser default behavior to fix bootstrap tabs
-  $(document.body).on "click", "a[data-toggle]", (event) ->
+  $(document.body).on "click", "a[data-toggle=tab]", (event) ->
     location.hash = @getAttribute("href")
 
 # on history back activate the tab of the location hash if exists or the default tab if no hash exists

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -11,5 +11,5 @@
  *= require  ../../../vendor/assets/stylesheets/mania-style/bootstrap.css
  *= require_directory ../../../vendor/assets/stylesheets/mania-style
  *= require jquery.ui.datepicker
- *= require_directory ./custom
+ *= require screen.css.scss
  */
diff --git a/app/assets/stylesheets/custom/_areas.scss b/app/assets/stylesheets/custom/_areas.scss
@@ -1,20 +1,4 @@
-// Color areas at themes block & timetable
-$blue: #9d0102;
-$red: #019d9b;
-$green: #d0ce09;
-$orange: #839d01;
-$yellow: #70019d;
-$violin: #016f9d;
-$disabled: #ccc;
-
 // themes
-@mixin box-sizing($bs) {
-  $bs: unquote($bs);
-  -moz-box-sizing: $bs;
-  -webkit-box-sizing: $bs;
-  box-sizing: $bs;
-}
-
 .themes-talk {
   margin-bottom: 40px;
   .row {
@@ -61,26 +45,6 @@ $disabled: #ccc;
 }
 
 // Timetable
-
-$tt_width : 940; // total table width
-$tl_width : 40; // timeline column width
-$tp_width : $tt_width - $tl_width; // timepad column width
-
-$areas_count : 6; // Number of rooms
-$area_width : $tp_width / $areas_count;
-
-$b_height : 2px; // height of 1-minute block
-$timing_step: 15; // step for drawing timeline (min)
-$td_color : #ccc; // Time delimiters color
-$hour_start : 11; // Event begin at
-$hour_end : 19; // Event till this time
-
-$min_speech_time : 15; // The shortest speech time
-$max_speech_time : 240; // The longest speech time
-
-$step_offset_render: 1; // The start time accuracy (min)
-$step_cont_render: 1; // The continuance time accuracy (min)
-
 .awesome-timetable {
   width: 940px;
   padding: 30px 0;
@@ -137,14 +101,20 @@ $step_cont_render: 1; // The continuance time accuracy (min)
     background-color: #ccc;
     position: absolute;
     top: 0;
-    color: #333;
+    color: #333 !important;
     @include box-sizing(border-box);
     padding: 6px;
     font-size: 12px;
     font-family: Arial;
     line-height: 18px;
     overflow: hidden;
     cursor: pointer;
+    display: inline-block;
+    text-decoration: none;
+    z-index: 10;
+    .summary {
+      display: block;
+    }
     .time {
       font-weight: bold;
       display: inline;
@@ -162,11 +132,16 @@ $step_cont_render: 1; // The continuance time accuracy (min)
         text-decoration: underline;
       }
     }
+    &.expand {
+      height: auto !important;
+      z-index: 100 !important;
+    }
     .author {
       overflow: hidden;
       text-overflow: ellipsis;
       font-weight: bold;
       text-align: right;
+      display: block;
     }
     &.break {
       background-color: #eee;
@@ -182,30 +157,6 @@ $step_cont_render: 1; // The continuance time accuracy (min)
   }
 }
 
-.popover {
-  background-color: #d4724b;
-  .popover-title {
-    background-color: #7c7852;
-    font-size: 14px;
-    font-weight: normal;
-    color: #fff !important;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-  }
-  .popover-content {
-    font-size: 12px;
-    font-weight: normal;
-    line-height: 18px;
-    text-align: left;
-  }
-  &.right {
-    .arrow:after {
-      border-right-color: #d4724b;
-    }
-  }
-}
-
 // Areas coordinates
 $colors: $blue $red $green $orange $yellow $violin;
 
@@ -270,6 +221,7 @@ $i : $min_speech_time;
       width: 100% !important;
       cursor: default;
       .time .end-time,
+      .summary,
       .caption,
       .author {
         display: inline;
@@ -285,3 +237,17 @@ $i : $min_speech_time;
     }
   }
 }
+
+// Modals
+.content {
+  .modal-header {
+    background-color: #7c7852;
+    h3 {
+      color: #fff !important;
+    }
+  }
+  .modal-body {
+    background-color: #d4724b;
+    color: #fff;
+  }
+}
diff --git a/app/assets/stylesheets/custom/_events.scss b/app/assets/stylesheets/custom/_events.scss
@@ -17,9 +17,7 @@
 }
 .user-summary {
   width: 100%;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
+  @include box-sizing(border-box);
 }
 .formy-photo {
   .user-summary {

diff --git a/app/assets/stylesheets/custom/_forms.scss b/app/assets/stylesheets/custom/_forms.scss
@@ -28,9 +28,7 @@
 .form-type-login input[type="password"] {
   width: 100%;
   height: 28px;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
+  @include box-sizing(border-box);
 }
 .form-type-login .form-actions {
   padding-left: 0;
@@ -40,7 +38,7 @@ input[type="submit"].btn-shine,
 .btn.btn-shine,
 a.btn-shine {
   color: #fff !important;
-  background-color: #7c7852 !important;
+  background-color: $main_color_2 !important;
 }
 .formy .help-inline {
   font-size: 12px;

diff --git a/app/assets/stylesheets/custom/_main.scss b/app/assets/stylesheets/custom/_main.scss
@@ -1,5 +1,3 @@
-$main_color: #d4724b;
-
 html,
 body {
   height: 100%;
@@ -16,13 +14,13 @@ body {
 // header
 header {
   border: none !important;
-  height: 134px;
+  min-height: 134px;
 }
 header .info {
   padding-top: 44px;
 }
 header .info h3 {
-  color: $main_color;
+  color: $main_color_1;
   text-transform: uppercase;
   font-family: Arial;
   font-size: 26px;
@@ -34,8 +32,8 @@ header .info h3 .color {
 
 // slider
 .da-slider {
-  border-top-color: #d4724b;
-  border-bottom-color: #d4724b;
+  border-top-color: $main_color_1;
+  border-bottom-color: $main_color_1;
   color: #000;
   margin-bottom: 60px;
 }
@@ -52,7 +50,7 @@ header .info h3 .color {
 
 // main elements
 a {
-  color: $main_color !important;
+  color: $main_color_1 !important;
 }
 h1 {
   margin-bottom: 30px !important;
@@ -86,7 +84,7 @@ td.middle {
   display: block;
 }
 .color {
-  color: #d4724b !important;
+  color: $main_color_1 !important;
 }
 .no-padding {
   padding-bottom: 0 !important;
@@ -103,6 +101,8 @@ td.middle {
   border: 1px solid #ddd;
 }
 .twtr-doc {
+  -webkit-border-radius: 0 !important;
+  -moz-border-radius: 0 !important;
   border-radius: 0 !important;
 }
 .twtr-ft {
@@ -213,9 +213,18 @@ footer .copy {
 .hero .bender {
   font-weight: 100;
   text-transform: uppercase;
-  color: $main_color !important;
+  color: $main_color_1 !important;
   font-size: 30px !important;
 }
 .hero .bender .color {
   color: #000 !important;
 }
+
+#reformal_tab {
+  z-index: 1000 !important;
+}
+
+.modal-body p {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
diff --git a/app/assets/stylesheets/custom/_nav.scss b/app/assets/stylesheets/custom/_nav.scss
@@ -23,7 +23,7 @@
 }
 .navbar .nav > li.active {
   a {
-    color: #7c7852 !important;
+    color: $main_color_2 !important;
     background: none !important;
     &:hover {
       text-decoration: underline;
@@ -117,7 +117,7 @@
   color: #fff !important;
   padding-left: 10px !important;
   padding-right: 10px !important;
-  background-color: #7c7852 !important;
+  background-color: $main_color_2 !important;
   &.prev_year {
     font-size: 14px !important;
   }