Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified topic viewer page and few UI changes on topic editor page. #6455

Merged
merged 51 commits into from
Apr 19, 2019
Merged

Modified topic viewer page and few UI changes on topic editor page. #6455

Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
f115e45
First
Nov 26, 2018
28b6e0e
First
Nov 26, 2018
c429cae
Second
Nov 27, 2018
83f6a9c
Third
Nov 27, 2018
9cac86f
Fourth
Nov 27, 2018
010e82c
Merge branch 'develop' of https://github.com/anubhavsinha98/oppia int…
anubhavsinha98 Jan 31, 2019
ed6db59
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 11, 2019
cd0f299
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 17, 2019
a3c44a4
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 18, 2019
7276cb1
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 19, 2019
e04ff0e
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 22, 2019
f566c57
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 25, 2019
4913821
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 25, 2019
b017a2b
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 26, 2019
53f68cd
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 27, 2019
892949a
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Feb 28, 2019
4aa5e63
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 1, 2019
0283d75
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 1, 2019
e595522
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 2, 2019
21d6944
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 3, 2019
46e2322
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 4, 2019
3cc076e
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 5, 2019
d4df339
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 6, 2019
a84476e
Reset
anubhavsinha98 Mar 6, 2019
1bce319
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 7, 2019
9c75ed5
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 9, 2019
4448fdb
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 10, 2019
31758f9
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 12, 2019
4ec472a
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 12, 2019
9826745
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 12, 2019
03e46a8
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 13, 2019
73fc74a
Added 4 tiles & fixed tab issues
anubhavsinha98 Mar 14, 2019
458e0ba
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 14, 2019
3db14a6
Maded some changes
anubhavsinha98 Mar 14, 2019
3bcf798
Linting Fixed
anubhavsinha98 Mar 14, 2019
7f4b7e8
Lint fixed
anubhavsinha98 Mar 14, 2019
47b7b7b
Updated constant.js
anubhavsinha98 Mar 14, 2019
a96fb6f
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 15, 2019
5ae7186
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 16, 2019
b7dec02
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 17, 2019
5d322f3
Merge branch 'develop' of https://github.com/oppia/oppia into develop
anubhavsinha98 Mar 22, 2019
38e29e7
Merge branch 'develop' into mock
anubhavsinha98 Mar 24, 2019
b4e5374
Merge branch 'mock' of https://github.com/anubhavsinha98/oppia into mock
anubhavsinha98 Mar 24, 2019
a54d5c4
reverted changes
anubhavsinha98 Mar 24, 2019
645574d
Tab fixed
anubhavsinha98 Mar 24, 2019
ef2160b
Update constants.js
anubhavsinha98 Mar 24, 2019
9a8e45d
Update topic_editor_navbar_directive.html
anubhavsinha98 Mar 24, 2019
9918305
Mobile view corrected
anubhavsinha98 Apr 11, 2019
2c00741
Merge branch 'mock' of https://github.com/anubhavsinha98/oppia into mock
anubhavsinha98 Apr 11, 2019
dee5636
linting issues fixed
anubhavsinha98 Apr 11, 2019
ef01166
Added mobile view tab section
anubhavsinha98 Apr 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/templates/dev/head/pages/topic_editor/main_editor/topic_editor_tab_directive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ <h4 ng-if="topic.getCanonicalStoryIds().length === 0" style="color: gray;">
</div>

<style>
.topic-editor textarea {
resize:vertical;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add space after colon

/cc @oppia/dev-workflow-team this should be a lint check?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay.
Filed #6494.
Thanks.

Copy link
Member

@DubeySandeep DubeySandeep Apr 20, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anubhavsinha98, We have merged this PR without this fix and now the tests are failing in develop branch!
image

}
.topic-editor {
margin-top: 2%;
margin-left: 25%;
Expand Down
4 changes: 2 additions & 2 deletions core/templates/dev/head/pages/topic_viewer/StoriesListDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ oppia.directive('storiesList', [
function(WindowDimensionsService, $scope, $timeout) {
var STORY_TILE_WIDTH_PX = 360;
$scope.leftmostCardIndices = 0;
var MAX_NUM_TILES_PER_ROW = 3;
var MAX_NUM_TILES_PER_ROW = 4;
$scope.tileDisplayCount = 0;

var initCarousels = function() {
Expand All @@ -38,7 +38,7 @@ oppia.directive('storiesList', [
return;
}

var windowWidth = $(window).width() * 0.85;
var windowWidth = $(window).width();
$scope.tileDisplayCount = Math.min(
Math.floor(windowWidth / (STORY_TILE_WIDTH_PX + 20)),
MAX_NUM_TILES_PER_ROW);
Expand Down
10 changes: 5 additions & 5 deletions core/templates/dev/head/pages/topic_viewer/stories_list_directive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@

<div ng-if="topicViewerWindowIsNarrow" class="oppia-topic-viewer-low-width">
<md-card ng-repeat="canonicalStory in canonicalStories" class="oppia-story-summary-tile">
<canonical-story-summary-tile story-id="canonicalStory.id"
title="canonicalStory.title"
description="canonicalStory.description">
</canonical-story-summary-tile>
<story-summary-tile story-id="canonicalStory.id"
title="canonicalStory.title"
description="canonicalStory.description">
</story-summary-tile>
</md-card>
</div>

Expand Down Expand Up @@ -90,7 +90,7 @@
stories-list div .oppia-topic-viewer-carousel {
float: left;
height: 430px;
max-width: 1070px;
max-width: 1420px;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems a little big. Does it work well on mobile?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anubhavsinha98 Can you confirm this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I just checked it on mobile view it seems its failing. Will fix it and update the PR.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anubhavsinha98, are we expecting this to be fixed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have fixed it and actually in mobile view we get a list of story tiles vertically. Akshay has added screenshot for it. i think it can help.

overflow: hidden;
position: relative;
width: auto;
Expand Down
8 changes: 1 addition & 7 deletions core/templates/dev/head/pages/topic_viewer/topic_viewer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,13 @@
.oppia-topic-viewer-tabs {
background-color: #7e7e7e;
margin: 0 auto 0 10%;
width: fit-content;
}
.oppia-topic-viewer-tabs .oppia-topic-viewer-tabs-text:hover {
font-size: 1em;
padding: 10px;
text-transform: uppercase;
width: 100%;
text-shadow: 0.5px 0.5px 0.5px #e7e7e2;
}
.oppia-topic-viewer-tabs .oppia-topic-viewer-tabs-text:hover,
.oppia-topic-viewer-tabs .oppia-topic-viewer-tabs-text:focus {
text-decoration: underline;
}

@media(max-width: 925px) {
.oppia-topic-viewer-tabs {
margin: 0 auto;
Expand Down