Merge pull request #2080 from wilzbach/remove_c_a

dlang-bot · web-flow · commit 5c466b729af1 · 2018-01-14T21:16:00.000+01:00
Drop the $(C_A) Ddoc workaround
merged-on-behalf-of: Petar Kirov &lt;ZombineDev@users.noreply.github.com&gt;
diff --git a/areas-of-d-usage.dd b/areas-of-d-usage.dd
@@ -254,25 +254,24 @@ Macros:
     AREA_SECTION3=$(TC h3, area-section3, $1) $(AREA_SECTION_INLINE $+)
     COLON=:
     _= Single word inline CSS needs to be escaped _=
-    C_A=$1:$2;
     EXTRA_HEADERS=$(T style,
         .start-icons {
             text-align: center;
             padding-bottom: 30px;
             padding-top: 20px;
         }
         .start-icons-el > div {
-            $(C_A hyphens, none)
-            $(C_A margin, 0 -1em)
+            hyphens: none;
+            margin: 0 -1em;
             text-align: center;
         }
         .start-icons-el {
             vertical-align: top;
-            $(C_A display, inline-block)
+            display: inline-block;
             padding-right: 5%;
             padding-bottom: 20px;
             font-size: 1.2em;
-            $(C_A width, 100px)
+            width: 100px;
         }
         .start-icons i {
             font-size: 80px;
@@ -282,7 +281,7 @@ Macros:
             padding-top: 1.0em;
         }
         h2 a$(COLON)hover$(COLON)$(COLON)after {
-            $(C_A content, '' !important)
+            content: '' !important;
         }
         @media only screen and (min-width: 50em)
         {
@@ -291,27 +290,27 @@ Macros:
             }
         }
         .fa.article-icon, .fa.section-icon {
-            $(C_A float, left)
+            float: left;
             padding-right: 15px;
             font-size: 80px;
-            $(C_A width, 100px)
+            width: 100px;
             text-align: center;
             padding-bottom: 15px;
         }
         @media only screen and (max-width: 50em)
         {
             .fa.article-icon, .fa-section-icon {
                 font-size: 60px;
-                $(C_A width, 80px)
+                width: 80px;
             }
             #dman {
-                $(C_A height, 200px)
+                height: 200px;
             }
         }
         @media only screen and (max-width: 30em) {
             .page-contents {
-                $(C_A width, 80%)
-                $(C_A margin, 0 auto)
+                width: 80%;
+                margin: 0 auto;
                 margin-bottom: 1em;
             }
         }
diff --git a/contributors.dd b/contributors.dd
@@ -28,16 +28,15 @@ Macros:
     TITLE=Contributors ($(NR_D_CONTRIBUTORS))
     GH_REPO=$(LINK2 https://github.com/dlang/$1, $(D $1))
     D_CONTRIBUTOR=$(LI $1)
-    C_A=$1:$2;
     EXTRA_HEADERS=$(T style,
     #all-d-contributors {
         -moz-column-gap: 20px;
         -webkit-column-gap: 20px;
-        $(C_A column-gap, 20px)
+        column-gap: 20px;
         -moz-column-width: 11.5em;
         -webkit-column-width: 11.5em;
-        $(C_A column-width, 11.5em)
-        $(C_A list-style-type, none)
+        column-width: 11.5em;
+        list-style-type: none;
     }
     )
     _=
diff --git a/download.dd b/download.dd
@@ -267,12 +267,11 @@ Macros:
         </div>
         )
     )
-    C_A=$1:$2;
     EXTRA_HEADERS=$(T style,
         .download_paragraph > span {
             visibility: hidden;
             margin-left: 0.4em;
-            $(C_A font-size, 125%)
+            font-size: 125%;
         }
         .download_paragraph:hover > span {
             visibility: visible;
diff --git a/index.dd b/index.dd
@@ -698,8 +698,6 @@ Macros:
     TOUR=$(DIVC item, $(SECTION4 $(TC i, fa fa-$1 big-icon)$2, $3))
     WHY_D_ICON=$(TC i, fa fa-$1 why-d-icon)
     _=
-    _= Single word inline CSS needs to be escaped _=
-    C_A=$1:$2;
     META_DESCRIPTION=D is a general-purpose programming language with static typing, systems-level access, and C-like syntax.
     EXTRA_HEADERS=$(T style,
         .why-d-icon {
diff --git a/orgs-using-d.dd b/orgs-using-d.dd
@@ -269,30 +269,28 @@ Macros:
     DORGIMG=<a class="orgs-using-d-img-wrapper vcontainer-box" href="$1"><img class="vcontainer-element" src="$(ROOT_DIR)images/orgs-using-d/$2" /></a>
     DORG=$(DIVC orgs-using-d-cell, $(DORGIMG $2, $3) <h3 class="dont-highlight-link">$(LINK2 $2, $1)</h3> $(P $(DIVC orgs-using-d-desc, $4 ) $(DIVC orgs-using-d-uses donthyphenate, $5)))
 
-    _= Single word inline CSS needs to be escaped _=
-    C_A=$1:$2;
     EXTRA_HEADERS=$(T style,
         #content, #content h1 {
             text-align: center;
         }
         .orgs-using-d-cell {
-            $(C_A width, 250px)
-            $(C_A display, inline-block)
+            width: 250px;
+            display: inline-block;
             vertical-align: top;
             margin-bottom: 0.5em;
             padding-left: 25px;
             padding-right: 25px;
             padding-bottom: 10px;
         }
         .orgs-using-d h3 {
-           $(C_A margin, 0.4em)
+           margin: 0.4em;
            margin-left: 0;
            margin-right: 0;
            text-align: center;
         }
         .orgs-using-d-img-wrapper {
-            $(C_A width, 250px)
-            $(C_A height, 100px)
+            width: 250px;
+            height: 100px;
             padding-bottom: 10px;
             text-align: center;
         }

Original file line number	Diff line number	Diff line change
`@@ -254,25 +254,24 @@ Macros:`
`254`	`254`	`AREA_SECTION3=$(TC h3, area-section3, $1) $(AREA_SECTION_INLINE $+)`
`255`	`255`	`COLON=:`
`256`	`256`	`_= Single word inline CSS needs to be escaped _=`
`257`		`- C_A=$1:$2;`
`258`	`257`	`EXTRA_HEADERS=$(T style,`
`259`	`258`	`.start-icons {`
`260`	`259`	`text-align: center;`
`261`	`260`	`padding-bottom: 30px;`
`262`	`261`	`padding-top: 20px;`
`263`	`262`	`}`
`264`	`263`	`.start-icons-el > div {`
`265`		`- $(C_A hyphens, none)`
`266`		`- $(C_A margin, 0 -1em)`
	`264`	`+ hyphens: none;`
	`265`	`+ margin: 0 -1em;`
`267`	`266`	`text-align: center;`
`268`	`267`	`}`
`269`	`268`	`.start-icons-el {`
`270`	`269`	`vertical-align: top;`
`271`		`- $(C_A display, inline-block)`
	`270`	`+ display: inline-block;`
`272`	`271`	`padding-right: 5%;`
`273`	`272`	`padding-bottom: 20px;`
`274`	`273`	`font-size: 1.2em;`
`275`		`- $(C_A width, 100px)`
	`274`	`+ width: 100px;`
`276`	`275`	`}`
`277`	`276`	`.start-icons i {`
`278`	`277`	`font-size: 80px;`
`@@ -282,7 +281,7 @@ Macros:`
`282`	`281`	`padding-top: 1.0em;`
`283`	`282`	`}`
`284`	`283`	`h2 a$(COLON)hover$(COLON)$(COLON)after {`
`285`		`- $(C_A content, '' !important)`
	`284`	`+ content: '' !important;`
`286`	`285`	`}`
`287`	`286`	`@media only screen and (min-width: 50em)`
`288`	`287`	`{`
`@@ -291,27 +290,27 @@ Macros:`
`291`	`290`	`}`
`292`	`291`	`}`
`293`	`292`	`.fa.article-icon, .fa.section-icon {`
`294`		`- $(C_A float, left)`
	`293`	`+ float: left;`
`295`	`294`	`padding-right: 15px;`
`296`	`295`	`font-size: 80px;`
`297`		`- $(C_A width, 100px)`
	`296`	`+ width: 100px;`
`298`	`297`	`text-align: center;`
`299`	`298`	`padding-bottom: 15px;`
`300`	`299`	`}`
`301`	`300`	`@media only screen and (max-width: 50em)`
`302`	`301`	`{`
`303`	`302`	`.fa.article-icon, .fa-section-icon {`
`304`	`303`	`font-size: 60px;`
`305`		`- $(C_A width, 80px)`
	`304`	`+ width: 80px;`
`306`	`305`	`}`
`307`	`306`	`#dman {`
`308`		`- $(C_A height, 200px)`
	`307`	`+ height: 200px;`
`309`	`308`	`}`
`310`	`309`	`}`
`311`	`310`	`@media only screen and (max-width: 30em) {`
`312`	`311`	`.page-contents {`
`313`		`- $(C_A width, 80%)`
`314`		`- $(C_A margin, 0 auto)`
	`312`	`+ width: 80%;`
	`313`	`+ margin: 0 auto;`
`315`	`314`	`margin-bottom: 1em;`
`316`	`315`	`}`
`317`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,12 +267,11 @@ Macros:`
`267`	`267`	`</div>`
`268`	`268`	`)`
`269`	`269`	`)`
`270`		`- C_A=$1:$2;`
`271`	`270`	`EXTRA_HEADERS=$(T style,`
`272`	`271`	`.download_paragraph > span {`
`273`	`272`	`visibility: hidden;`
`274`	`273`	`margin-left: 0.4em;`
`275`		`- $(C_A font-size, 125%)`
	`274`	`+ font-size: 125%;`
`276`	`275`	`}`
`277`	`276`	`.download_paragraph:hover > span {`
`278`	`277`	`visibility: visible;`