Fix oppia#3558: Browser specific alignment (oppia#3768)

* Add docstrings to core.domain.user_jobs_continuous.py * Correct browser specific alignment of social icons. * Correct linting error. * Correct linting error. * Remove extra line. * Make time users locale instead of specific locale * Address review comment
sargamm · Aug 20, 2017 · a1be59f · a1be59f
1 parent 8d2451b
commit a1be59f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/core/templates/dev/head/app.js b/core/templates/dev/head/app.js
@@ -474,8 +474,11 @@ oppia.factory('oppiaDatetimeFormatter', ['$filter', function($filter) {
     getLocaleAbbreviatedDatetimeString: function(millisSinceEpoch) {
       var date = new Date(millisSinceEpoch);
       if (date.toLocaleDateString() === new Date().toLocaleDateString()) {
-        // The replace function removes 'seconds' from the time returned.
-        return date.toLocaleTimeString().replace(/:\d\d /, ' ');
+        return date.toLocaleTimeString([], {
+          hour: 'numeric',
+          minute: 'numeric',
+          hour12: true
+        });
       } else if (date.getFullYear() === new Date().getFullYear()) {
         return $filter('date')(date, 'MMM d');
       } else {

diff --git a/core/templates/dev/head/css/oppia.css b/core/templates/dev/head/css/oppia.css
@@ -4348,7 +4348,7 @@ md-card.preview-conversation-skin-supplemental-card {
 
 .oppia-dashboard-card-view-item .oppia-sharing-links {
   margin-top: 3px;
-  padding-left: 12px;
+  padding-left: 0;
 }
 
 .oppia-dashboard-card-view-item .oppia-sharing-links .share-option-img,

diff --git a/core/templates/dev/head/pages/creator_dashboard/creator_dashboard.html b/core/templates/dev/head/pages/creator_dashboard/creator_dashboard.html
@@ -283,17 +283,19 @@ <h2 class="activity-title protractor-test-exp-summary-tile-title">
                   <[getLocaleAbbreviatedDatetimeString(exploration.last_updated_msec)]>
                 </span>
               </li>
-              <sharing-links ng-if="exploration.status !== 'private'"
-                             ng-click="$event.stopPropagation()"
-                             style="position: relative; right: 1px; bottom: 2px;"
-                             flex="100"
-                             class="dashboard-hide-mobile"
-                             layout-type="row"
-                             layout-align-type="center left"
-                             twitter-text="DEFAULT_TWITTER_SHARE_MESSAGE_DASHBOARD"
-                             share-type="exploration"
-                             exploration-id="exploration.id">
-              </sharing-links>
+              <li>
+                <sharing-links ng-if="exploration.status !== 'private'"
+                               ng-click="$event.stopPropagation()"
+                               style="position: relative; right: 1px; bottom: 2px;"
+                               flex="100"
+                               class="dashboard-hide-mobile"
+                               layout-type="row"
+                               layout-align-type="center left"
+                               twitter-text="DEFAULT_TWITTER_SHARE_MESSAGE_DASHBOARD"
+                               share-type="exploration"
+                               exploration-id="exploration.id">
+                </sharing-links>
+              </li>
             </ul>
           </div>
         </md-card>