Skip to content

Commit

Permalink
Merge pull request #10 from JarvusInnovations/develop
Browse files Browse the repository at this point in the history
Release: slate-spark v2.0.4
  • Loading branch information
themightychris authored Nov 23, 2016
2 parents da8a560 + 53d43ab commit d7be793
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 82 deletions.
55 changes: 0 additions & 55 deletions php-classes/Spark/Classroom/HelpRequest.php

This file was deleted.

8 changes: 0 additions & 8 deletions php-classes/Spark/Classroom/HelpRequestRequestHandler.php

This file was deleted.

4 changes: 2 additions & 2 deletions php-config/Git.config.d/slate-spark.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
'site-root/sass',
'site-root/img',
'site-root/spark',
'php-classes/Spark/Classroom',
'php-config/Git.config.d',
'php-config/Slate/DashboardRequestHandler.config.d',
'php-config/Slate/UI/Navigation.config.php',
'php-config/Slate/UI/Omnibar.config.php',
'php-config/Slate/UI/Omnibar.config.d',
'php-config/Slate/UI/Adapters/Courses.config.d/matchbook.php',
'php-config/Slate/UI/Tools.config.d/matchbook.php',
'html-templates/app/spark-ext.tpl',
'html-templates/app/SparkClassroomTeacher',
'html-templates/app/SparkClassroomStudent',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,4 @@
'_children' => $sparkCourseLinks
]
];
}

#Omnibar::$sources[] = Adapters\Courses::class;
Omnibar::$sources[] = Adapters\ManageSlate::class;
Omnibar::$sources[] = Adapters\GoogleApps::class;
Omnibar::$sources[] = Adapters\Canvas::class;
Omnibar::$sources[] = Tools::class;
Omnibar::$sources[] = Adapters\User::class;
Omnibar::$sources[] = [
[
'_label' => 'Report Issue',
'_href' => 'mailto:[email protected]'
]
];
}
8 changes: 8 additions & 0 deletions php-config/Slate/UI/Omnibar.config.d/999-feedback.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

Slate\UI\Omnibar::$sources[] = [
[
'_label' => 'Report Issue',
'_href' => 'mailto:[email protected]'
]
];
10 changes: 10 additions & 0 deletions php-config/Slate/UI/Tools.config.d/matchbook.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

use Slate\UI\Tools;


Tools::$tools['Gmail'] = 'https://mail.google.com/a/';
Tools::$tools['Google Drive'] = 'https://drive.google.com/';
Tools::$tools['Compass Learning'] = 'https://www.thelearningodyssey.com/';
Tools::$tools['iCivics'] = 'https://www.icivics.org/';
Tools::$tools['eScience3000'] = 'https://www.escience3000.com/index';
1 change: 1 addition & 0 deletions site-root/sass/site/_modules.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'modules/omnibar';
5 changes: 5 additions & 0 deletions site-root/sass/site/modules/_omnibar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.omnibar-link {
.slate-logo {
width: 32px; // avoid weird text wrapping issue
}
}
3 changes: 0 additions & 3 deletions site-root/spark/help.php

This file was deleted.

0 comments on commit d7be793

Please sign in to comment.