From c148ffc1ce775e125e58f9daf9186949c67092ee Mon Sep 17 00:00:00 2001
From: Prateek Bhatnagar <prateek89born@gmail.com>
Date: Fri, 3 Nov 2017 01:15:26 +0530
Subject: [PATCH] fixing style merge conflicts (#11897)

---
 .../amp-story/0.1/amp-story-desktop.css       | 23 ++++++++++---------
 extensions/amp-story/0.1/amp-story.js         |  4 ++--
 extensions/amp-story/0.1/progress-bar.js      |  4 ++--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/extensions/amp-story/0.1/amp-story-desktop.css b/extensions/amp-story/0.1/amp-story-desktop.css
index 2fa27f34b574..b68f67bd2d11 100644
--- a/extensions/amp-story/0.1/amp-story-desktop.css
+++ b/extensions/amp-story/0.1/amp-story-desktop.css
@@ -16,7 +16,8 @@
 
 @import './amp-story-desktop-user-overridable.css';
 
-amp-story[desktop] {
+
+amp-story[standalone][desktop] {
  max-width: none!important;
  max-height: none!important;
  width: 100vw!important;
@@ -261,7 +262,7 @@ amp-story-page.i-amphtml-story-page-shown {
 }
 
 .i-amphtml-story-share:hover:before {
-  width: calc(100% - 16px)!important;
+  width: calc(100% + 16px)!important;
 }
 
 .i-amphtml-story-share .i-amphtml-story-share-list > li  {
@@ -320,8 +321,8 @@ amp-story-page.i-amphtml-story-page-shown {
 }
 
 [desktop] .i-amphtml-story-share .i-amphtml-story-share-list > li {
-  width: 56px;
-  height: 56px;
+  width: 56px!important;
+  height: 56px!important;
 }
 
 .i-amphtml-story-share .i-amphtml-story-share-list > li svg {
@@ -330,7 +331,7 @@ amp-story-page.i-amphtml-story-page-shown {
 }
 
 .i-amphtml-story-share:hover:before {
-  width: calc(100% + 16px);
+  width: calc(100% + 16px)!important;
 }
 
 .i-amphtml-story-share .i-amphtml-story-share-icon {
@@ -345,21 +346,21 @@ amp-story-page.i-amphtml-story-page-shown {
 }
 
 [desktop] .i-amphtml-story-share-icon {
-  font-size: 0px;
-  background-position-y: 5px;
+  font-size: 0px!important;
+  background-position-y: 5px!important;
 }
 
 [desktop] .i-amphtml-story-share-icon::before {
-  background-color: transparent;
+  background-color: transparent!important;
 }
 
 [desktop] .i-amphtml-story-share-icon:active::before {
-  background-color: transparent;
+  background-color: transparent!important;
 }
 
 [desktop] .i-amphtml-story-share-list {
-  margin-right: 100px;
-  margin-top: 15px;
+  margin-right: 100px!important;
+  margin-top: 15px!important;
 }
 
 .i-amphtml-story-share .i-amphtml-story-share-name {
diff --git a/extensions/amp-story/0.1/amp-story.js b/extensions/amp-story/0.1/amp-story.js
index a4ff1aa3a70d..7d90de113a41 100644
--- a/extensions/amp-story/0.1/amp-story.js
+++ b/extensions/amp-story/0.1/amp-story.js
@@ -53,7 +53,7 @@ import {debounce} from '../../../src/utils/rate-limit';
 import {isExperimentOn, toggleExperiment} from '../../../src/experiments';
 import {registerServiceBuilder} from '../../../src/service';
 import {AudioManager, upgradeBackgroundAudio} from './audio';
-import {setStyle, setStyles, setImportantStyles} from '../../../src/style';
+import {setStyle, setImportantStyles} from '../../../src/style';
 import {findIndex} from '../../../src/utils/array';
 import {ActionTrust} from '../../../src/action-trust';
 import {getMode} from '../../../src/mode';
@@ -883,7 +883,7 @@ export class AmpStory extends AMP.BaseElement {
       pagesByDistance.forEach((pageIds, distance) => {
         pageIds.forEach(pageId => {
           const page = this.getPageById_(pageId);
-          setStyles(page.element, {
+          setImportantStyles(page.element, {
             transform: `translateY(${100 * distance}%)`,
           });
         });
diff --git a/extensions/amp-story/0.1/progress-bar.js b/extensions/amp-story/0.1/progress-bar.js
index b20d2f4f01af..3637aec14e6a 100644
--- a/extensions/amp-story/0.1/progress-bar.js
+++ b/extensions/amp-story/0.1/progress-bar.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import {dev} from '../../../src/log';
-import {scale, setStyles} from '../../../src/style';
+import {scale, setImportantStyles} from '../../../src/style';
 import {scopedQuerySelector} from '../../../src/dom';
 import {Services} from '../../../src/services';
 
@@ -137,7 +137,7 @@ export class ProgressBar {
         `.i-amphtml-story-page-progress-bar:nth-child(${nthChildIndex}) ` +
         '.i-amphtml-story-page-progress-value');
     this.vsync_.mutate(() => {
-      setStyles(dev().assertElement(progressEl), {
+      setImportantStyles(dev().assertElement(progressEl), {
         'transform': scale(`${progress},1`),
       });
     });