Skip to content

Commit

Permalink
Add new splash images.
Browse files Browse the repository at this point in the history
  • Loading branch information
@seanlip
seanlip committed May 6, 2016
1 parent 14f337e commit 5b1c643
Show file tree
Hide file tree
Showing 36 changed files with 744 additions and 282 deletions.
19 changes: 14 additions & 5 deletions core/domain/summary_services.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,32 @@

_LIBRARY_INDEX_GROUPS = [{
'header': 'Mathematics & Statistics',
'search_categories': ['Mathematics', 'Statistics'],
'search_categories': [
'Mathematics', 'Algebra', 'Arithmetic', 'Calculus', 'Combinatorics',
'Geometry', 'Graph Theory', 'Logic', 'Probability', 'Statistics',
'Trigonometry',
],
}, {
'header': 'Computing',
'search_categories': ['Computing', 'Programming'],
'search_categories': ['Algorithms', 'Computing', 'Programming'],
}, {
'header': 'Science',
'search_categories': [
'Astronomy', 'Biology', 'Chemistry', 'Engineering', 'Environment',
'Medicine', 'Physics'
'Medicine', 'Physics',
],
}, {
'header': 'Humanities',
'search_categories': [
'Architecture', 'Art', 'Music', 'Philosophy', 'Poetry'
],
}, {
'header': 'Languages',
'search_categories': ['Languages', 'Reading'],
'search_categories': ['Languages', 'Reading', 'English', 'Latin'],
}, {
'header': 'Social Science',
'search_categories': [
'Business', 'Economics', 'Geography', 'Government', 'Law'],
'Business', 'Economics', 'Geography', 'Government', 'History', 'Law'],
}]


Expand Down
2 changes: 1 addition & 1 deletion core/templates/dev/head/components/exploration_summary_tile_directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h2 class="exploration-title protractor-test-exp-summary-tile-title">
</h2>

<!-- Note that if this is ng-if instead, the avatar area will not detect a mouseover and the tile will behave incorrectly. -->
<div ng-show="isWindowLarge" class="exploration-summary-avatars" ng-show="avatarsList.length > 0">
<div ng-show="isWindowLarge && avatarsList.length > 0" class="exploration-summary-avatars" ng-show="avatarsList.length > 0">
<div class="circular-image-container">
<circular-image ng-if="avatarsList.length > 0"
src="avatarsList[0].image"
Expand Down
6 changes: 3 additions & 3 deletions core/templates/dev/head/css/oppia.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2921,7 +2921,7 @@ md-card.preview-conversation-skin-supplemental-card {
.oppia-splash-h2 {
line-height: 1.6em;
margin: 0 auto;
padding-bottom: 50px;
padding-bottom: 72px;
}

@media (min-width: 630px) {
Expand All @@ -2930,7 +2930,7 @@ md-card.preview-conversation-skin-supplemental-card {
}
.oppia-splash-h2 {
font-size: 1.8em;
padding-top: 150px;
padding-top: 130px;
}
}
@media (max-width: 629px) {
Expand Down Expand Up @@ -2959,7 +2959,7 @@ md-card.preview-conversation-skin-supplemental-card {
.oppia-splash-books {
left: 50%;
position: absolute;
top: 80px;
top: 95px;
z-index: 5;
}
@media (min-width: 630px) {
Expand Down
36 changes: 18 additions & 18 deletions core/templates/dev/head/pages/splash.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,48 +28,48 @@ <h1 class="oppia-splash-h1">Think outside the books.</h1>
<div class="oppia-splash-background-icon-row">
<img src="images/splash_icons/books.svg" class="oppia-splash-books">

<img src="images/subjects/Religion.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Mathematics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Philosophy.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Humor.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Combinatorics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Cooking.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Government.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Architecture.svg" class="oppia-splash-background-icon">
<img src="images/subjects/History.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Microbiology.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Engineering.svg" class="oppia-splash-background-icon">

<img src="images/subjects/Algorithms.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Economics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Computing.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Law.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Reading.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Art.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Creativity.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Physics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Language.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Arithmetic.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Chess.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Astronomy.svg" class="oppia-splash-background-icon">

<img src="images/subjects/Religion.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Mathematics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Philosophy.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Humor.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Combinatorics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Cooking.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Government.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Architecture.svg" class="oppia-splash-background-icon">
<img src="images/subjects/History.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Microbiology.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Engineering.svg" class="oppia-splash-background-icon">
</div>

<div class="oppia-splash-background-icon-row">
<img src="images/subjects/Geography.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Biology.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Genetics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Space.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Algebra.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Music.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Chemistry.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Poetry.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Puzzles.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Calculus.svg" class="oppia-splash-background-icon">

<img src="images/subjects/Business.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Geography.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Biology.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Genetics.svg" class="oppia-splash-background-icon">
Expand All @@ -79,29 +79,29 @@ <h1 class="oppia-splash-h1">Think outside the books.</h1>
<img src="images/subjects/Chemistry.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Poetry.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Puzzles.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Calculus.svg" class="oppia-splash-background-icon">

<img src="images/subjects/Business.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Geography.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Biology.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Genetics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Space.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Algebra.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Music.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Chemistry.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Poetry.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Puzzles.svg" class="oppia-splash-background-icon">
</div>

<div class="oppia-splash-background-icon-row">
<img src="images/subjects/Art.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Law.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Computing.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Economics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Algorithms.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Creativity.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Astronomy.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Chess.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Arithmetic.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Language.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Physics.svg" class="oppia-splash-background-icon">

<img src="images/subjects/Combinatorics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Humor.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Philosophy.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Mathematics.svg" class="oppia-splash-background-icon">
Expand All @@ -111,16 +111,16 @@ <h1 class="oppia-splash-h1">Think outside the books.</h1>
<img src="images/subjects/Microbiology.svg" class="oppia-splash-background-icon">
<img src="images/subjects/History.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Architecture.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Government.svg" class="oppia-splash-background-icon">

<img src="images/subjects/Art.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Law.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Reading.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Computing.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Economics.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Algorithms.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Creativity.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Astronomy.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Chess.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Arithmetic.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Language.svg" class="oppia-splash-background-icon">
<img src="images/subjects/Physics.svg" class="oppia-splash-background-icon">
</div>
<div class="oppia-splash-h2-container">
<h2 class="oppia-splash-h2">Oppia makes it easy to create interactive explorations that educate and engage.</h2>
Expand Down
2 changes: 1 addition & 1 deletion data/explorations/binary_search/The Lazy Magician.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
author_notes: ''
blurb: ''
category: Mathematics
category: Algorithms
init_state_name: Introduction
language_code: en
objective: discover the binary search algorithm
Expand Down
2 changes: 1 addition & 1 deletion data/explorations/modeling_graphs/Graph Modeling.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
author_notes: ''
blurb: ''
category: Mathematics
category: Graph Theory
init_state_name: Introduction
language_code: en
objective: Learn how to model objects as graphs
Expand Down
2 changes: 1 addition & 1 deletion data/explorations/multiples.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
author_notes: ''
blurb: ''
category: Coding
category: Programming
init_state_name: Intro
language_code: en
objective: solve Problem 1 on the Project Euler site
Expand Down
2 changes: 1 addition & 1 deletion data/explorations/root_linear_coefficient_theorem.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
author_notes: ''
blurb: ''
category: Mathematics
category: Algebra
init_state_name: Start
language_code: en
objective: discover the Root Linear Coefficient Theorem
Expand Down
2 changes: 1 addition & 1 deletion data/explorations/solar_system/The Solar System.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
author_notes: ''
blurb: ''
category: Physics
category: Astronomy
init_state_name: First State
language_code: en
objective: Learn about the planets of the solar system
Expand Down
2 changes: 1 addition & 1 deletion data/explorations/three_balls/Three Balls.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
author_notes: ''
blurb: ''
category: Mathematics
category: Combinatorics
init_state_name: Intro
language_code: en
objective: learn how to count permutations accurately and systematically
Expand Down
93 changes: 47 additions & 46 deletions feconf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,58 +426,59 @@ def get_empty_ratings():
UPDATE_TYPE_COLLECTION_COMMIT = 'collection_commit'
UPDATE_TYPE_FEEDBACK_MESSAGE = 'feedback_thread'

# Default color
COLOR_TEAL = 'teal'
# Social sciences
COLOR_SALMON = 'salmon'
# Art
COLOR_SUNNYSIDE = 'sunnyside'
# Mathematics and computing
COLOR_SHARKFIN = 'sharkfin'
# Science
COLOR_GUNMETAL = 'gunmetal'
DEFAULT_COLOR = COLOR_TEAL
DEFAULT_COLOR = '#a33f40'
DEFAULT_THUMBNAIL_ICON = 'Lightbulb'

COLORS_TO_HEX_VALUES = {
COLOR_TEAL: '#7c8952',
COLOR_SALMON: '#b05a27',
COLOR_SUNNYSIDE: '#cf972b',
COLOR_SHARKFIN: '#ce672b',
COLOR_GUNMETAL: '#185269',
}

# List of supported default categories. For now, each category has
# a specific color associated with it. Each category also has a thumbnail icon
# whose filename is "{{CategoryName}}.svg".
CATEGORIES_TO_COLORS = {
'Architecture': COLOR_SUNNYSIDE,
'Art': COLOR_SUNNYSIDE,
'Biology': COLOR_GUNMETAL,
'Business': COLOR_SALMON,
'Chemistry': COLOR_GUNMETAL,
'Computing': COLOR_SHARKFIN,
'Economics': COLOR_SALMON,
'Education': COLOR_TEAL,
'Engineering': COLOR_GUNMETAL,
'Environment': COLOR_GUNMETAL,
'Geography': COLOR_SALMON,
'Government': COLOR_SALMON,
'Languages': COLOR_SUNNYSIDE,
'Law': COLOR_SALMON,
'Life Skills': COLOR_TEAL,
'Mathematics': COLOR_SHARKFIN,
'Medicine': COLOR_GUNMETAL,
'Music': COLOR_SUNNYSIDE,
'Philosophy': COLOR_SALMON,
'Physics': COLOR_GUNMETAL,
'Programming': COLOR_SHARKFIN,
'Psychology': COLOR_SALMON,
'Puzzles': COLOR_TEAL,
'Reading': COLOR_TEAL,
'Sport': COLOR_SUNNYSIDE,
'Statistics': COLOR_SHARKFIN,
'Welcome': COLOR_TEAL,
'Mathematics': '#cd672b',
'Algebra': '#cd672b',
'Arithmetic': '#d68453',
'Calculus': '#b86330',
'Logic': '#d68453',
'Combinatorics': '#cf5935',
'Graph Theory': '#cf5935',
'Probability': '#cf5935',
'Statistics': '#cd672b',
'Geometry': '#d46949',
'Trigonometry': '#d46949',

'Algorithms': '#d0982a',
'Computing': '#bb8b2f',
'Programming': '#d9aa53',

'Astronomy': '#879d6c',
'Biology': '#97a766',
'Chemistry': '#aab883',
'Engineering': '#8b9862',
'Environment': '#aba86d',
'Medicine': '#97a766',
'Physics': '#879d6c',

'Architecture': '#6e3466',
'Art': '#895a83',
'Music': '#6a3862',
'Philosophy': '#613968',
'Poetry': '#7f507f',

'English': '#193a69',
'Languages': '#1b4174',
'Latin': '#3d5a89',
'Reading': '#193a69',

'Business': '#387163',
'Economics': '#5d8b7f',
'Geography': '#3c6d62',
'Government': '#538270',
'History': '#3d6b52',
'Law': '#538270',

'Education': '#942e20',
'Puzzles': '#a8554a',
'Sport': '#893327',
'Welcome': '#992a2b',
}

ALL_CATEGORIES = sorted(CATEGORIES_TO_COLORS.keys())
Expand Down
19 changes: 19 additions & 0 deletions static/images/subjects/Algorithms.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 9 additions & 12 deletions static/images/subjects/Astronomy.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5b1c643

Please sign in to comment.