[fix]:ssingh.153312663.fixed design and encryption

jain-nikunj · Dec 4, 2017 · 52bb9bd · 52bb9bd
1 parent c5b8f23
commit 52bb9bd
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 20 deletions.
diff --git a/.env.gpg b/.env.gpg
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@ coverage/
 *.log
 *.byebug_history
 *.tmp
-*.env
+.env
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -28,6 +28,16 @@
     width: 100% !important;
 }
 
+#filter_btn {
+  height: 40px;
+  width: 180px;
+  border: none;
+  background: none;
+  font-family: sans-serif;
+  font-size: 16px;
+  padding-left: 5%;
+}
+
 .navbar-brand {
     margin-left: 5% !important;
 }

diff --git a/app/assets/stylesheets/index.scss b/app/assets/stylesheets/index.scss
@@ -1,13 +1,3 @@
-#filter_btn {
-  height: 30px;
-  width: 180px;
-  border: none;
-  background: none;
-  font-family: helvatica;
-  font-size: 16px;
-  padding-left: 5%;
-}
-
 .category_text {
   font-family: helvatica;
   font-size: 20px;
@@ -68,6 +58,7 @@ button:focus {
   font-size: 14px;
   padding: .3em .4em .4em;
   margin: 0 .1em;
+  color: #000;
 }
 
 .tag a {

diff --git a/app/assets/stylesheets/show.css b/app/assets/stylesheets/show.css
@@ -26,12 +26,10 @@ html {
 
 #sidebar {
   position: absolute;
-  height: 83.5%;
+  height: 100%;
   overflow-y: scroll;
   padding-top: 0px;
   padding-right: 0px;
-  border-right-style: double;
-  border-right-color: black;
   background-color: #eee;
 }
 #sidebar .nav {

diff --git a/app/views/buildings/index.html.haml b/app/views/buildings/index.html.haml
@@ -4,7 +4,7 @@
       %div
         %span
           %button{:class => "text-left", :"data-toggle" => "collapse", :"data-target" => "#filters_collapse", :id => "filter_btn"}
-            %i{:class => "glyphicon glyphicon-plus"}
+            %i{:class => "glyphicon glyphicon-resize-vertical"}
             Filter
         %span{:class => "tag label label-info", :id => "Classroom_tag", :style => "display: none"}
           %span Classroom

diff --git a/app/views/buildings/show.html.erb b/app/views/buildings/show.html.erb
@@ -6,7 +6,7 @@
           <div>
             <span>
               <button class="text-left" data-target="#filters_collapse" data-toggle="collapse" id="filter_btn">
-                <i class="glyphicon glyphicon-plus"></i>
+                <i class="glyphicon glyphicon-resize-vertical"></i>
                 Filter
               </button>
             </span>

diff --git a/lib/seeds/rooms_central.csv b/lib/seeds/rooms_central.csv
@@ -103,7 +103,7 @@ Wheeler,122,19,Seminar Room,"ADA-Instructor Accessible, ADA-Student Accessible,
 Wheeler,124,30,Classroom,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Computer Data Display, AV-Connection-Aux, AV-Connection-VGA, AV-DVD Player, AV-Screen-Manual Projector, AV-VHS player, Board-Chalk Only, Seating-Movable, Window",
 Wheeler,126,30,Classroom,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Computer Data Display, AV-Connection-Aux, AV-Connection-VGA, AV-DVD Player, AV-Screen-Manual Projector, AV-VHS player, Board-Chalk Only, Seating-Movable, Window",
 Wheeler,130,40,Classroom,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Computer Data Display, AV-Connection-Aux, AV-Connection-VGA, AV-DVD Player, AV-Screen-Manual Projector, AV-VHS player, Board-White Only, Seating-Movable, Window",
-Wheeler,Auditorium,732,HD Classroom,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Blu-ray Player, AV-Computer Data Display, AV-Computer Data Display HD, AV-Connection-Aux, AV-Connection-HDMI, AV-Connection-VGA, AV-Connection-XLR, AV-Course Capture, AV-Course Capture Video, AV-DVD Player, AV-Document Camera, AV-Microphones, AV-Screen-Manual Projector, Stage, Window-None",
+Wheeler,1,732,Auditorium,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Blu-ray Player, AV-Computer Data Display, AV-Computer Data Display HD, AV-Connection-Aux, AV-Connection-HDMI, AV-Connection-VGA, AV-Connection-XLR, AV-Course Capture, AV-Course Capture Video, AV-DVD Player, AV-Document Camera, AV-Microphones, AV-Screen-Manual Projector, Stage, Window-None",
 Wheeler,200,40,Classroom,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Computer Data Display, AV-Connection-Aux, AV-Connection-VGA, AV-DVD Player, AV-Screen-Manual Projector, AV-VHS player, Board-Chalk Only, Seating-Movable, Window",
 Wheeler,202,40,Classroom,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Blu-ray Player, AV-Computer Data Display, AV-Computer Data Display HD, AV-Connection-Aux, AV-Connection-HDMI, AV-Connection-VGA, AV-Connection-XLR, AV-DVD Player, AV-Screen-Manual Projector, AV-VHS player, Board-Chalk Only, Seating-Movable, Window",
 Wheeler,204,56,Classroom,"ADA-Instructor Accessible, ADA-Student Accessible, AV-Assistive Listening Device, AV-Computer Data Display, AV-Connection-Aux, AV-Connection-VGA, AV-Connection-XLR, AV-DVD Player, AV-Microphones, AV-Screen-Manual Projector, AV-VHS player, Board-Chalk Only, Seating-Movable, Window",

diff --git a/lib/seeds/rooms_north.csv b/lib/seeds/rooms_north.csv
@@ -75,6 +75,6 @@ Sutardja,240,25,Classroom,"projector & Screen, Sound system ",varying reservatio
 Sutardja,242,30,Classroom,"projector & Screen, Sound system, Podium",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
 Sutardja,250,49,Classroom,"projector & Screen, Sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
 Sutardja,254,30,Classroom,"projector & Screen, Sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
-Sutardja,300 Kvamme,149,Kvamme Atrium ,"projector & Screen, Sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
-Sutardja,310 Banatao,149,Banatao Auditorium ,"projector & Screen, Mic, sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
-Sutardja,630 Bechtel,44,Bechtel Boardroom,"projector & Screen, Sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
+Sutardja,300,149,Kvamme Atrium ,"projector & Screen, Sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
+Sutardja,310,149,Banatao Auditorium ,"projector & Screen, Mic, sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
+Sutardja,630,44,Bechtel Boardroom,"projector & Screen, Sound system",varying reservation cost  http://citris-uc.org/reserve-a-room/room-booking-rates/
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ coverage/ @@
     *.log
     *.byebug_history
     *.tmp
-    *.env
+    .env