fixed title and added button

UFPE · Apr 4, 2015 · 3ecc5ab · 3ecc5ab
1 parent 1a083f4
commit 3ecc5ab
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -24,6 +24,7 @@
  	margin: 0px;
  	padding: 0px;
  }
+
 
  a:link, a:visited, a:hover, a:active {
  	color: #2163E3;
@@ -56,6 +57,7 @@
 	display: inline-block;
 	float: right;
 	font-size: 18px;
+	margin-right: 10px,
 }
 
 #sidebar-filter {

diff --git a/app/assets/stylesheets/instructor.css.scss b/app/assets/stylesheets/instructor.css.scss
@@ -1,3 +1,4 @@
 // Place all the styles related to the instructor controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+
diff --git a/app/views/collections/new.html.haml b/app/views/collections/new.html.haml
@@ -1,4 +1,4 @@
-%h1 new.html.haml standin
+%h1 Create New Collection
 
 / = form_for @collection do |f|
 /   = f.label :name

diff --git a/app/views/instructor/show.html.haml b/app/views/instructor/show.html.haml
@@ -7,6 +7,9 @@
   =link_to 'start a new collection', new_collection_path
 
 -else
+
+  =link_to 'start a new collection', new_collection_path, :class => 'btn btn-info'
+
 %div.col-md-10
   %div.table-responsive
     %table.table.table-striped#collections

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -1,4 +1,4 @@
-!!! 5
+
 %link{:href => 'http://fonts.googleapis.com/css?family=Patrick+Hand|Delius|Handlee', :rel => 'stylesheet', :type => 'text/css'}
 
 %html
@@ -10,15 +10,16 @@
 
   %body
     #header
-      %h1.title Course Question Bank
-      #user
-        - if @current_user
-          - if !@current_user.name.empty?
-            %p.welcome  Welcome, #{@current_user.name}!
-          - else
-            %p.welcome  Welcome, #{@current_user.provider} user!
-          = link_to 'Go to my dashboard', profile_path, method: :get
-          = link_to 'Log Out', logout_path, method: :post
+      .title 
+        %h1= link_to 'Course Question Bank', problems_path
+        #user
+          - if @current_user
+            - if !@current_user.name.empty?
+              %p.welcome  Welcome, #{@current_user.name}!
+            - else
+              %p.welcome  Welcome, #{@current_user.provider} user!
+            = link_to 'Go to my dashboard', profile_path, method: :get
+            = link_to 'Log Out', logout_path, method: :post
     #main
       - if flash[:notice]
         #notice.message= flash[:notice]

diff --git a/text.rb b/text.rb
@@ -9,5 +9,6 @@
     answer "Rails itself isn't the problem, but the development processes typically used around Rails don't scale well to large teams."
     distractor "If you're building a startup and expect high volume, Raffi Krikorian would advise you to stay away from Ruby and Rails from the start."
     answer "If Twitter had been architected as a service-oriented architecture from the start, they might have stayed on Ruby/Rails somewhat longer than they did."
+
   end 
  end