Skip to content

Commit

Permalink
Upgrade AngularJS Material to v1.1.19 (oppia#7097)
Browse files Browse the repository at this point in the history 
* bower based A.js Library upgrade

* updates to app.yaml

* Removed md-tab from class for static pages

* Revert FAM from app.yaml

* Update font css

* Update version

* Add Css

* Use

* Revert use

* Revert Changes

* Add version again

* Rename manifest.json to 1.1.1

* Update 1.1.1

* Updates to 1.1.19

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Add manifest

* Update css

* Test-2

* Fix e2e

* Delete 1.1.1

* Revert Package-lock

* Fix-2

* Add button click

* Fix lint

* Fix lint-2

* Fix mistakes

* Fix css

* Upgrade

* Revert Package-lock.json

* Reslove comments-1

* Fix CSS Stylings

* Reslove comments-2

* Update README.md

* Testing updates

* Update comments

* Fix lint

* Revert perm

* Fix issues with profile

* Resolve comments

* Fix extra space

* Fix space-2

* Address comments-1

* Fix mistakes

* Fix code-style

* Fix code-style -2

* Fix code-style -3

* Fix code-style -4

* fix html-lint

* Fix modal texts

* Address comments-3

* space of hint & sol

* Address comments 4

* Resolve comments

* Address comments-2

* Check styles

* Add lines

* Add lines 2

* Revert "Resolve comments"

This reverts commit bd741be.

* Revert "Address comments-2"

This reverts commit 1afb71b.

* Address comments

* Add class to admin page

* Code-style

* Codestyle-2

* Resolve comments

* Fix -3

* Fix line-height

* Add new line
  • Loading branch information
@seanlip
Nisheal John authored and seanlip committed Jul 23, 2019
1 parent 8329e18 commit 1872491
Show file tree
Hide file tree
Showing 23 changed files with 468 additions and 306 deletions.
3 changes: 3 additions & 0 deletions .../templates/dev/head/components/button-directives/hint-and-solution-buttons.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
.md-button.md-default-theme.oppia-learner-hint-solution-button {
border-radius: 50%;
height: 32px;
line-height: 32px;
margin-top: 5px;
min-height: 32px;
min-width: 22px;
padding: inherit;
width: 32px;
}
Expand Down
95 changes: 92 additions & 3 deletions core/templates/dev/head/css/oppia.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@
}

/* Angular material overrides. */
.list-inline > li {
width: 45px;
}

.modal-body input {
height: 35px;
}

md-input-group.long > input {
width: 100%;
height: 45px;
Expand All @@ -89,10 +97,51 @@ md-input-group.md-default-theme label {
margin-bottom: 0;
}

.md-button {
font-size: 16px;
line-height: 22px;
min-height: 22px;
min-width: 22px;
padding: 6px;
}

.md-button.md-default.theme {
border-radius: 3px;
}

.md-button-success {
color: #009688;
}

.md-shadow-bottom-z-1, .md-button.md-raised:not([disabled]),
.md-button.md-fab {
box-shadow: 0 2px 5px 0 rgba(0,0,0,0.26);
}

.md-button.md-default-theme.md-raised:not([disabled]):hover,
.md-button.md-raised:not([disabled]):hover {
background-color: rgba(158,158,158,0.3);
box-shadow: 0 4px 8px 0 rgba(0,0,0,0.4);
transform: translate3d(0,-1px,0);
}

.oppia-learner-confirm-button.protractor-test-submit-answer-button.md-button[disabled] {
background-color: transparent;
color: rgba(0,0,0,0.38);
cursor: default;
}

.oppia-learner-confirm-button.protractor-test-submit-answer-button.md-button[disabled]:hover {
background-color: #115fd4;
text-decoration: none;
}

.oppia-learner-confirm-button.protractor-test-submit-answer-button.md-button {
font: 16px;
margin: 0;
min-width: 55px;
}

.md-button.oppia-learner-confirm-button,
.md-button.oppia-learner-got-it-button,
.md-button.oppia-learner-hint-solution-button {
Expand Down Expand Up @@ -135,6 +184,7 @@ md-input-group.md-default-theme label {

/* Attributes for material-icons. */
.material-icons {
line-height: 1;
vertical-align: middle;
}
.material-icons.md-18 {
Expand Down Expand Up @@ -280,13 +330,23 @@ body {
}
}

h1, h2 {
h1 {
color: #000;
font-size: 2em;
}

h2 {
color: #000;
font-size: 1.5em;
margin: .83em 0;
}

h3 {
color: #222;
font-size: 1.17em;
font-weight: bold;
line-height: 1.1;
margin-bottom: 18px;
}

a {
Expand Down Expand Up @@ -459,6 +519,10 @@ textarea {
opacity: 1.0;
text-decoration: none;
}
.oppia-feedback-card .btn-success {
margin-top: 19px;
}

@media (max-width: 1100px) {
.oppia-site-feedback span {
display: none;
Expand Down Expand Up @@ -631,7 +695,9 @@ textarea {
*/

.oppia-footer-container h4 {
font-size: 1em;
font-weight: bold;
margin: 1.33em 0;
text-transform: uppercase;
}

Expand Down Expand Up @@ -1108,6 +1174,10 @@ textarea {
.oppia-dashboard-aggregated-stats md-card {
background: #fff;
margin: 0 7.5px 70px 7.5px;
padding: 8px;
}
.stats-card h1 {
margin-bottom: 24px;
}

.oppia-dashboard-aggregated-stats .stats-card {
Expand Down Expand Up @@ -1141,7 +1211,7 @@ span.sort-explorations-select .sort-order {
}

span.sort-explorations-select .sort-by-text {
margin: 8px 8px 0 ;
margin: 8px 8px 0;
}

span.sort-explorations-select .sort-options {
Expand Down Expand Up @@ -1471,6 +1541,14 @@ md-card.oppia-dashboard-tile {
width: 24px;
}

.pop-over-text p {
line-height: 1.846;
}

.popover p {
line-height: 1.846;
}

pre.oppia-pre-wrapped-text {
white-space: pre-wrap;
}
Expand Down Expand Up @@ -1511,6 +1589,7 @@ pre.oppia-pre-wrapped-text {
margin: 1.5em 0;
}
.oppia-static-content p {
line-height: 1.84;
margin: 1.5em 0;
}

Expand Down Expand Up @@ -1546,6 +1625,9 @@ pre.oppia-pre-wrapped-text {
margin-top: 10px;
}

.popover-content .md-button, .md-button[disabled] {
font-size: 13px;
}
/* The eight rules below should be in sync. */
.oppia-rte-editor > p:first-child {
margin-top: 0;
Expand Down Expand Up @@ -2423,6 +2505,7 @@ div#ng-curtain {
/* Styles for the feedback popover component in the learner view. */
.oppia-feedback-popover-submit-btn-enabled {
color: #009688;
font-size: 13px;
}

.oppia-rte-toolbar-image {
Expand Down Expand Up @@ -2490,6 +2573,10 @@ div#ng-curtain {
padding-left: 15px;
}

.oppia-profile-container md-card.md-default-theme {
background-color: transparent;
}

md-card.preview-conversation-skin-inline-interaction {
background-color: #f6f6f6;
border-bottom-left-radius: 2px;
Expand Down Expand Up @@ -2669,6 +2756,7 @@ md-card.preview-conversation-skin-supplemental-card {
.oppia-info-card-content .card-metrics li .far {
font-size: 24px;
margin-right: 5px;
vertical-align: middle;
}
.oppia-info-card-bottom-row ul li a img {
height: 20px;
Expand Down Expand Up @@ -3038,6 +3126,7 @@ md-card.preview-conversation-skin-supplemental-card {

.oppia-activity-summary-tile {
background-color: #fff;
box-shadow: 0 2px 5px 0 rgba(0,0,0,0.26);
cursor: pointer;
display: inline-block;
height: inherit;
Expand Down Expand Up @@ -3360,8 +3449,8 @@ md-card.preview-conversation-skin-supplemental-card {

.oppia-activity-summary-tile .metrics,
.oppia-activity-summary-tile-mobile .metrics {
height: 30px;
margin: 5px 12px 0;
min-height: 30px;
padding: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion core/templates/dev/head/pages/about-page/about-page.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ <h1 translate="I18N_ABOUT_PAGE_HEADING"></h1>
<div>
<div class="oppia-static-content-below-banner">
<div class="oppia-page-card oppia-static-content">
<div class="about-nav md-tab">
<div class="about-nav">
<ul class="oppia-about-tabs">
<li class="oppia-about-tabs-active">
<a ng-click="$ctrl.onTabClick($ctrl.TAB_ID_ABOUT)" href="" class="oppia-about-tabs-text" id="about" translate="I18N_ABOUT_PAGE_TABS_ABOUT"></a>
Expand Down
13 changes: 11 additions & 2 deletions core/templates/dev/head/pages/admin-page/misc-tab/admin-misc-tab.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ <h3>Topic Similarities</h3>
</div>
</md-card>

<md-card class="oppia-page-card oppia-long-text" style="max-width: 700px">
<md-card class="oppia-admin-page-card oppia-page-card oppia-long-text" style="">
<h3>Search Index</h3>
<button ng-click="$ctrl.clearSearchIndex()">Clear Search Index</button>
</md-card>

<md-card class="oppia-page-card oppia-long-text" style="max-width: 700px">
<md-card class="oppia-admin-page-card oppia-page-card oppia-long-text">
<h3>Extract Data</h3>
<div class="oppia-query-form">
<form class="form" ng-submit="$ctrl.submitQuery()">
Expand All @@ -34,3 +34,12 @@ <h3>Extract Data</h3>
<p ng-if="$ctrl.showDataExtractionQueryStatus">Status: <[$ctrl.dataExtractionQueryStatusMessage]></p>
</div>
</md-card>

<style>
.oppia-admin-page-card {
max-width: 700px
}
.oppia-admin-page-card button {
max-width: 30%;
}
</style>
13 changes: 7 additions & 6 deletions core/templates/dev/head/pages/creator-dashboard-page/creator-dashboard-page.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ <h2 class="oppia-dashboard-title" translate="I18N_DASHBOARD_CREATOR_DASHBOARD"><
ng-change="$ctrl.setExplorationsSortingOptions($ctrl.currentSortType)"
ng-options="$ctrl.EXPLORATIONS_SORT_BY_KEYS[key] as value | translate for (key, value) in $ctrl.HUMAN_READABLE_EXPLORATIONS_SORT_BY_KEYS">
</select>
<span class="sort-order fa"
<span class="sort-order fas"
ng-click="$ctrl.setExplorationsSortingOptions($ctrl.currentSortType)"
ng-class="$ctrl.isCurrentSortDescending ? 'fa-long-arrow-up': 'fa-long-arrow-down'">
ng-class="$ctrl.isCurrentSortDescending ? 'fa-long-arrow-alt-up': 'fa-long-arrow-alt-down'">
</span>
</span>
</div>
Expand All @@ -163,7 +163,7 @@ <h2 class="oppia-dashboard-title" translate="I18N_DASHBOARD_CREATOR_DASHBOARD"><
<p ng-if="key === 'NUM_VIEWS'" translate="I18N_DASHBOARD_TABLE_HEADING_PLAYS"></p>
<p ng-if="key === 'OPEN_FEEDBACK'" translate="I18N_DASHBOARD_TABLE_HEADING_OPEN_THREADS"></p>
<p ng-if="key === 'LAST_UPDATED'" translate="I18N_DASHBOARD_TABLE_HEADING_LAST_UPDATED"></p>
<span class="fa"
<span class="fas"
ng-if="$ctrl.currentSortType === value"
ng-class="$ctrl.isCurrentSortDescending ? 'fa-caret-up': 'fa-caret-down'">
</span>
Expand Down Expand Up @@ -277,7 +277,7 @@ <h2 class="activity-title protractor-test-exp-summary-tile-title">
</li>

<li flex="50">
<span class="fa fa-clock-o oppia-dashboard-card-statistic-icon"
<span class="far fa-clock oppia-dashboard-card-statistic-icon"
uib-tooltip="<['I18N_LIBRARY_LAST_UPDATED' | translate]>"
tooltip-placement="top">
</span>
Expand Down Expand Up @@ -326,9 +326,9 @@ <h2 class="activity-title protractor-test-exp-summary-tile-title">
ng-options="$ctrl.SUBSCRIPTION_SORT_BY_KEYS[key] as value for (key, value) in $ctrl.HUMAN_READABLE_SUBSCRIPTION_SORT_BY_KEYS"
style="width: 160px;">
</select>
<span class="sort-order fa"
<span class="sort-order fas"
ng-click="$ctrl.setSubscriptionSortingOptions($ctrl.currentSubscribersSortType)"
ng-class="$ctrl.isCurrentSubscriptionSortDescending ? 'fa-long-arrow-up': 'fa-long-arrow-down'">
ng-class="$ctrl.isCurrentSubscriptionSortDescending ? 'fa-long-arrow-alt-up': 'fa-long-arrow-alt-down'">
</span>
</span>
</div>
Expand Down Expand Up @@ -641,6 +641,7 @@ <h2>Suggestions to review</h2>

.oppia-dashboard-intro-card p {
margin-bottom: 12px;
line-height: 1.84em;
}

.oppia-dashboard-table .oppia-dashboard-table-headings p {
Expand Down
14 changes: 12 additions & 2 deletions ...exploration-editor-page/feedback-tab/templates/create-feedback-thread-modal.template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,21 @@ <h3>Start New Feedback Thread</h3>
</div>

<div class="modal-body">
<p>Thread subject: <input type="text" ng-model="newThreadSubject"></p>
<p>Message text <textarea ng-model="newThreadText" rows="6"></textarea></p>
<p>Thread subject: <input class="oppia-feedback-modal-input" type="text" ng-model="newThreadSubject"></p>
<p>Message text <textarea class="oppia-feedback-modal-textarea" ng-model="newThreadText" rows="6"></textarea></p>
</div>

<div class="modal-footer">
<button class="btn btn-success" ng-click="create(newThreadSubject, newThreadText)" ng-disabled="!newThreadSubject || !newThreadText">Create Thread</button>
<button class="btn btn-default" ng-click="cancel()">Cancel</button>
</div>

<style>
.oppia-feedback-modal-input {
min-height: 35px;
}
.oppia-feedback-modal-textarea {
margin-top: 5px;
min-height: 175px;
}
</style>
1 change: 1 addition & 0 deletions ...s/dev/head/pages/exploration-editor-page/modal-templates/post-publish-modal.template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

.oppia-share-publish-body .oppia-share-publish-link{
display: inline-grid;
width: 100%;
}

.oppia-share-publish-body .oppia-share-publish-link div {
Expand Down
2 changes: 1 addition & 1 deletion ...xploration-editor-page/translation-tab/state-translation/state-translation.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<strong><[stateName]></strong>
</div>
<div class="oppia-page-card oppia-state-translation-page">
<div class="translation-nav md-tab">
<div class="translation-nav">
<ul id="tutorialTranslationState" class="oppia-translation-tabs">
<li ng-class="{'oppia-active-translation-tab': isActive(TAB_ID_CONTENT)}" class="protractor-test-accessibility-translation-content" aria-label="Content of the card" role="button">
<a ng-click="onTabClick(TAB_ID_CONTENT)" href="" ng-style="tabStatusColorStyle(TAB_ID_CONTENT)" class="oppia-translation-tabs-text protractor-test-translation-content-tab">
Expand Down
2 changes: 1 addition & 1 deletion ...mplates/dev/head/pages/exploration-player-page/layout-directives/audio-bar.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@

.audio-controls-button-icon {
color: white;
font-size: 1.5em;
font-size: 1.4em;
min-width: 6%;
text-align: right;
vertical-align: middle;
Expand Down
5 changes: 3 additions & 2 deletions ...ev/head/pages/exploration-player-page/layout-directives/exploration-footer.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
box-shadow: 0 -6px 12px rgba(0, 0, 0, 0.176);
float: left;
list-style-type: none;
margin:0 0 16px 0;
margin:0 0 8px 0;
}

.oppia-exploration-footer .author-profile-dropdown-menu li {
Expand All @@ -75,7 +75,8 @@

.oppia-exploration-footer .author-profile-text {
cursor: default;
line-height: 0.6;
font-size: 13px;
line-height: 1.5;
padding-left: 6px;
text-overflow: clip;
white-space: nowrap;
Expand Down
5 changes: 5 additions & 0 deletions ...ates/dev/head/pages/exploration-player-page/layout-directives/progress-nav.directive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
/*
This affects the progress nav bar.
*/
.md-button.md-default-theme.md-raised,
.md-button.md-default-theme.md-fab {
background-color: rgba(158,158,158,0.185);
}

progress-nav .progress-nav-bar {
background-color: white;
margin-left: 87px;
Expand Down
Loading

0 comments on commit 1872491

Please sign in to comment.