Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-115485 Format CSS #90587

Closed
wants to merge 2 commits into from
Closed

LPS-115485 Format CSS #90587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deeeb9f
LPS-115485 Format CSS
izaera Jun 24, 2020
b64e523
LPS-115485 Add test case with quoted value
izaera Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ...nd/css/variables/web/internal/servlet/taglib/ScopedCSSVariablesTopHeadDynamicInclude.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.liferay.osgi.service.tracker.collections.list.ServiceTrackerList;
import com.liferay.osgi.service.tracker.collections.list.ServiceTrackerListFactory;
import com.liferay.osgi.service.tracker.collections.map.PropertyServiceReferenceComparator;
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.servlet.taglib.BaseDynamicInclude;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;

Expand Down Expand Up @@ -105,21 +106,22 @@ private void _writeCSSVariables(
for (ScopedCSSVariables scopedCSSVariables :
scopedCSSVariablesCollection) {

printWriter.print(StringPool.TAB);
printWriter.print(scopedCSSVariables.getScope());
printWriter.print(" {\n");

Map<String, String> cssVariables =
scopedCSSVariables.getCSSVariables();

for (Map.Entry<String, String> entry : cssVariables.entrySet()) {
printWriter.print("--");
printWriter.print("\t\t--");
printWriter.print(entry.getKey());
printWriter.print(": ");
printWriter.print(entry.getValue());
printWriter.print(";\n");
}

printWriter.print("}\n");
printWriter.print("\t}\n");
}
}

Expand Down
2 changes: 2 additions & 0 deletions ...ss/variables/web/internal/servlet/taglib/ScopedCSSVariablesTopHeadDynamicIncludeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ public String getScope() {
public Map<String, String> getCSSVariables() {
return HashMapBuilder.put(
"color", "green"
).put(
"fixed-font", "\"Lucida Console\""
).put(
"font", "Comic Sans"
).build();
Expand Down
6 changes: 3 additions & 3 deletions ...m/liferay/frontend/css/variables/web/internal/servlet/taglib/liferay_css_variables_1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<style data-senna-track="temporary" type="text/css">
:root {
--color: red;
}
:root {
--color: red;
}
</style>
23 changes: 12 additions & 11 deletions ...m/liferay/frontend/css/variables/web/internal/servlet/taglib/liferay_css_variables_2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<style data-senna-track="temporary" type="text/css">
:root {
--color: red;
}
body {
--color: green;
--font: Comic Sans;
}
:root {
--color: yellow;
--font: Arial;
}
:root {
--color: red;
}
body {
--color: green;
--fixed-font: "Lucida Console";
--font: Comic Sans;
}
:root {
--color: yellow;
--font: Arial;
}
</style>