Skip to content

Commit c1ef879

Browse files
Merge pull request #6 from dynamiatools/5.2x
5.2x
2 parents 6005b24 + fc065a6 commit c1ef879

7 files changed

Lines changed: 424 additions & 25 deletions

File tree

sources/pom.xml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>tools.dynamia.themes</groupId>
2525
<artifactId>tools.dynamia.themes.dynamical</artifactId>
26-
<version>5.1.3</version>
26+
<version>5.2.0</version>
2727
<name>Themes - ZK Dynamical</name>
2828
<url>https://www.dynamia.tools/themes/dynamical</url>
2929
<description>Boostrap theme for DynamiaTools apps</description>
@@ -56,7 +56,7 @@
5656
</scm>
5757

5858
<properties>
59-
<dynamiatools.version>5.1.3</dynamiatools.version>
59+
<dynamiatools.version>5.2.0</dynamiatools.version>
6060
<java.version>17</java.version>
6161
<maven.compiler>3.13.0</maven.compiler>
6262
<source.encoding>UTF-8</source.encoding>
@@ -88,6 +88,24 @@
8888
<autoReleaseAfterClose>true</autoReleaseAfterClose>
8989
</configuration>
9090
</plugin>
91+
<plugin>
92+
<groupId>net.alchim31.maven</groupId>
93+
<artifactId>yuicompressor-maven-plugin</artifactId>
94+
<version>1.5.1</version>
95+
<executions>
96+
<execution>
97+
<goals>
98+
<goal>compress</goal>
99+
</goals>
100+
</execution>
101+
</executions>
102+
<configuration>
103+
<nosuffix>true</nosuffix>
104+
<includes>
105+
<include>**/static/**/*.css</include>
106+
</includes>
107+
</configuration>
108+
</plugin>
91109
</plugins>
92110
</build>
93111

sources/src/main/java/tools/dynamia/themes/dynamical/DynamicalTemplate.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public DynamicalTemplate(ViewTypeFactory viewTypeFactory) {
6060
createSkins();
6161

6262
properties = MapBuilder.put(AUTHOR, "Mario Serrano", DATE, "2017", COPYRIGHT, "Dynamia Soluciones IT 2017",
63-
VERSION, "5.1.3", ORIGINAL_AUTHOR, "Almsaeed Studio");
63+
VERSION, "5.2.0", ORIGINAL_AUTHOR, "Almsaeed Studio");
6464

6565
}
6666

@@ -108,6 +108,7 @@ private void createSkins() {
108108
applicationTemplateSkins.add(newSkin("DarkOrange", null, "#ff5722"));
109109
applicationTemplateSkins.add(newSkin("Olive", null, "#8FB442"));
110110
applicationTemplateSkins.add(newSkin("Dynamia", null, "#00709c"));
111+
applicationTemplateSkins.add(newSkin("Dark", null, "#282a36"));
111112
}
112113

113114
private static ApplicationTemplateSkin newSkin(String name, String description, String color) {

sources/src/main/resources/web/templates/dynamical/static/css/dynamical.css

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,11 @@ li.title-menu a span {
105105
border-color: gray;
106106
}
107107

108-
.crudview .table-view .z-listheader-content,
109-
.crudview .tree-view .z-treecol-content {
110-
color: #212529 !important;
111-
padding: 8px;
112-
}
108+
113109

114110
.crudview .table-view .z-listheader, .crudview .table-view .z-listbox-header, .crudview .tree-view .z-treecol, .crudview .tree-view .z-tree-header {
115-
background: #fbfbfb !important;
116-
border-left: 1px solid #f3f3f3 !important;
111+
background: #fbfbfb ;
112+
border-left: 1px solid #f3f3f3;
117113
border-bottom-color: #f3f3f3;
118114
}
119115

@@ -128,9 +124,7 @@ li.title-menu a span {
128124
border-left: 1px solid #f3f3f3 !important;
129125
}
130126

131-
.crudview .z-icon-caret-down, .crudview .z-icon-caret-up {
132-
color: black;
133-
}
127+
134128

135129
.table-view .z-listbox-body, .tree-view .z-tree-body {
136130
background: white;
@@ -243,8 +237,8 @@ li.title-menu a span {
243237
}
244238

245239
.z-listitem .z-listcell {
246-
border-left: none !important;
247-
border-bottom: 1px solid #F2F2F2 !important;
240+
border-left: none;
241+
border-bottom: 1px solid #F2F2F2;
248242
}
249243

250244
.z-label, .z-radio-content, .z-checkbox-content, .z-loading {

0 commit comments

Comments
 (0)