Skip to content
This repository was archived by the owner on Sep 24, 2024. It is now read-only.

Commit 99595c7

Browse files
Merge pull request #268 from facasaca/develop
fix HTTP/HTTPS mixed content
2 parents 39785cc + b3d4db1 commit 99595c7

File tree

5 files changed

+4
-26
lines changed

5 files changed

+4
-26
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ angular-src/scripts/set-env.env
4040
### MEAN.Anglar Stack ###
4141
## Angular ##
4242
# compiled output
43-
angular-src/src/assets
43+
#angular-src/src/assets
4444
client/assets/libs
4545
public
4646
/dist

angular-src/src/app/general/home/home.component.css

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
#fullscreen_intro{
2-
/*background: url(https://iso.500px.com/wp-content/uploads/2014/07/big-one.jpg) no-repeat center center fixed;
3-
*/
4-
5-
/*background: url(https://web.ist.utl.pt/ist186413/gce_white.png) no-repeat center center fixed;
6-
*/
72
background-color: #1c2d39;
83
display: table;
94
height: 100vh;
@@ -56,13 +51,7 @@ polygon.arrow-top {
5651

5752

5853
#fullscreen_thesis{
59-
/*background: url(http://web.ist.utl.pt/ist186413/assets/GCE-Thesis-Header.png) no-repeat center center fixed;
60-
background: url(https://web.ist.utl.pt/ist186413/gce_thesis_bg.png) no-repeat center center fixed;
61-
https://images.unsplash.com/photo-1519389950473-47ba0277781c?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=750&q=80
62-
63-
*/
64-
65-
background: url(http://web.ist.utl.pt/ist186413/gce/gce_thesis_bg.jpg) no-repeat center center fixed;
54+
background: url(assets/images/gce_thesis_bg.png) no-repeat center center fixed;
6655
display: table;
6756
height: 100vh;
6857
position: relative;
@@ -94,10 +83,7 @@ polygon.arrow-top {
9483
}
9584

9685
#fullscreen_hash{
97-
/*background: url(https://previews.123rf.com/images/dtosh/dtosh1908/dtosh190800037/128852841-css-coding-language-sign-device-programming-developing-concept-abstract-digital-wireframe-low-poly-m.jpg) no-repeat center center fixed;
98-
https://images.unsplash.com/photo-1488590528505-98d2b5aba04b?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=750&q=80
99-
*/
100-
background: url(http://web.ist.utl.pt/ist186413/gce/gce_hashcode_bg.jpg) no-repeat center center fixed;
86+
background: url(assets/images/gce_hashcode_bg.png) no-repeat center center fixed;
10187
display: table;
10288
height: 100vh;
10389
position: relative;
@@ -116,13 +102,7 @@ polygon.arrow-top {
116102
}
117103

118104
#fullscreen_articles{
119-
/*
120-
background: url(https://park.marmaranyc.com/wp-content/uploads/sites/2/2017/12/michael-discenza-329726-1024x1024.jpg) no-repeat center center fixed;
121-
122-
*/
123-
124-
125-
background: url(http://web.ist.utl.pt/ist186413/gce/gce_articles_bg.jpg) no-repeat center center fixed;
105+
background: url(assets/images/gce_articles_bg.png) no-repeat center center fixed;
126106
display: table;
127107
height: 100vh;
128108
position: relative;
@@ -135,8 +115,6 @@ polygon.arrow-top {
135115
text-align: center;
136116
vertical-align: middle;
137117
color: white;
138-
/*padding-right: 60px;
139-
padding-left: 60px;*/
140118
line-height: 5;
141119
}
142120

1.6 MB
Loading
1.38 MB
Loading
2.64 MB
Loading

0 commit comments

Comments
 (0)