Skip to content

upgrade to new css helpers #3

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

Merged
marioserrano09 merged 2 commits into from
Jan 28, 2025
Merged

upgrade to new css helpers #3

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
42a7f8f
upgrade maven-gpg-plugin
marioserrano09 Jan 28, 2025
5e5f5ee
upgrade to dynamia tools 5.3.2 css helpers
marioserrano09 Jan 28, 2025
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
2 changes: 1 addition & 1 deletion sources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>3.2.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
6 changes: 3 additions & 3 deletions sources/src/main/java/tools/dynamia/modules/dashboard/DashboardViewRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private void renderFields(Dashboard dashboard, ViewDescriptor descriptor, List<D
String colxs = "";
if (field.getParams().containsKey(Viewers.PARAM_SPAN + "-xs")) {
int spanxs = (int) field.getParams().get(Viewers.PARAM_SPAN + "-xs");
colxs = " col-" + toBootstrapColumns(spanxs);
colxs = " dt-col-" + toBootstrapColumns(spanxs);
}

int tabletColSpan = 6;
Expand All @@ -118,7 +118,7 @@ private void renderFields(Dashboard dashboard, ViewDescriptor descriptor, List<D
} catch (Exception e) {
}

window.setSclass("col-md-" + realSpan + " col-sm-" + tabletColSpan + colxs);
window.setSclass("dt-col-md-" + realSpan + " dt-col-sm-" + tabletColSpan + colxs);
spaceLeft = spaceLeft - realSpan;
window.setParent(row);
if (spaceLeft <= 0) {
Expand All @@ -132,7 +132,7 @@ private void renderFields(Dashboard dashboard, ViewDescriptor descriptor, List<D

public Div newRow(Dashboard dashboard) {
Div row = new Div();
row.setZclass("row");
row.setZclass("dt-row");
row.setParent(dashboard);
return row;
}
Expand Down
2 changes: 1 addition & 1 deletion sources/src/main/resources/metainfo/zk/lang-addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</version>


<stylesheet href="/static/dynamia-tools/css/dashboard-2.1.0.css" type="text/css"/>
<stylesheet href="/static/dynamia-tools/css/dashboard-2.2.0.css" type="text/css"/>


</language-addon>
9 changes: 6 additions & 3 deletions ...tic/dynamia-tools/css/dashboard-2.1.0.css → ...tic/dynamia-tools/css/dashboard-2.2.0.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
Author : mario
*/
.dashboard {
padding-left: 10px;
padding-right: 10px;
padding-left: 4px;
padding-right: 4px;
}

.dashboard .dashboard-widget {
padding: 4px;
padding-left: 4px !important;
padding-right: 4px !important;
padding-top: 4px !important;
padding-bottom: 4px !important;
}

.dashboard .dashboard-widget .z-window {
Expand Down
Loading