Skip to content

Commit 9c24f96

Browse files
committed
Upgrade to 3.3.8
1 parent 56a1e50 commit 9c24f96

File tree

23 files changed

+169
-79
lines changed

23 files changed

+169
-79
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/complete/build
55
.DS_Store
66
/complete/.idea
7+
out/

complete/build.gradle

+14-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66
dependencies {
77
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
8-
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.14.2"
8+
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:$assetPipelineVersion"
99
classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
1010
}
1111
}
@@ -63,21 +63,23 @@ dependencies {
6363
runtime "org.glassfish.web:el-impl:2.1.2-b03"
6464
runtime "com.h2database:h2"
6565
runtime "org.apache.tomcat:tomcat-jdbc"
66-
runtime "com.bertramlabs.plugins:asset-pipeline-grails:2.14.2"
66+
runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
6767
testCompile "org.grails:grails-gorm-testing-support"
68-
testCompile "org.grails.plugins:geb"
68+
testCompile "org.grails.plugins:geb:1.1.2"
6969
testCompile "org.grails:grails-web-testing-support"
7070
// tag::dependencyRestClient[]
7171
testCompile "org.grails:grails-datastore-rest-client"
7272
// end::dependencyRestClient[]
7373
testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
7474
testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
75-
75+
testRuntime "org.seleniumhq.selenium:selenium-chrome-driver:2.47.1"
7676
}
7777

7878
bootRun {
7979
jvmArgs('-Dspring.output.ansi.enabled=always')
8080
addResources = true
81+
String springProfilesActive = 'spring.profiles.active'
82+
systemProperty springProfilesActive, System.getProperty(springProfilesActive)
8183
}
8284

8385
assets {
@@ -89,4 +91,12 @@ codenarc {
8991
toolVersion = '0.27.0'
9092
configFile = file("${project.projectDir}/config/codenarc/rules.groovy")
9193
reportFormat = 'html'
94+
}
95+
96+
97+
tasks.withType(Test) {
98+
systemProperty "geb.env", System.getProperty('geb.env')
99+
systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")
100+
systemProperty "webdriver.chrome.driver", System.getProperty('webdriver.chrome.driver')
101+
systemProperty "webdriver.gecko.driver", System.getProperty('webdriver.gecko.driver')
92102
}

complete/gradle.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
grailsVersion=3.3.0
2-
gormVersion=6.1.6.RELEASE
1+
grailsVersion=3.3.8
2+
gormVersion=6.1.10.RELEASE
33
gradleWrapperVersion=3.5
4+
assetPipelineVersion=2.14.8
Loading

complete/grails-app/assets/stylesheets/bootstrap.css

+9-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

complete/grails-app/assets/stylesheets/grails.css

+9-9
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pre {
4444

4545
}
4646
.navbar-default, .navbar-static-top {
47-
background-color: #4D8618;
47+
background-color: #424649;
4848
border: 0px;
4949
}
5050
a.navbar-brand {
@@ -59,7 +59,7 @@ a.navbar-brand {
5959
color: white !important;
6060
}
6161
.navbar-nav>li>a:hover {
62-
background-color: #db4800 !important;
62+
background-color: #2559a7 !important;
6363
color: white !important;
6464
}
6565
.navbar-nav>li>a {
@@ -69,7 +69,7 @@ a.navbar-brand {
6969
background-color: white;
7070
}
7171
.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus {
72-
background-color: #db4800;
72+
background-color: #2559a7;
7373
}
7474

7575
@media (min-width: 768px) {
@@ -113,7 +113,7 @@ a.navbar-brand {
113113

114114
#band {
115115
/*grey =#808080*/
116-
background: #79B94C no-repeat 50% 30%;
116+
background: #2559a7 no-repeat 50% 30%;
117117
height: 400px;
118118
}
119119

@@ -382,12 +382,12 @@ body, html {
382382
}
383383

384384
a {
385-
color: #db4800;
385+
color: #2559a7;
386386
text-decoration: underline;
387387
}
388388

389389
a:hover {
390-
color: #db4800;
390+
color: #2559a7;
391391
text-decoration: none
392392
}
393393

@@ -414,13 +414,13 @@ h4 {
414414
h5 {
415415
font-size: 1.125em;
416416
font-weight: bold;
417-
color: #db4800;
417+
color: #2559a7;
418418
}
419419

420420
h6 {
421421
font-size: 1.08em;
422422
font-weight: normal;
423-
color: #db4800;
423+
color: #2559a7;
424424
}
425425

426426
h7 {
@@ -900,7 +900,7 @@ html, body, .st-container, .st-pusher, .st-content {
900900
visibility: hidden;
901901
width: 300px;
902902
height: 100%;
903-
background: #79B94C;
903+
background: #2559a7;
904904
-webkit-transition: all .5s;
905905
transition: all .5s;
906906
right: -600px

complete/grails-app/assets/stylesheets/main.css

+10-10
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ html * {
3333
}
3434

3535
body {
36-
background: #ffffff;
36+
background-color: #F5F5F5;
3737
color: #333333;
3838
overflow-x: hidden; /* prevents box-shadow causing a horizontal scrollbar in firefox when viewport < 960px wide */
39-
-moz-box-shadow: 0 0 0.3em #4D8618;
40-
-webkit-box-shadow: 0 0 0.3em #4D8618;
41-
box-shadow: 0 0 0.3em #4D8618;
39+
-moz-box-shadow: 0 0 0.3em #424649;
40+
-webkit-box-shadow: 0 0 0.3em #424649;
41+
box-shadow: 0 0 0.3em #424649;
4242
}
4343

4444
#grailsLogo {
45-
background-color: #abbf78;
45+
background-color: #feb672;
4646
}
4747

4848
a:hover, a:active {
@@ -84,8 +84,8 @@ img {
8484
}
8585

8686
.footer {
87-
background: #48802c;
88-
color: #000;
87+
background: #424649;
88+
color: #ffffff;
8989
clear: both;
9090
font-size: 0.8em;
9191
margin-top: 1.5em;
@@ -94,7 +94,7 @@ img {
9494
}
9595

9696
.footer a {
97-
color: #4D8618;
97+
color: #feb672;
9898
}
9999

100100
.spinner {
@@ -174,7 +174,7 @@ img {
174174
}
175175

176176
.nav li.dropdown.open ul.dropdown-menu {
177-
background-color: #4D8618;
177+
background-color: #f5f5f5;
178178
}
179179

180180
/* CREATE/EDIT FORMS AND SHOW PAGES */
@@ -561,7 +561,7 @@ a.skip {
561561
}
562562

563563
.grails-logo-container {
564-
background:#79b94c no-repeat 50% 30%;
564+
background: #7c7c7c no-repeat 50% 30%;
565565
margin-bottom: 20px;
566566
color: white;
567567
height:300px;

complete/grails-app/conf/application.yml

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ grails:
33
profile: web
44
codegen:
55
defaultPackage: grails.test.security
6-
spring:
7-
transactionManagement:
8-
proxies: false
96
gorm:
107
reactor:
118
# Whether to translate GORM events into Reactor events

complete/grails-app/views/index.gsp

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<head>
44
<meta name="layout" content="main"/>
55
<title>Welcome to Grails</title>
6-
7-
<asset:link rel="icon" href="favicon.ico" type="image/x-ico" />
86
</head>
97
<body>
108
<content tag="nav">

complete/grails-app/views/layouts/main.gsp

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<g:layoutTitle default="Grails"/>
88
</title>
99
<meta name="viewport" content="width=device-width, initial-scale=1"/>
10+
<asset:link rel="icon" href="favicon.ico" type="image/x-ico" />
1011

1112
<asset:stylesheet src="application.css"/>
1213

@@ -24,9 +25,7 @@
2425
<span class="icon-bar"></span>
2526
</button>
2627
<a class="navbar-brand" href="/#">
27-
<i class="fa grails-icon">
28-
<asset:image src="grails-cupsonly-logo-white.svg"/>
29-
</i> Grails
28+
<asset:image src="grails.svg" alt="Grails Logo"/>
3029
</a>
3130
</div>
3231
<div class="navbar-collapse collapse" aria-expanded="false" style="height: 0.8px;">

0 commit comments

Comments
 (0)