Skip to content

Commit

Permalink
Merge e157414 into 87c2c5a
Browse files Browse the repository at this point in the history
  • Loading branch information
@taeymma
taeymma committed Jun 29, 2018
2 parents 87c2c5a + e157414 commit 3c83fb8
Show file tree
Hide file tree
Showing 25 changed files with 20,066 additions and 6,391 deletions.
1 change: 0 additions & 1 deletion pyoes/scaffolds/pyoes_admin_scaffold/+package+/static/admin/bower.json_tmpl
View file
@@ -1,6 +1,5 @@
{
"name": "{{package}}",
"version": "0.0.1",
"private": "true",
"dependencies": {
"foundation": "~5.5.0",
Expand Down
4 changes: 2 additions & 2 deletions ...pyoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-blokken.scss
View file
Expand Up @@ -10,7 +10,7 @@

.fl-block .field img {height:105px;overflow: hidden}
.fl-block .field.full {padding:0px 0 ;}
.fl-block .field.full > a {display:block;padding:1.6em 1.4em 1.6em 1.4em;color:#5e5e5e;}
.fl-block .field.full > a {display:block;padding:1.6em 1.4em 1.6em 1.4em;color:$link-color;}
.fl-block .field.full a:hover{display:block;background-color:$white-gray;-webkit-transition: all 1s ease-in-out;-moz-transition: all 1s ease-in-out;-o-transition: all 1s ease-in-out;transition: all 1s ease-in-out;text-decoration: none; }


Expand Down Expand Up @@ -82,7 +82,7 @@

.fl-block .block-title.naked { background-color:$white !important;color:$dark-purple !important;padding:0;}

.block-text h3 a { color:$dark-purple !important;margin:-8px 0 0 0;letter-spacing:-1px}
.block-text h3 a { color:$link-color !important;margin:-8px 0 0 0;letter-spacing:-1px}
.block-text h3 a:hover { text-decoration:underline !important }


Expand Down
4 changes: 2 additions & 2 deletions ...yoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-elements.scss
View file
Expand Up @@ -42,8 +42,8 @@ h4.header-img-panel {text-transform:uppercase;font-size:1em;padding:20px 0}
dt, b, strong {font-family: $font-family-bold-serif;font-weight:700;}
h4 > em {padding:5px 0 10px 0;display:block;font-size:1.3em;line-height:1.3em}
article > h1 {padding-bottom:18px;}
article a, .panel p a {color:$fresh-blue;text-decoration:underline}
article a:hover, .panel p a:hover {color:$fresh-blue;text-decoration:none}
article a, .panel p a {color:$link-color;text-decoration:underline}
article a:hover, .panel p a:hover {color:$link-color;text-decoration:none}

.panel article h3, .panel article h4, .panel article h5 {line-height:1.3em}
.body-bg-error { background:$body-error-bg; }
3 changes: 2 additions & 1 deletion .../pyoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-footer.scss
View file
Expand Up @@ -8,11 +8,12 @@ footer#footer-bottom {clear: both;overflow: hidden;background:$white;border-top:
footer#footer-bottom .inner nav ul{margin:1em 0;padding-left:1.4em}
footer#footer-bottom .inner nav > ul{float:$default-float;width:25%;}
footer#footer-bottom .inner nav ul li {list-style-type:none}
footer#footer-bottom .inner nav ul li a{display:block;line-height:1em;padding:0.4em 0;font-size:0.875em;}
footer#footer-bottom .inner nav ul li a{display:block;line-height:1em;padding:0.4em 0;font-size:0.875em;color:$link-color;}
footer#footer-bottom .inner nav ul li a:hover{color:$black;}
footer#footer-bottom .inner nav ul li a.active{color:$dark-purple;}
footer#footer-bottom .inner article img{margin:auto 0 auto auto;display:block;}
footer#footer-bottom .inner nav ul.lang-switch li{float:$default-float;margin-right:0.5em;font-size:0.875em;}
footer#footer-bottom .inner .mailtolink {background-color: $dark-purple; color: white; padding: 8px 16px;}

.iwgf2-site-info-header h2 {
color: $white !important;
Expand Down
2 changes: 1 addition & 1 deletion ...s/pyoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-lists.scss
View file
Expand Up @@ -103,7 +103,7 @@ ul.tag-label, ul.tag-label-col {margin:10px 0 0 0;}
ul.listdownload {list-style-type:none;float:right;padding:3px 0 0 0;font-size:0.8em}
.listdownload li {float:left !important;margin-left:20px}
ul.listdownload li i {color:gray;float:left !important;margin:0px 10px 0 0;font-size:1.5em }
ul.listdownload li a {color:$dark-purple !important;}
ul.listdownload li a {color:$link-color !important;}
ul.listdownload li a:hover {color:$black !important;}

//app footer
Expand Down
2 changes: 1 addition & 1 deletion ...yoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss
View file
Expand Up @@ -84,7 +84,7 @@ $ghost : #FAFAFA;
$aluminum : #efefef;
$white-gray : #fbfbfb; // hover color
$jumbo : #888888;

$link-color : #0075db;
// social

$soc-twitter : #2da5da;
Expand Down
1 change: 0 additions & 1 deletion pyoes/scaffolds/pyoes_proces_scaffold/proces/+package+/static/admin/bower.json_tmpl
View file
@@ -1,6 +1,5 @@
{
"name": "{{package}}",
"version": "0.0.1",
"private": "true",
"dependencies": {
"foundation": "~5.5.0",
Expand Down
4 changes: 2 additions & 2 deletions ...oces_scaffold/proces/+package+/static/admin/src/app/resources/scss/pyoes/_oe-blokken.scss
View file
Expand Up @@ -10,7 +10,7 @@

.fl-block .field img {height:105px;overflow: hidden}
.fl-block .field.full {padding:0px 0 ;}
.fl-block .field.full > a {display:block;padding:1.6em 1.4em 1.6em 1.4em;color:#5e5e5e;}
.fl-block .field.full > a {display:block;padding:1.6em 1.4em 1.6em 1.4em;color:$link-color;}
.fl-block .field.full a:hover{display:block;background-color:$white-gray;-webkit-transition: all 1s ease-in-out;-moz-transition: all 1s ease-in-out;-o-transition: all 1s ease-in-out;transition: all 1s ease-in-out;text-decoration: none; }


Expand Down Expand Up @@ -82,7 +82,7 @@

.fl-block .block-title.naked { background-color:$white !important;color:$dark-purple !important;padding:0;}

.block-text h3 a { color:$dark-purple !important;margin:-8px 0 0 0;letter-spacing:-1px}
.block-text h3 a { color:$link-color !important;margin:-8px 0 0 0;letter-spacing:-1px}
.block-text h3 a:hover { text-decoration:underline !important }


Expand Down
4 changes: 2 additions & 2 deletions ...ces_scaffold/proces/+package+/static/admin/src/app/resources/scss/pyoes/_oe-elements.scss
View file
Expand Up @@ -42,8 +42,8 @@ h4.header-img-panel {text-transform:uppercase;font-size:1em;padding:20px 0}
dt, b, strong {font-family: $font-family-bold-serif;font-weight:700;}
h4 > em {padding:5px 0 10px 0;display:block;font-size:1.3em;line-height:1.3em}
article > h1 {padding-bottom:18px;}
article a, .panel p a {color:$fresh-blue;text-decoration:underline}
article a:hover, .panel p a:hover {color:$fresh-blue;text-decoration:none}
article a, .panel p a {color:$link-color;text-decoration:underline}
article a:hover, .panel p a:hover {color:$link-color;text-decoration:none}

.panel article h3, .panel article h4, .panel article h5 {line-height:1.3em}
.body-bg-error { background:$body-error-bg; }
3 changes: 2 additions & 1 deletion ...roces_scaffold/proces/+package+/static/admin/src/app/resources/scss/pyoes/_oe-footer.scss
View file
Expand Up @@ -8,11 +8,12 @@ footer#footer-bottom {clear: both;overflow: hidden;background:$white;border-top:
footer#footer-bottom .inner nav ul{margin:1em 0;padding-left:1.4em}
footer#footer-bottom .inner nav > ul{float:$default-float;width:25%;}
footer#footer-bottom .inner nav ul li {list-style-type:none}
footer#footer-bottom .inner nav ul li a{display:block;line-height:1em;padding:0.4em 0;font-size:0.875em;}
footer#footer-bottom .inner nav ul li a{display:block;line-height:1em;padding:0.4em 0;font-size:0.875em;color:$link-color;}
footer#footer-bottom .inner nav ul li a:hover{color:$black;}
footer#footer-bottom .inner nav ul li a.active{color:$dark-purple;}
footer#footer-bottom .inner article img{margin:auto 0 auto auto;display:block;}
footer#footer-bottom .inner nav ul.lang-switch li{float:$default-float;margin-right:0.5em;font-size:0.875em;}
footer#footer-bottom .inner .mailtolink {background-color: $dark-purple; color: white; padding: 8px 16px;}

.iwgf2-site-info-header h2 {
color: $white !important;
Expand Down
2 changes: 1 addition & 1 deletion ...proces_scaffold/proces/+package+/static/admin/src/app/resources/scss/pyoes/_oe-lists.scss
View file
Expand Up @@ -103,7 +103,7 @@ ul.tag-label, ul.tag-label-col {margin:10px 0 0 0;}
ul.listdownload {list-style-type:none;float:right;padding:3px 0 0 0;font-size:0.8em}
.listdownload li {float:left !important;margin-left:20px}
ul.listdownload li i {color:gray;float:left !important;margin:0px 10px 0 0;font-size:1.5em }
ul.listdownload li a {color:$dark-purple !important;}
ul.listdownload li a {color:$link-color !important;}
ul.listdownload li a:hover {color:$black !important;}

//app footer
Expand Down
2 changes: 1 addition & 1 deletion ...ces_scaffold/proces/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss
View file
Expand Up @@ -84,7 +84,7 @@ $ghost : #FAFAFA;
$aluminum : #efefef;
$white-gray : #fbfbfb; // hover color
$jumbo : #888888;

$link-color : #0075db;
// social

$soc-twitter : #2da5da;
Expand Down
1 change: 0 additions & 1 deletion pyoes/scaffolds/pyoes_scaffold/+package+/static/bower.json_tmpl
View file
@@ -1,6 +1,5 @@
{
"name": "{{package}}",
"version": "0.0.1",
"private": "true",
"dependencies": {
"foundation": "~5.5.0",
Expand Down
4 changes: 2 additions & 2 deletions pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-blokken.scss
View file
Expand Up @@ -10,7 +10,7 @@

.fl-block .field img {height:105px;overflow: hidden}
.fl-block .field.full {padding:0px 0 ;}
.fl-block .field.full > a {display:block;padding:1.6em 1.4em 1.6em 1.4em;color:#5e5e5e;}
.fl-block .field.full > a {display:block;padding:1.6em 1.4em 1.6em 1.4em;color:$link-color;}
.fl-block .field.full a:hover{display:block;background-color:$white-gray;-webkit-transition: all 1s ease-in-out;-moz-transition: all 1s ease-in-out;-o-transition: all 1s ease-in-out;transition: all 1s ease-in-out;text-decoration: none; }


Expand Down Expand Up @@ -82,7 +82,7 @@

.fl-block .block-title.naked { background-color:$white !important;color:$dark-purple !important;padding:0;}

.block-text h3 a { color:$dark-purple !important;margin:-8px 0 0 0;letter-spacing:-1px}
.block-text h3 a { color:$link-color !important;margin:-8px 0 0 0;letter-spacing:-1px}
.block-text h3 a:hover { text-decoration:underline !important }


Expand Down
4 changes: 2 additions & 2 deletions pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-elements.scss
View file
Expand Up @@ -42,8 +42,8 @@ h4.header-img-panel {text-transform:uppercase;font-size:1em;padding:20px 0}
dt, b, strong {font-family: $font-family-bold-serif;font-weight:700;}
h4 > em {padding:5px 0 10px 0;display:block;font-size:1.3em;line-height:1.3em}
article > h1 {padding-bottom:18px;}
article a, .panel p a {color:$fresh-blue;text-decoration:underline}
article a:hover, .panel p a:hover {color:$fresh-blue;text-decoration:none}
article a, .panel p a {color:$link-color;text-decoration:underline}
article a:hover, .panel p a:hover {color:$link-color;text-decoration:none}

.panel article h3, .panel article h4, .panel article h5 {line-height:1.3em}
.body-bg-error { background:$body-error-bg; }
3 changes: 2 additions & 1 deletion pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-footer.scss
View file
Expand Up @@ -8,11 +8,12 @@ footer#footer-bottom {clear: both;overflow: hidden;background:$white;border-top:
footer#footer-bottom .inner nav ul{margin:1em 0;padding-left:1.4em}
footer#footer-bottom .inner nav > ul{float:$default-float;width:25%;}
footer#footer-bottom .inner nav ul li {list-style-type:none}
footer#footer-bottom .inner nav ul li a{display:block;line-height:1em;padding:0.4em 0;font-size:0.875em;}
footer#footer-bottom .inner nav ul li a{display:block;line-height:1em;padding:0.4em 0;font-size:0.875em;color:$link-color;}
footer#footer-bottom .inner nav ul li a:hover{color:$black;}
footer#footer-bottom .inner nav ul li a.active{color:$dark-purple;}
footer#footer-bottom .inner article img{margin:auto 0 auto auto;display:block;}
footer#footer-bottom .inner nav ul.lang-switch li{float:$default-float;margin-right:0.5em;font-size:0.875em;}
footer#footer-bottom .inner .mailtolink {background-color: $dark-purple; color: white; padding: 8px 16px;}

.iwgf2-site-info-header h2 {
color: $white !important;
Expand Down
2 changes: 1 addition & 1 deletion pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-lists.scss
View file
Expand Up @@ -103,7 +103,7 @@ ul.tag-label, ul.tag-label-col {margin:10px 0 0 0;}
ul.listdownload {list-style-type:none;float:right;padding:3px 0 0 0;font-size:0.8em}
.listdownload li {float:left !important;margin-left:20px}
ul.listdownload li i {color:gray;float:left !important;margin:0px 10px 0 0;font-size:1.5em }
ul.listdownload li a {color:$dark-purple !important;}
ul.listdownload li a {color:$link-color !important;}
ul.listdownload li a:hover {color:$black !important;}

//app footer
Expand Down
2 changes: 1 addition & 1 deletion pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-settings.scss
View file
Expand Up @@ -84,7 +84,7 @@ $ghost : #FAFAFA;
$aluminum : #efefef;
$white-gray : #fbfbfb; // hover color
$jumbo : #888888;

$link-color : #0075db;
// social

$soc-twitter : #2da5da;
Expand Down
1 change: 0 additions & 1 deletion pyoes/static/bower.json
View file
@@ -1,6 +1,5 @@
{
"name": "+package+",
"version": "0.0.1",
"private": "true",
"dependencies": {
"foundation": "~5.5.3",
Expand Down

0 comments on commit 3c83fb8

Please sign in to comment.