FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

getting rid of the guarnett header switch non-amp · devhttps/frontend@da1e5ba · GitHub

/ frontend Public
forked from guardian/frontend

Commit da1e5ba

Browse files
NataliaLKB
committed
getting rid of the guarnett header switch non-amp
1 parent cbf6e0c commit da1e5ba

52 files changed

Lines changed: 49 additions & 1748 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎applications/app/pages/ContentHtmlPage.scala‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@ import views.html.fragments.page.{devTakeShot, htmlTag}
1616
import views.html.{newspaperContent, quizAnswerContent}
1717
import html.HtmlPageHelpers.ContentCSSFile
1818
import conf.switches.Switches.WeAreHiring
19-
import views.html.stacked
2019

2120
object ContentHtmlPage extends HtmlPage[Page] {
2221

2322
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
24-
override def criticalCssLink: Html = stacked(
25-
criticalStyleLink(ContentCSSFile),
26-
criticalStyleLink(InlineNavigationCSSFile))
27-
override def criticalCssInline: Html = criticalStyleInline(
28-
Html(common.Assets.css.head(None)),
29-
Html(common.Assets.css.inlineNavigation))
23+
override def criticalCssLink: Html = criticalStyleLink(ContentCSSFile)
24+
override def criticalCssInline: Html = criticalStyleInline(Html(common.Assets.css.head(None)))
3025
override def linkCss: Html = stylesheetLink(s"stylesheets/$ContentCSSFile.css")
3126
override def oldIECriticalCss: Html = stylesheetLink(s"stylesheets/old-ie.head.$ContentCSSFile.css")
3227
override def oldIELinkCss: Html = stylesheetLink(s"stylesheets/old-ie.$ContentCSSFile.css")

‎applications/app/pages/CrosswordHtmlPage.scala‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,12 @@ import views.html.fragments.page.head.stylesheets.{criticalStyleInline, critical
1616
import views.html.fragments.page.head.{fixIEReferenceErrors, headTag, titleTag, weAreHiring}
1717
import views.html.fragments.page.{devTakeShot, htmlTag}
1818
import html.HtmlPageHelpers.ContentCSSFile
19-
import views.html.stacked
2019

2120
object CrosswordHtmlPage extends HtmlPage[CrosswordPage] {
2221

2322
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
24-
override def criticalCssLink: Html = stacked(
25-
criticalStyleLink(ContentCSSFile),
26-
criticalStyleLink(InlineNavigationCSSFile))
27-
override def criticalCssInline: Html = criticalStyleInline(
28-
Html(common.Assets.css.head(None)),
29-
Html(common.Assets.css.inlineNavigation))
23+
override def criticalCssLink: Html = criticalStyleLink(ContentCSSFile)
24+
override def criticalCssInline: Html = criticalStyleInline(Html(common.Assets.css.head(None)))
3025
override def linkCss: Html = stylesheetLink(s"stylesheets/$ContentCSSFile.css", true)
3126
override def oldIECriticalCss: Html = stylesheetLink(s"stylesheets/old-ie.head.$ContentCSSFile.css", true)
3227
override def oldIELinkCss: Html = stylesheetLink(s"stylesheets/old-ie.$ContentCSSFile.css", true)

‎applications/app/pages/GalleryHtmlPage.scala‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@ import views.html.fragments.page.head.stylesheets.{criticalStyleInline, critical
1414
import views.html.fragments.page.{devTakeShot, htmlTag}
1515
import views.html.fragments._
1616
import html.HtmlPageHelpers.ContentCSSFile
17-
import views.html.stacked
1817

1918
object GalleryHtmlPage extends HtmlPage[GalleryPage] {
2019

2120
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
22-
override def criticalCssLink: Html = stacked(
23-
criticalStyleLink(ContentCSSFile),
24-
criticalStyleLink(InlineNavigationCSSFile))
25-
override def criticalCssInline: Html = criticalStyleInline(
26-
Html(common.Assets.css.head(None)),
27-
Html(common.Assets.css.inlineNavigation))
21+
override def criticalCssLink: Html = criticalStyleLink(ContentCSSFile)
22+
override def criticalCssInline: Html = criticalStyleInline(Html(common.Assets.css.head(None)))
2823
override def linkCss: Html = stylesheetLink(s"stylesheets/$ContentCSSFile.css")
2924
override def oldIECriticalCss: Html = stylesheetLink(s"stylesheets/old-ie.head.$ContentCSSFile.css")
3025
override def oldIELinkCss: Html = stylesheetLink(s"stylesheets/old-ie.$ContentCSSFile.css")

‎applications/app/pages/IndexHtmlPage.scala‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,12 @@ import views.html.fragments.page.head.stylesheets.{criticalStyleInline, critical
1717
import views.html.fragments.page.head.{fixIEReferenceErrors, headTag, titleTag, weAreHiring}
1818
import views.html.fragments.page.{devTakeShot, htmlTag}
1919
import html.HtmlPageHelpers.ContentCSSFile
20-
import views.html.stacked
2120

2221
object IndexHtml {
2322

2423
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
25-
override def criticalCssLink: Html = stacked(
26-
criticalStyleLink(FaciaCSSFile),
27-
criticalStyleLink(InlineNavigationCSSFile))
28-
override def criticalCssInline: Html = criticalStyleInline(
29-
Html(common.Assets.css.head(Some("facia"))),
30-
Html(common.Assets.css.inlineNavigation))
24+
override def criticalCssLink: Html = criticalStyleLink(FaciaCSSFile)
25+
override def criticalCssInline: Html = criticalStyleInline(Html(common.Assets.css.head(Some("facia"))))
3126
override def linkCss: Html = stylesheetLink(s"stylesheets/$FaciaCSSFile.css")
3227
override def oldIECriticalCss: Html = stylesheetLink(s"stylesheets/old-ie.head.$FaciaCSSFile.css")
3328
override def oldIELinkCss: Html = stylesheetLink(s"stylesheets/old-ie.$ContentCSSFile.css")

‎applications/app/pages/InteractiveHtmlPage.scala‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ object InteractiveHtmlPage extends HtmlPage[InteractivePage] {
2222
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
2323
override def criticalCssLink: Html = stacked(
2424
criticalStyleLink(ContentCSSFile),
25-
criticalStyleLink("interactive"),
26-
criticalStyleLink(InlineNavigationCSSFile)
25+
criticalStyleLink("interactive")
2726
)
2827
override def criticalCssInline: Html = criticalStyleInline(
2928
Html(common.Assets.css.head(None)),
30-
Html(common.Assets.css.interactive),
31-
Html(common.Assets.css.inlineNavigation)
29+
Html(common.Assets.css.interactive)
3230
)
3331
override def linkCss: Html = stylesheetLink(s"stylesheets/$ContentCSSFile.css")
3432
override def oldIECriticalCss: Html = stylesheetLink(s"stylesheets/old-ie.head.$ContentCSSFile.css")

‎applications/app/pages/NewsletterHtmlPage.scala‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,12 @@ import views.html.fragments.page.head.{fixIEReferenceErrors, headTag, titleTag,
1515
import views.html.fragments.page.{devTakeShot, htmlTag}
1616
import views.html.signup.newsletterContent
1717
import html.HtmlPageHelpers.ContentCSSFile
18-
import views.html.stacked
1918

2019
object NewsletterHtmlPage extends HtmlPage[SimplePage] {
2120

2221
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
23-
override def criticalCssLink: Html = stacked(
24-
criticalStyleLink(ContentCSSFile),
25-
criticalStyleLink(InlineNavigationCSSFile))
26-
override def criticalCssInline: Html = criticalStyleInline(
27-
Html(common.Assets.css.head(Some("signup"))),
28-
Html(common.Assets.css.inlineNavigation))
22+
override def criticalCssLink: Html = criticalStyleLink(ContentCSSFile)
23+
override def criticalCssInline: Html = criticalStyleInline(Html(common.Assets.css.head(Some("signup"))))
2924
override def linkCss: Html = stylesheetLink(s"stylesheets/$ContentCSSFile.css")
3025
override def oldIECriticalCss: Html = stylesheetLink(s"stylesheets/old-ie.head.$ContentCSSFile.css")
3126
override def oldIELinkCss: Html = stylesheetLink(s"stylesheets/old-ie.$ContentCSSFile.css")

‎applications/app/pages/TagIndexHtmlPage.scala‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,12 @@ import views.html.fragments.page.head.{fixIEReferenceErrors, headTag, titleTag,
1515
import views.html.fragments.page.{devTakeShot, htmlTag}
1616
import views.html.preferences.index
1717
import html.HtmlPageHelpers.ContentCSSFile
18-
import views.html.stacked
1918

2019
object TagIndexHtmlPage extends HtmlPage[StandalonePage] {
2120

2221
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
23-
override def criticalCssLink: Html = stacked(
24-
criticalStyleLink("index"),
25-
criticalStyleLink(InlineNavigationCSSFile))
26-
override def criticalCssInline: Html = criticalStyleInline(
27-
Html(common.Assets.css.head(Some("index"))),
28-
Html(common.Assets.css.inlineNavigation))
22+
override def criticalCssLink: Html = criticalStyleLink("index")
23+
override def criticalCssInline: Html = criticalStyleInline(Html(common.Assets.css.head(Some("index"))))
2924
override def linkCss: Html = stylesheetLink(s"stylesheets/$ContentCSSFile.css")
3025
override def oldIECriticalCss: Html = stylesheetLink("stylesheets/old-ie.head.index.css")
3126
override def oldIELinkCss: Html = stylesheetLink(s"stylesheets/old-ie.$ContentCSSFile.css")

‎article/app/pages/StoryHtmlPage.scala‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,12 @@ import views.html.fragments.page.body._
1414
import views.html.fragments.page.head.stylesheets.{criticalStyleInline, criticalStyleLink, styles}
1515
import views.html.fragments.page.head.{fixIEReferenceErrors, headTag, titleTag, weAreHiring}
1616
import html.HtmlPageHelpers.ContentCSSFile
17-
import views.html.stacked
1817

1918
object StoryHtmlPage {
2019

2120
def allStyles(implicit applicationContext: ApplicationContext, request: RequestHeader): Styles = new Styles {
22-
override def criticalCssLink: Html = stacked(
23-
criticalStyleLink(ContentCSSFile),
24-
criticalStyleLink(InlineNavigationCSSFile))
25-
override def criticalCssInline: Html = criticalStyleInline(
26-
Html(common.Assets.css.head(None)),
27-
Html(common.Assets.css.inlineNavigation))
21+
override def criticalCssLink: Html = criticalStyleLink(ContentCSSFile)
22+
override def criticalCssInline: Html = criticalStyleInline(Html(common.Assets.css.head(None)))
2823
override def linkCss: Html = stylesheetLink(s"stylesheets/$ContentCSSFile.css")
2924
override def oldIECriticalCss: Html = stylesheetLink(s"stylesheets/old-ie.head.$ContentCSSFile.css")
3025
override def oldIELinkCss: Html = stylesheetLink(s"stylesheets/old-ie.$ContentCSSFile.css")

‎common/app/assets/assets.scala‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import java.nio.charset.Charset
44

55
import common.{Logging, RelativePathEscaper}
66
import conf.Configuration
7-
import experiments.{ActiveExperiments, GarnettHeader}
87
import model.ApplicationContext
98
import org.apache.commons.io.IOUtils
109
import play.api.libs.json._
@@ -59,7 +58,6 @@ object css {
5958
private val memoizedCss: ConcurrentMap[String, Try[String]] = TrieMap()
6059

6160
def head(projectOverride: Option[String])(implicit context: ApplicationContext, request: RequestHeader): String = inline(cssHead(projectOverride.getOrElse(context.applicationIdentity.name)))
62-
def inlineNavigation(implicit request: RequestHeader, context: ApplicationContext): String = if (ActiveExperiments.isParticipating(GarnettHeader)) inline("head.navigation.garnett") else inline("head.navigation")
6361
def inlineIdentity(implicit request: RequestHeader, context: ApplicationContext): String = inline("head.identity")
6462
def inlineStoryPackage(implicit context: ApplicationContext): String = inline("story-package")
6563
def inlineStoryPackageGarnett(implicit context: ApplicationContext): String = inline("story-package-garnett")

‎common/app/experiments/Experiments.scala‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ object ActiveExperiments extends ExperimentsDefinition {
1313
CommercialClientLogging,
1414
CommercialPaidContentTemplate,
1515
CommercialBaseline,
16-
GarnettHeader,
1716
Garnett,
1817
HideShowMoreButtonExperiment,
1918
Prebid
@@ -61,17 +60,6 @@ object CommercialBaseline extends Experiment(
6160
participationGroup = Perc2B
6261
)
6362

64-
65-
object GarnettHeader extends Experiment(
66-
name = "garnett-header",
67-
description = "Users in this experiment will see the new desktop design, but with garnett styling",
68-
owners = Seq(Owner.withGithub("natalialkb"), Owner.withGithub("zeftilldeath")),
69-
sellByDate = new LocalDate(2018, 2, 1),
70-
participationGroup = Perc0A
71-
) {
72-
override def isParticipating[A](implicit request: RequestHeader, canCheck: CanCheckExperiment): Boolean = true
73-
}
74-
7563
object Garnett extends Experiment(
7664
name = "garnett",
7765
description = "Users in this experiment will see garnet styling.",

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL