Skip to content

Commit 817ea1f

Browse files
janzenisekjanzenisek
committed
fixed several mobile ui related bugs, added header animation, etc
1 parent 4c6d037 commit 817ea1f

8 files changed

Lines changed: 287 additions & 63 deletions

File tree

‎_includes/home_header.html‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,26 @@
66
&nbsp;&nbsp;&nbsp;diagnostic,<br/>
77
&nbsp;&nbsp;&nbsp;predictive,<br/>
88
&nbsp;&nbsp;&nbsp;prescriptive&nbsp;<span class="todo"># todo</span><br/>
9-
]
9+
]
10+
<!-- <br/><br/>
11+
<span class="todo"># to be joined here:</span>
12+
<br/><span class="todo">#</span>
13+
<br/><span class="todo"># - modeling &amp; simulation</span>
14+
<br/><span class="todo"># - machine learning</span>
15+
<br/><span class="todo"># &nbsp;&nbsp;- privacy preserving</span>
16+
<br/><span class="todo"># &nbsp;&nbsp;- interpretable</span>
17+
<br/><span class="todo"># - optimization</span> -->
18+
</div>
19+
20+
<!-- <div class="headerCodeBlock2">
21+
<span class="todo2"># join discliplines here ... </span>
22+
</div> -->
1023

24+
<div class="header-bg">
25+
{% include svg/header-bg2.svg %}
1126
</div>
27+
28+
1229
<!-- <div>
1330
`​`` html
1431
<a href="#">Hello world</a>

‎_includes/svg/header-bg2.svg‎

Lines changed: 5 additions & 5 deletions
Loading

‎_sass/custom/_creative.scss‎

Lines changed: 100 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,116 @@ a {
4444
outline: none !important;
4545
}
4646

47-
.bg-primary a,
47+
.container {
48+
padding-left: 25px;
49+
padding-right: 25px;
50+
}
51+
52+
.bg-primary {
53+
color: $brand-grey;
54+
background-color: $brand-primary;
55+
}
56+
57+
.bg-primary a
58+
{
59+
color: $brand-grey;
60+
}
61+
62+
.bg-primary a:hover,
63+
.bg-primary a:focus
64+
{
65+
color: $brand-secondary;
66+
}
67+
68+
.bg-primary-light {
69+
color: $brand-grey;
70+
background-color: $brand-primary-light;
71+
}
72+
73+
.bg-primary-light a
74+
{
75+
color: $brand-grey;
76+
}
77+
78+
.bg-primary-light a:hover,
79+
.bg-primary-light a:focus
80+
{
81+
color: $brand-secondary;
82+
}
83+
84+
.bg-primary-light .btn,
85+
#btn-publications {
86+
color: lighten($brand-grey, 15%);
87+
border-color: lighten($brand-grey, 15%);
88+
}
89+
90+
.bg-primary-light .btn:hover,
91+
.bg-primary-light .btn:focus,
92+
#btn-publications:hover,
93+
#btn-publications:focus
94+
{
95+
color: $brand-secondary;
96+
border-color: $brand-secondary;
97+
}
98+
99+
.bg-secondary {
100+
color: $text-light;
101+
background-color: $brand-secondary;
102+
}
103+
104+
.bg-secondary a
105+
{
106+
color: $text-light;
107+
}
108+
109+
.bg-secondary a:hover,
110+
.bg-secondary a:focus
111+
{
112+
color: $brand-primary;
113+
}
114+
115+
.bg-dark {
116+
color: #fff;
117+
background-color: $bg-dark;
118+
}
119+
48120
.bg-dark a
49121
{
50122
color: $text-light;
51123
}
52124

53-
.bg-primary a:hover,
54-
.bg-primary a:focus,
55125
.bg-dark a:hover,
56126
.bg-dark a:focus
57127
{
58-
color: $text-light;
128+
color: $brand-primary;
129+
}
130+
131+
.bg-dark .btn:hover,
132+
.bg-dark .btn:focus,
133+
#btn-blog:hover,
134+
#btn-blog:focus
135+
{
136+
color: $brand-primary;
137+
border-color: $brand-primary;
138+
}
139+
140+
.bg-light {
141+
color: $brand-grey;
142+
background-color: #fff;
59143
}
60144

145+
.bg-light a
146+
{
147+
color: $brand-grey;
148+
}
149+
150+
.bg-light a:hover,
151+
.bg-light a:focus
152+
{
153+
color: $brand-grey-dark;
154+
}
155+
156+
61157
h1,
62158
h2,
63159
h3,
@@ -78,15 +174,6 @@ ul {
78174
font-size: 16px;
79175
}
80176

81-
.bg-primary {
82-
background-color: $brand-primary;
83-
}
84-
85-
.bg-dark {
86-
color: #fff;
87-
background-color: $bg-dark;
88-
}
89-
90177
.text-faded {
91178
color: rgba(255,255,255,.7);
92179
}

‎_sass/custom/_nav.scss‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,31 +62,19 @@
6262
fill: $brand-primary;
6363
}
6464

65-
66-
67-
// #sfl-logo-bulpflash,
68-
// #sfl-logo-bulp {
69-
// fill: $brand-primary;
70-
// }
71-
72-
// #sfl-logo-building,
73-
// #sfl-logo-chimney1,
74-
// #sfl-logo-chimney2 {
75-
// fill: $brand-grey;
76-
// }
77-
7865
.spa-logo:hover {
7966
fill: $brand-primary;
8067
}
8168

8269
.navbar-default .nav > li>a,
83-
.navbar-default .nav>li>a:focus {
84-
// text-transform: lowercase;
70+
.navbar-default .nav>li>a:focus {
8571
font-size: 15px;
8672
font-weight: 700;
8773
color: #222;
8874
}
8975

76+
77+
9078
.navbar-default .nav > li>a:hover,
9179
.navbar-default .nav>li>a:focus:hover {
9280
color: $brand-primary;
@@ -112,6 +100,22 @@
112100
content:"";
113101
}
114102

103+
.navbar-brand {
104+
font-size: 11px;
105+
}
106+
107+
@media(min-width:350px) {
108+
.navbar-brand {
109+
font-size: 14px;
110+
}
111+
}
112+
113+
@media(min-width:400px) {
114+
.navbar-brand {
115+
font-size: 18px;
116+
}
117+
}
118+
115119
@media(min-width:768px) {
116120
.navbar-default {
117121
// border-color: rgba(255,255,255,.5);
@@ -214,3 +218,10 @@
214218
}
215219
}
216220

221+
@media(min-width:768px) {
222+
@media(max-width:1000px) {
223+
.navbar-right>li>a {
224+
padding: 25px 10px 25px 10px;
225+
}
226+
}
227+
}

0 commit comments

Comments
 (0)